Merge pull request #776 from ivan-hc/dev

Version 7

Author: ivan-hc

APP-MANAGER

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

README.md

@@ -81,17 +81,26 @@ You can consult the entire **list of managed apps** at [**portable-linux-apps.gi
 
 Both can be updated using "[Topgrade](https://github.com/topgrade-rs/topgrade)".
 
+------------------------------------------------------------------------
+
 ### Ownership
 - "**AM**" is owned by the user that have installed it, since other users have not read/write permissions in "/opt/am";
 - "**AppMan**" is for all users, since it works locally, everyone can have its own apps and configurations.
 
+------------------------------------------------------------------------
+
 ### About "sudo" usage
 - "AppMan" can request the root password only in the very rare case in which you want to install a library;
 - "AM" requires the root password only to install, remove apps, enable a sandbox for an AppImage, or enable/disable bash completion.
 
 All options cannot be executed with "`sudo`".
 
+------------------------------------------------------------------------
+
 ### How apps are installed
+
+------------------------------------------------------------------------
+
 - "**AM**" installs apps system wide, in `/opt` (see [Linux Standard Base](https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch03s13.html)), using the following structure:
 ```
 /opt/$PROGRAM/
@@ -100,16 +109,18 @@ All options cannot be executed with "`sudo`".
 /opt/$PROGRAM/remove
 /opt/$PROGRAM/icons/$ICON-NAME
 /usr/local/bin/$PROGRAM
-/usr/share/applications/AM-$PROGRAM.desktop
-```
-If the distro is immutable or have read-only mount points instead, the path of the launcher (the last line above) will change like this:
-```
-/usr/local/share/applications/AM-$PROGRAM.desktop
+/usr/local/share/applications/$PROGRAM-AM.desktop
 ```
-NOTE, all installation scripts created or updated after June 28, 2024 will install launchers in /usr/local/share/applications with the "-AM.desktop" extension instead of the "AM-" suffix, like this:
+NOTE, all installation scripts used before June 28, 2024 show launchers in /usr/share/applications with suffix "AM-" instead of the "AM.desktop" extension, like this:
+
 ```
-/usr/local/share/applications/$PROGRAM-AM.desktop
+/usr/share/applications/AM-$PROGRAM.desktop
 ```
+From 8 July 2024 this configuration is no longer available. Reinstall the application to get the new configuration.
+
+The change to the default location for .desktop files from /usr/share/applications to /usr/local/share/applications was made to bring "AM" in line with GNU/Linux standards for installing system-wide third-party applications, see [here](https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s09.html).
+
+------------------------------------------------------------------------
 
 - "**AppMan**" is more flexible, since it asks you where to install the apps in your $HOME directory. For example, suppose you want install everything in "Applicazioni" (the italian of "applications"), this is the structure of what an installation scripts installs with "AppMan" instead:
 ```
@@ -119,16 +130,20 @@ NOTE, all installation scripts created or updated after June 28, 2024 will insta
 ~/Applicazioni/$PROGRAM/remove
 ~/Applicazioni/$PROGRAM/icons/$ICON-NAME
 ~/.local/bin/$PROGRAM
-~/.local/share/applications/AM-$PROGRAM.desktop
+~/.local/share/applications/$PROGRAM-AM.desktop
 ```
-NOTE, all installation scripts created or updated after June 28, 2024 will install launchers with the "-AM.desktop" extension instead of the "AM-" suffix, like this:
+NOTE, all installation scripts used before June 28, 2024 show the launchers with suffix "AM-" instead of the "AM.desktop" extension, like this:
 ```
-~/.local/share/applications/$PROGRAM-AM.desktop
+~/.local/share/applications/AM-$PROGRAM.desktop
 ```
+From 8 July 2024 this configuration is no longer available. Reinstall the application to get the new configuration.
+
 The configuration file for AppMan is in `~/.config/appman` and contains the path you indicated at first startup. Changing its contents will result in changing the paths for each subsequent operation carried out with "AppMan", the apps and modules stored in the old path will not be manageable.
 
 At first startup you can indicate any directory or subdirectory you want, as long as it is in your $HOME.
 
+------------------------------------------------------------------------
+
 ### How to use "AM" in non-privileged mode, like "AppMan"
 As already mentioned above, at "[Ownership](#ownership)" the user who installed "AM" is the sole owner, having write permissions for both /opt/am and for all installed apps.
 
@@ -250,7 +265,7 @@ Below are the **essential system dependencies** that you must install before pro
 
 NOTE: use "AppMan" for non privileged use or if you prefer to gain administration privileges using alternative commands such as `doas` or similar.
 
-#### Extra dependences (you may not need them)
+#### Extra dependences (recommended)
 The following are optional dependencies that some programs may require:
 - "`binutils`", contains a series of basic commands, including "`ar`" which extracts .deb packages;
 - "`unzip`", to extract .zip packages;
@@ -1297,15 +1312,17 @@ The reasons may be two:
 ------------------------------------------------------------------------
 # Related projects
 #### External tools and forks used in this project
-- [aisap](https://github.com/mgord9518/aisap)
-- [appimagetool/go-appimage](https://github.com/probonopd/go-appimage)
-- [pkg2appimage](https://github.com/AppImage/pkg2appimage)
+- [aisap](https://github.com/mgord9518/aisap), sandboxing solutions for AppImages
+- [appimagetool/go-appimage](https://github.com/probonopd/go-appimage), get rid of libfuse2 from your AppImages
+- [pkg2appimage](https://github.com/AppImage/pkg2appimage), create AppImages on the fly from existing .deb packages
+- [repology](https://github.com/repology), the encyclopedia of all software versions
 
 #### My other projects
-- [AppImaGen](https://github.com/ivan-hc/AppImaGen), a script that generates AppImages from Debian or from a PPA for the previous Ubuntu LTS;
-- [ArchImage](https://github.com/ivan-hc/ArchImage), build AppImage packages for all distributions but including Arch Linux packages. Powered by JuNest;
-- [Firefox for Linux scripts](https://github.com/ivan-hc/Firefox-for-Linux-scripts), easily install the official releases of Firefox for Linux.
-- [My AppImage packages](https://github.com/ivan-hc#my-appimage-packages)
+- [AppImaGen](https://github.com/ivan-hc/AppImaGen), easily create AppImages from Ubuntu PPAs or Debian using pkg2appimage and appimagetool;
+- [ArchImage](https://github.com/ivan-hc/ArchImage), create AppImages for all distributions using Arch Linux packages. Powered by JuNest;
+- [Firefox for Linux scripts](https://github.com/ivan-hc/Firefox-for-Linux-scripts), easily install the official releases of Firefox for Linux;
+- [My AppImage packages](https://github.com/ivan-hc#my-appimage-packages) the complete list of packages managed by me and available in this database;
+- [Snap2AppImage](https://github.com/ivan-hc/Snap2AppImage), try to convert Snap packages to AppImages.
 
 ------------------------------------------------------------------------
 

modules/download.am

@@ -9,12 +9,9 @@ function _convert_to_appman_compatible_script() {
 		if test -f "$APPMANCONFIG"/appman-config; then
 			APPSPATH=$(cat "$APPMANCONFIG"/appman-config)
 			sed -i "s# /usr/local/bin# $HOME/.local/bin#g" ./$arg
-			sed -i "s# /usr/bin# $HOME/.local/bin#g" ./$arg
 			sed -i "s# /usr/games# $HOME/.local/bin#g" ./$arg
 			sed -i "s# /usr/local/games# $HOME/.local/bin#g" ./$arg
-			sed -i "s# /usr/share/applications# $DATADIR/applications#g" ./$arg
 			sed -i "s# /usr/local/share/applications# $DATADIR/applications#g" ./$arg
-			sed -i "s# /usr/share/pixmaps# $DATADIR/icons#g" ./$arg
 			sed -i "s# /usr/local/share/pixmaps# $DATADIR/icons#g" ./$arg
 			sed -i "s# /opt# $HOME/$APPSPATH#g" ./$arg
 			sed -i "s#/opt/#$HOME/$APPSPATH/#g" ./$arg

modules/install.am

@@ -20,14 +20,6 @@ function _install_common_patch() {
 		if wget --version | head -1 | grep -q ' 1.'; then
 			sed -i "s#wget #wget -q --no-verbose --show-progress --progress=bar #g" ./"$arg"
 		fi
-		# Silence "mv", "sed" errors and "squashfs-root" messages
-		if ! grep -q "VERSION 3.5" ./"$arg"; then
-			sed -i 's/ \&& mv/ | grep -v "squashfs-root" | grep -v ":" | grep -v "help"; mv/g' ./"$arg"
-			sed -i '/appimage-extract/ s/$/ 2>\&1 | grep -v "squashfs-root" | grep -v ":" | grep -v "help"/' ./"$arg"
-			sed -i '/^mv / s/$/ 2>\/dev\/null | grep -v "squashfs-root" | grep -v ":" | grep -v "help"/' ./"$arg"
-			sed -i '/^sed / s/$/ 2>\/dev\/null | grep -v "squashfs-root" | grep -v ":" | grep -v "help"/' ./"$arg"
-			sed -i '/squashfs-root/ s/$/ 2>\/dev\/null | grep -v "squashfs-root" | grep -v ":" | grep -v "help"/' ./"$arg"
-		fi
 	fi
 	sed -i "s# https://api.github.com#$HeaderAuthWithGITPAT https://api.github.com#g" ./"$arg"
 }
@@ -37,25 +29,14 @@ function _install_appman_local_patch() {
 	sed -i "s# /opt# $APPSPATH#g" ./"$arg"
 	sed -i "s# /usr/local/bin# $BINDIR#g" ./"$arg"
 	sed -i 's# "/usr/local/bin# "'"$BINDIR"'#g' ./"$arg"
-	sed -i "s# /usr/bin# $BINDIR#g" ./"$arg"
-	sed -i "s# /usr/local/games# $BINDIR#g" ./"$arg"
-	sed -i "s# /usr/games# $BINDIR#g" ./"$arg"
-	sed -i "s# /usr/share/applications# $DATADIR/applications#g" ./"$arg"
 	sed -i "s# /usr/local/share/applications# $DATADIR/applications#g" ./"$arg"
-	sed -i "s# /usr/share/pixmaps# $DATADIR/icons#g" ./"$arg"
-	sed -i "s# /usr/local/share/pixmaps# $DATADIR/icons#g" ./"$arg"
 }
 
 function _apply_patches() {
 	if [ "$AMCLI" == appman ] 2>/dev/null; then
 		_install_common_patch
 		_install_appman_local_patch
 	else
-		if [[ $(grep "[[:space:]]ro[[:space:],]" /proc/mounts) ]]; then
-			$SUDOCOMMAND mkdir -p /usr/local/share/applications
-			sed -i 's# /usr/share/applications# /usr/local/share/applications#g' ./"$arg"
-			sed -i 's# "/usr/share/applications# "/usr/local/share/applications#g' ./"$arg"
-		fi
 		_install_common_patch
 	fi
 }
@@ -149,7 +130,7 @@ function _install_arg() {
 		fi
 	done
 	# Check if the installation script contain a keyword related to a missing dependence
-	if grep -q '.deb' ./"$arg"; then
+	if grep -q 'ar.*x .*\.deb' ./"$arg"; then
 		if ! command -v ar 1>/dev/null; then
 			echo ' 💀 ERROR: YOU CANNOT INSTALL '"$(echo "\"$arg\"" | tr '[:lower:]' '[:upper:]')"' WITHOUT INSTALLING "BINUTILS"!'; return 0
 		fi
@@ -162,17 +143,17 @@ function _install_arg() {
 			sed -i 's#firefox --class#'"$(echo "$ffbrowser" | xargs -L 1 basename)"' --class#g' ./"$arg"
 		fi
 	fi
-	if grep -q '.tar' ./"$arg"; then
+	if grep -q 'http.*\.tar' ./"$arg"; then
 		if ! command -v tar 1>/dev/null; then
 			echo ' 💀 ERROR: YOU CANNOT INSTALL '"$(echo "\"$arg\"" | tr '[:lower:]' '[:upper:]')"' WITHOUT INSTALLING "TAR"!'; return 0
 		fi
 	fi
-	if grep -q '.zip' ./"$arg"; then
+	if grep -q 'http.*\.zip' ./"$arg"; then
 		if ! command -v unzip 1>/dev/null; then
 			echo ' 💀 ERROR: YOU CANNOT INSTALL '"$(echo "\"$arg\"" | tr '[:lower:]' '[:upper:]')"' WITHOUT INSTALLING "UNZIP"!'; return 0
 		fi
 	fi
-	if grep -q 'zsync /opt' ./"$arg"; then
+	if grep -q '^wget "$version.zsync"' ./"$arg"; then
 		if ! command -v zsync 1>/dev/null; then
 			optzsync=$(grep -F 'if test -f /opt/$APP/*.zsync' ./"$arg" | wc -l)
 			if [ "$optzsync" == 0 ]; then

programs/x86_64/appimagehelper

@@ -14,7 +14,7 @@ chmod a+x ../remove || exit 1
 # DOWNLOAD AND PREPARE THE APP, $version is also used for updates
 version="https://bin.ceicer.com/appimagehelper/bin/appimagehelper-x86_64.AppImage"
 wget "$version" || exit 1
-#wget "$version.zsync" 2> /dev/null # Comment out this line if you want to use zsync
+wget "$version.zsync" 2> /dev/null # Comment out this line if you want to use zsync
 # Use tar fx ./*tar* here for example in this line in case a compressed file is downloaded.
 cd ..
 mv ./tmp/*mage ./"$APP"

programs/x86_64/appimagetool

@@ -14,7 +14,7 @@ chmod a+x ../remove || exit 1
 # DOWNLOAD AND PREPARE THE APP, $version is also used for updates
 version=$(curl -Ls https://api.github.com/repos/AppImage/AppImageKit/releases | sed 's/[()",{} ]/\n/g' | grep -oi "https.*mage$" | grep -vi "i386\|i686\|aarch64\|arm64\|armv7l" | grep -i "x86_64" | head -1)
 wget "$version" || exit 1
-#wget "$version.zsync" 2> /dev/null # Comment out this line if you want to use zsync
+wget "$version.zsync" 2> /dev/null # Comment out this line if you want to use zsync
 # Use tar fx ./*tar* here for example in this line in case a compressed file is downloaded.
 cd ..
 mv ./tmp/*mage ./"$APP"

programs/x86_64/appimageupdate

@@ -12,9 +12,9 @@ printf '\n%s' "rm -f /usr/local/share/applications/$APP-AM.desktop" >> ../remove
 chmod a+x ../remove || exit 1
 
 # DOWNLOAD AND PREPARE THE APP, $version is also used for updates
-version=$(curl -Ls https://api.github.com/repos/AppImage/AppImageUpdate/releases/latest | sed 's/[()",{} ]/\n/g' | grep -oi "https.*x86_86.*mage$" | grep -vi "i386\|i686\|aarch64\|arm64\|armv7l" | grep -v "tool" | head -1)
+version=$(curl -Ls https://api.github.com/repos/AppImage/AppImageUpdate/releases/latest | sed 's/[()",{} ]/\n/g' | grep -oi "https.*appimageupdate-x86_64.*mage$" | grep -vi "i386\|i686\|aarch64\|arm64\|armv7l" | head -1)
 wget "$version" || exit 1
-#wget "$version.zsync" 2> /dev/null # Comment out this line if you want to use zsync
+wget "$version.zsync" 2> /dev/null # Comment out this line if you want to use zsync
 # Use tar fx ./*tar* here for example in this line in case a compressed file is downloaded.
 cd ..
 mv ./tmp/*mage ./"$APP"
@@ -33,7 +33,7 @@ set -u
 APP=appimageupdate
 SITE="AppImage/AppImageUpdate"
 version0=$(cat "/opt/$APP/version")
-version=$(curl -Ls https://api.github.com/repos/AppImage/AppImageUpdate/releases/latest | sed 's/[()",{} ]/\n/g' | grep -oi "https.*x86_86.*mage$" | grep -vi "i386\|i686\|aarch64\|arm64\|armv7l" | grep -v "tool" | head -1)
+version=$(curl -Ls https://api.github.com/repos/AppImage/AppImageUpdate/releases/latest | sed 's/[()",{} ]/\n/g' | grep -oi "https.*appimageupdate-x86_64.*mage$" | grep -vi "i386\|i686\|aarch64\|arm64\|armv7l" | head -1)
 [ -n "$version" ] || { echo "Error getting link"; exit 1; }
 if [ "$version" != "$version0" ] || [ -e /opt/"$APP"/*.zsync ]; then
 	mkdir "/opt/$APP/tmp" && cd "/opt/$APP/tmp" || exit 1

programs/x86_64/appimageupdatetool

@@ -14,7 +14,7 @@ chmod a+x ../remove || exit 1
 # DOWNLOAD AND PREPARE THE APP, $version is also used for updates
 version=$(curl -Ls https://api.github.com/repos/AppImage/AppImageUpdate/releases/latest | sed 's/[()",{} ]/\n/g' | grep -oi "https.*mage$" | grep -vi "i386\|i686\|aarch64\|arm64\|armv7l" | grep -i "appimageupdatetool.*x86_64" | head -1)
 wget "$version" || exit 1
-#wget "$version.zsync" 2> /dev/null # Comment out this line if you want to use zsync
+wget "$version.zsync" 2> /dev/null # Comment out this line if you want to use zsync
 # Use tar fx ./*tar* here for example in this line in case a compressed file is downloaded.
 cd ..
 mv ./tmp/*mage ./"$APP"

programs/x86_64/ffwa-facebook

@@ -4,13 +4,13 @@ APP=ffwa-facebook
 APPNAME="Facebook"
 ICONURL="https://portable-linux-apps.github.io/icons/$APP.png"
 
-# CREATING THE FOLDER
-mkdir /opt/$APP
-cd /opt/$APP;
+# CREATING THE DIRECTORY
+mkdir /opt/"$APP"
+cd /opt/"$APP"
 
 # ADD THE REMOVER
-echo '#!/bin/sh' >> /opt/$APP/remove
-echo "rm -R -f /usr/local/share/applications/$APP-AM.desktop /opt/$APP /usr/local/bin/$APP" >> /opt/$APP/remove
+echo '#!/bin/sh' >> /opt/"$APP"/remove
+echo "rm -R -f /usr/local/share/applications/$APP-AM.desktop /opt/$APP /usr/local/bin/$APP" >> /opt/"$APP"/remove
 chmod a+x /opt/"$APP"/remove
 
 # LINK

programs/x86_64/ffwa-github

@@ -4,13 +4,13 @@ APP=ffwa-github
 APPNAME="GitHub"
 ICONURL="https://portable-linux-apps.github.io/icons/$APP.png"
 
-# CREATING THE FOLDER
-mkdir /opt/$APP
-cd /opt/$APP;
+# CREATING THE DIRECTORY
+mkdir /opt/"$APP"
+cd /opt/"$APP"
 
 # ADD THE REMOVER
-echo '#!/bin/sh' >> /opt/$APP/remove
-echo "rm -R -f /usr/local/share/applications/$APP-AM.desktop /opt/$APP /usr/local/bin/$APP" >> /opt/$APP/remove
+echo '#!/bin/sh' >> /opt/"$APP"/remove
+echo "rm -R -f /usr/local/share/applications/$APP-AM.desktop /opt/$APP /usr/local/bin/$APP" >> /opt/"$APP"/remove
 chmod a+x /opt/"$APP"/remove
 
 # LINK