Merge pull request #780 from ivan-hc/dev

Update install.am: DIY AppImage, look for deps only in the builder

Author: ivan-hc

APP-MANAGER

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

appimage-bulder-scripts/README.md

@@ -17,3 +17,11 @@ Try not to use [Archimage](https://github.com/ivan-hc/ArchImage), as build times
 If your AppImage creation script requires specific dependencies, please let me know with a PR.
 
 TIP, creating AppImage on the fly can take time and resources, depending on the complexity of the program being compiled. It is highly suggested to publish the AppImages to a repository, using Github Actions, [as I do](https://github.com/ivan-hc#my-appimage-packages).
+
+### Syntax
+try to use key commands at the beginning of the line, to allow the "install.am" module to determine whether a command not installed on the system is required by the Appimage assembly script. Fore example:
+```
+tar fx ...
+ar x ...
+```
+to detect if "`tar`" and "`ar`" (from `binutils`) are needed.

modules/files.am

@@ -6,13 +6,23 @@
 
 _files_header() {
 	echo ""
-	echo $(echo "- YOU HAVE INSTALLED "
-	find "$APPSPATH" -type f -name 'remove' 2>/dev/null | sed -r 's|/[^/]+$||' | sort | uniq | wc -l
+	APPSNUMB=$(find "$APPSPATH" -type f -name 'remove' -exec grep -L 'usr/local/lib' {} \; 2>/dev/null | sed -r 's|/[^/]+$||' | sort | uniq | wc -l)
+	if [ "$APPSNUMB" = 1 ]; then
+		APPSMESSAGE="YOU HAVE INSTALLED $APPSNUMB PROGRAM"
+	else
+		APPSMESSAGE="YOU HAVE INSTALLED $APPSNUMB PROGRAMS"
+	fi
 	if grep -q 'usr/local/lib' $APPSPATH/*/remove 2> /dev/null; then
-		echo " STANDALONE PROGRAMS AND LIBRARIES MANAGED BY '$(echo $AMCLI | tr a-z A-Z)':"
+		LIBNUMB=$(grep -l "usr/local/lib" "$APPSPATH"/*/remove | wc -l)
+		if [ "$LIBNUMB" = 1 ]; then
+			LIBSMESSAGE="AND $LIBNUMB LIBRARY"
+		else
+			LIBSMESSAGE="AND $LIBNUMB LIBRARIES"
+		fi
+		echo "- $APPSMESSAGE $LIBSMESSAGE MANAGED BY $(echo "\"$AMCLI\"" | tr a-z A-Z)"
 	else
-		echo " STANDALONE PROGRAMS MANAGED BY '$(echo $AMCLI | tr a-z A-Z)':"
-	fi)
+		echo "- $APPSMESSAGE MANAGED BY $(echo "\"$AMCLI\"" | tr a-z A-Z)"
+	fi
 	echo ""
 }
 

modules/install.am

@@ -158,23 +158,37 @@ function _install_arg() {
 				echo -e " ⚠️ WARNING: \"$arg\" may not be updatable without \"zsync\".\n\n The app will still be installed, but installing \"zsync\" is recommended! \n"
 			fi
 		fi
-	elif grep -q 'appimage-bulder-scripts' ./"$arg"; then
-		appimage_build_deps="ar convert glib-compile-schemas tar unzip"
-		for name in $appimage_build_deps; do
-			if ! command -v "$name" &>/dev/null; then
-				if [ "$name" == "ar" ]; then
-					echo " 💀 ERROR: cannot create \"$arg\" without \"binutils\""; return 0
-				elif [ "$name" == "convert" ]; then
-					echo " 💀 ERROR: cannot create \"$arg\" without \"$name\" (from \"imagemagick\")"; return 0
-				else
-					echo " 💀 ERROR: cannot create \"$arg\" without \"$name\""; return 0
+	elif grep -qi "^wget.*.sh.*chmod.*&&" ./"$arg"; then
+		appimage_bulder_script=$(grep "^wget " ./"$arg" | tr '"' '\n' | grep -i "^http" | sed 's/$APP/'"$arg"'/g')
+		if curl --output /dev/null --silent --head --fail "$appimage_bulder_script" 1>/dev/null; then
+			appimage_build_deps="ar gcc glib-compile-schemas make tar unzip"
+			for name in $appimage_build_deps; do
+				if curl -Ls "$appimage_bulder_script" | grep "^$name" 1>/dev/null; then
+					if ! command -v "$name" &>/dev/null; then
+						if [ "$name" == "ar" ]; then
+							echo " 💀 ERROR: cannot create \"$arg\" without \"binutils\""; return 0
+						else
+							echo " 💀 ERROR: cannot create \"$arg\" without \"$name\""; return 0
+						fi
+					fi
+				fi
+			done
+			if curl -Ls "$appimage_bulder_script" | grep -i "appimagetool" 1>/dev/null; then
+				if ! command -v convert &>/dev/null; then
+					echo " 💀 ERROR: cannot create \"$arg\" without \"convert\" (from \"imagemagick\")"; return 0
+				fi
+			elif curl -Ls "$appimage_bulder_script" | grep -i "pkg2appimage" 1>/dev/null; then
+				if ! command -v convert &>/dev/null; then
+					echo " 💀 ERROR: cannot create \"$arg\" without \"convert\" (from \"imagemagick\")"; return 0
 				fi
 			fi
-		done
+		else
+			echo " 💀 ERROR: cannot create \"$arg\", the builder does not exists"; return 0
+		fi
 	fi
 	# Check if you are installing an app or a library
 	echo -e "◆ $(echo "\"$arg\"" | tr '[:lower:]' '[:upper:]'): starting installation script"
-	if grep -q 'appimage-bulder-scripts' ./"$arg"; then
+	if grep -qi "^wget.*.sh.*chmod.*&&" ./"$arg"; then
 		echo -e "\n This script will create an AppImage on the fly, please wait..."
 	elif grep -q "/usr/local/lib" ./"$arg"; then
 		echo -e '\n ⚠️ This script installs a system library in /usr/local/lib, cancel it if:\n'

programs/aarch64/libfuse2

@@ -1,42 +1,20 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 LIB=libfuse2
 ARCH=$(uname -m)
 
-# CREATE THE FOLDER
-mkdir /opt/$LIB
-cd /opt/$LIB
-
-# ADD THE REMOVER
-echo '#!/bin/sh
-sudo rm -R -f /opt/'$LIB' /usr/local/lib/libfuse*' >> /opt/$LIB/remove
-chmod a+x /opt/$LIB/remove
-
-# DOWNLOAD THE ARCHIVE
-mkdir tmp
-cd ./tmp
-
-function _debian_dl(){
-	LIBFUSE2_DEB=$(curl -Ls http://ftp.debian.org/debian/pool/main/f/fuse/ | grep -Po '(?<=href=")[^"]*' | sort | grep -v exp | grep arm64 | grep "libfuse2_" | tail -1)
-	wget http://ftp.debian.org/debian/pool/main/f/fuse/"$LIBFUSE2_DEB"
-	ar x ./*.deb
-	tar fx ./data.tar.xz
-	cd ..
-	sudo mkdir -p /usr/local/lib
-	sudo mv ./tmp/lib/*/libfuse* /usr/local/lib/
-}
-
-function _archlinux_dl(){
-	wget https://archlinux.org/packages/extra/${ARCH}/fuse2/download && mv ./download ./$LIB.tar.zst
-	tar fx ./*.tar.zst
-	cd ..
-	sudo mkdir -p /usr/local/lib
-	sudo mv ./tmp/usr/lib/libfuse*2* /usr/local/lib/
-}
-
-_debian_dl
-
-#_archlinux_dl
-
-rm -R -f ./tmp
-sudo ldconfig
+# CREATE DIRECTORIES AND ADD REMOVER
+[ -n "$LIB" ] && mkdir -p "/opt/$LIB/tmp" && cd "/opt/$LIB/tmp" || exit 1
+printf "#!/bin/sh\nset -e\nsudo rm -f /usr/local/lib/libfuse*\nrm -R -f /opt/$LIB" > ../remove
+chmod a+x ../remove || exit 1
+
+# DOWNLOAD AND PREPARE THE LIBRARY
+LIBFUSE2_DEB=$(curl -Ls http://ftp.debian.org/debian/pool/main/f/fuse/ | grep -Po '(?<=href=")[^"]*' | sort | grep -v exp | grep arm64 | grep "libfuse2_" | tail -1)
+wget http://ftp.debian.org/debian/pool/main/f/fuse/"$LIBFUSE2_DEB" || exit 1
+ar x ./*.deb && tar fx ./data.tar.xz || exit 1
+cd .. || exit 1
+sudo mkdir -p /usr/local/lib || exit 1
+sudo mv ./tmp/lib/*/libfuse* /usr/local/lib/ && rm -R -f ./tmp || exit 1
+
+# CONFIGURE DYNAMIC LINKER RUN-TIME BINDINGS
+sudo ldconfig

programs/i686/libfuse2

@@ -1,42 +1,20 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 LIB=libfuse2
 ARCH=$(uname -m)
 
-# CREATE THE FOLDER
-mkdir /opt/$LIB
-cd /opt/$LIB
-
-# ADD THE REMOVER
-echo '#!/bin/sh
-sudo rm -R -f /opt/'$LIB' /usr/local/lib/libfuse*' >> /opt/$LIB/remove
-chmod a+x /opt/$LIB/remove
-
-# DOWNLOAD THE ARCHIVE
-mkdir tmp
-cd ./tmp
-
-function _debian_dl(){
-	LIBFUSE2_DEB=$(curl -Ls http://ftp.debian.org/debian/pool/main/f/fuse/ | grep -Po '(?<=href=")[^"]*' | sort | grep -v exp | grep i386 | grep "libfuse2_" | tail -1)
-	wget http://ftp.debian.org/debian/pool/main/f/fuse/"$LIBFUSE2_DEB"
-	ar x ./*.deb
-	tar fx ./data.tar.xz
-	cd ..
-	sudo mkdir -p /usr/local/lib
-	sudo mv ./tmp/lib/*/libfuse* /usr/local/lib/
-}
-
-function _archlinux_dl(){
-	wget https://archlinux.org/packages/extra/${ARCH}/fuse2/download && mv ./download ./$LIB.tar.zst
-	tar fx ./*.tar.zst
-	cd ..
-	sudo mkdir -p /usr/local/lib
-	sudo mv ./tmp/usr/lib/libfuse*2* /usr/local/lib/
-}
-
-_debian_dl
-
-#_archlinux_dl
-
-rm -R -f ./tmp
-sudo ldconfig
+# CREATE DIRECTORIES AND ADD REMOVER
+[ -n "$LIB" ] && mkdir -p "/opt/$LIB/tmp" && cd "/opt/$LIB/tmp" || exit 1
+printf "#!/bin/sh\nset -e\nsudo rm -f /usr/local/lib/libfuse*\nrm -R -f /opt/$LIB" > ../remove
+chmod a+x ../remove || exit 1
+
+# DOWNLOAD AND PREPARE THE LIBRARY
+LIBFUSE2_DEB=$(curl -Ls http://ftp.debian.org/debian/pool/main/f/fuse/ | grep -Po '(?<=href=")[^"]*' | sort | grep -v exp | grep i386 | grep "libfuse2_" | tail -1)
+wget http://ftp.debian.org/debian/pool/main/f/fuse/"$LIBFUSE2_DEB" || exit 1
+ar x ./*.deb && tar fx ./data.tar.xz || exit 1
+cd .. || exit 1
+sudo mkdir -p /usr/local/lib || exit 1
+sudo mv ./tmp/lib/*/libfuse* /usr/local/lib/ && rm -R -f ./tmp || exit 1
+
+# CONFIGURE DYNAMIC LINKER RUN-TIME BINDINGS
+sudo ldconfig

programs/x86_64/ffwa-facebook

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 APP=ffwa-facebook
 APPNAME="Facebook"

programs/x86_64/ffwa-github

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 APP=ffwa-github
 APPNAME="GitHub"

programs/x86_64/ffwa-gmail

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 APP=ffwa-gmail
 APPNAME="Gmail"

programs/x86_64/ffwa-netflix

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 APP=ffwa-netflix
 APPNAME="Netflix"