Merge pull request #602 from ivan-hc/dev

Fix -s in -u in both "AppMan Mode" and normal mode

Author: ivan-hc

APP-MANAGER

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-AMVERSION="6.8.2-3"
+AMVERSION="6.8.3"
 
 # Determine main repository and branch
 AMREPO="https://raw.githubusercontent.com/ivan-hc/AM/main"

modules/sync.am

@@ -60,13 +60,18 @@ function _sync_amcli() {
 	echo "-----------------------------------------------------------------------------"
 	_completion_lists
 	rm -f /opt/am/appman
-	CURRENT_AM_VERSION=$("$AMCLIPATH" -v)
+	if [ "$AMCLIPATH" == /opt/am/appman ] 2>/dev/null; then
+		AMCLIPATH="/opt/am/APP-MANAGER"
+		CURRENT_AM_VERSION=$("$AMCLIPATH" -v)
+	else
+		CURRENT_AM_VERSION=$("$AMCLIPATH" -v)
+	fi
 	echo -ne '\n ◆ SYNCHRONIZING "'"$(echo "$AMCLI" | tr a-z A-Z)"'" VERSION '"$CURRENT_AM_VERSION"'...\r'; sleep 1
 	rm -R -f "$AMPATH"/.cache/* 1>/dev/null; cd "$AMPATH"/.cache || return
-	if [ "$CLI" == am ] 2>/dev/null; then
+	if [ "$AMCLI" == am ] 2>/dev/null; then
 		wget -q "$AMREPO"/APP-MANAGER && chmod a+x ./APP-MANAGER && chmod 777 ./APP-MANAGER
 		cd ..
-		echo y | mv "$AMPATH"/.cache/APP-MANAGER "$AMCLIPATH"
+		echo y | mv "$AMPATH"/.cache/APP-MANAGER /opt/am/APP-MANAGER
 	else
 		wget -q "$AMREPO"/APP-MANAGER -O appman && chmod a+x ./"$AMCLI"
 		cd ..