Merge pull request #1198 from ivan-hc/dev

Fix "$SCRIPTDIR" in sistems without XDG_DESKTOP_DIR

APP-MANAGER

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-AMVERSION="9.3-1"
+AMVERSION="9.3-2"
 
 # Determine main repository and branch
 AMREPO="https://raw.githubusercontent.com/ivan-hc/AM/main"
@@ -27,7 +27,8 @@ export CONFIGDIR="${XDG_CONFIG_HOME:-$HOME/.config}"
 export CACHEDIR="${XDG_CACHE_HOME:-$HOME/.cache}"
 export APPMANCONFIG="$CONFIGDIR/appman"
 APPMANCONFIG="$CONFIGDIR/appman"
-SCRIPTDIR="$(xdg-user-dir DESKTOP 2>/dev/null || echo "$HOME")"
+SCRIPTDIR="${SCRIPTDIR:-$(xdg-user-dir DESKTOP 2>/dev/null)}"
+[ -d "$SCRIPTDIR" ] || SCRIPTDIR="$PWD"
 export SCRIPTDIR
 
 # Colors

modules/install.am

@@ -39,11 +39,7 @@ _download() {
 	if curl --output /dev/null --silent --head --fail "$APPSDB/$arg"  1>/dev/null; then
 		cd "$SCRIPTDIR" || return 1
 		[ ! -f ./"$arg" ] && wget -q "$APPSDB/$arg" || return 1
-		echo " ◆ \"$arg\" installation script downloaded! "
-	elif curl --output /dev/null --silent --head --fail "$AMREPO/testing/$ARCH/$arg"  1>/dev/null; then
-		cd "$SCRIPTDIR" || return 1
-		[ ! -f ./"$arg" ] && wget -q "$AMREPO/testing/$ARCH/$arg" || return 1
-		echo " ⚠️ \"$arg\" downloaded from \"testing\", the unstable branch, BE AWARE!"
+		echo "◆ \"$arg\" installation script downloaded to \"$SCRIPTDIR\"! " | _fit
 	else
 		echo " 💀 ERROR: \"$arg\" is NOT a valid argument"
 	fi