Merge pull request #1043 from ivan-hc/main

Update install.am: fix AppImage list (option `-ia`)
ivan-hc · Oct 28, 2024 · f654e3c · f654e3c
2 parents 93c2e8a + eb41b76
commit f654e3c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/modules/install.am b/modules/install.am
@@ -127,10 +127,10 @@ _ending_the_installation() {
 	if [ -f "${LASTDIRPATH}"/remove ]; then
 		if test -d "${LASTDIRPATH}"/tmp; then
 			echo " 💀 ERROR DURING INSTALLATION, REMOVED $APPNAME!"
-			$AMCLIPATH -R "$LASTDIR" 1>/dev/null
+			$SUDOCMD "$APPSPATH/$LASTDIR/remove" 1>/dev/null
 		elif test -f "$APPSPATH/$LASTDIR/version" && [ -z "$(cat "$APPSPATH/$LASTDIR/version")" ]; then
 			echo " 💀 ERROR DURING INSTALLATION, REMOVED $APPNAME!"
-			$AMCLIPATH -R "$LASTDIR" 1> /dev/null
+			$SUDOCMD "$APPSPATH/$LASTDIR/remove" 1> /dev/null
 		else
 			APPSIZE=$(du -sm "${LASTDIRPATH}" | awk '{print $1}' )
 			LASTDIRNAME=$(echo "\"$LASTDIR\"" | tr '[:lower:]' '[:upper:]')
@@ -393,7 +393,7 @@ case "$1" in
 			rm -f "$AMCACHEDIR"/install-args
 			ARGS="$(echo "$@" | cut -f2- -d ' ' | tr ' ' '\n' | grep -v -- "--")"
 		fi
-		APPIMAGE_NAMES=$(curl -Ls https://portable-linux-apps.github.io/appimages.md | tr '/)' '\n' | grep -i ".md$" | uniq | sed 's/.md$//g')
+		APPIMAGE_NAMES=$(curl -Ls https://portable-linux-apps.github.io/appimages.md | tr '/)' '\n' | grep -i ".md$" | uniq | sed 's/.md$//g' | grep -v "\[")
 		rm -f "$AMCACHEDIR/$ARCH-appimages"
 		for appimage in $APPIMAGE_NAMES; do
 			grep "◆ $appimage :" "$AMDATADIR/$ARCH-apps" >> "$AMCACHEDIR/$ARCH-appimages" &