Merge branch 'ivan-hc:dev' into dev

APP-MANAGER

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-AMVERSION="6.8.3"
+AMVERSION="6.8.3-1"
 
 # Determine main repository and branch
 AMREPO="https://raw.githubusercontent.com/ivan-hc/AM/main"
@@ -603,13 +603,6 @@ function _use_appman() {
 	fi
 }
 
-if [ "$AMCLI" == am ] 2>/dev/null; then
-	if test -f "$APPMANCONFIG"/appman-mode; then
-		_appman
-		AMCLIPATH="/opt/am/APP-MANAGER"
-	fi
-fi
-
 function _back_to_am() {
 	if test -f "$APPMANCONFIG"/appman-mode; then
 		rm -f "$APPMANCONFIG"/appman-mode
@@ -619,6 +612,23 @@ function _back_to_am() {
 	fi
 }
 
+if [ "$AMCLI" == am ] 2>/dev/null; then
+	if test -f "$APPMANCONFIG"/appman-mode; then
+		case "$1" in
+		'--system')
+			_back_to_am
+			;;
+		''|*)
+			if ! test -f "$APPMANCONFIG"/appman-config; then
+				_appman_mode_enabled_message
+			fi
+			_appman
+			AMCLIPATH="/opt/am/APP-MANAGER"
+			;;
+		esac
+	fi
+fi
+
 #############################################
 # FUNCTION TO HANDLE ALL THE EXTERNAL MODULES
 #############################################