Merge pull request #831 from ivan-hc/dev

"AM" 7.6

Author: ivan-hc

AM-INSTALLER

@@ -27,7 +27,15 @@ _install_am() {
 	mkdir -p "$CACHEDIR" || true
 	rm -f "$CACHEDIR"/INSTALL-AM.sh || true
 	wget -q https://raw.githubusercontent.com/ivan-hc/AM/main/INSTALL -O "$CACHEDIR"/INSTALL-AM.sh && chmod a+x "$CACHEDIR"/INSTALL-AM.sh
-	sudo "$CACHEDIR"/INSTALL-AM.sh && rm -f "$CACHEDIR"/INSTALL-AM.sh
+	if command -v sudo >/dev/null 2>&1; then
+		SUDOCOMMAND="sudo"
+	elif command -v doas >/dev/null 2>&1; then
+		SUDOCOMMAND="doas"
+	else
+		echo 'ERROR: No sudo or doas found'
+		exit 1
+	fi
+	$SUDOCOMMAND "$CACHEDIR"/INSTALL-AM.sh && rm -f "$CACHEDIR"/INSTALL-AM.sh
 }
 
 # INSTALL "AM" LOCALLY, AS "APPMAN"
@@ -59,15 +67,15 @@ printf " Choose how to install \"AM\" and all its managed applications.
  1) As \"${RED}AM\033[0m\", command \"${Green}am\033[0m\", this is a system-wide installation:
    - the command is a symlink /usr/local/bin/am for /opt/am/APP-MANAGER
    - all programs will be installed in /opt, into dedicated directories
-   - a \"sudo\" password is required both here and to install/remove apps
+   - a \"sudo\"/\"doas\" password is required both here and to install/remove apps
    - you are the one with read-write permissions for \"AM\" and all programs
    - other users can only use programs you have installed, nothing else
    - other users can still use \"AppMan mode\" for their rootless configurations
 
  2) As \"${LightBlue}AppMan\033[0m\", command \"${Green}appman\033[0m\", local installation:
    - the command is the script ~/.local/bin/appman
    - choose wherever you want to install all the apps, in your HOME
-   - no \"sudo\" required at all
+   - no \"sudo\"/\"doas\" required at all
    - you can replicate your configurations on every system you want
    - more storage space required, if more users use \"AppMan\"
 

APP-MANAGER

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-AMVERSION="7.5"
+AMVERSION="7.6"
 
 # Determine main repository and branch
 AMREPO="https://raw.githubusercontent.com/ivan-hc/AM/main"
@@ -54,7 +54,14 @@ _no_sudo
 function _am() {
 	AMCLI="am"
 	AMCLIPATH="$AMCLI"
-	SUDOCOMMAND="sudo"
+	if command -v sudo >/dev/null 2>&1; then
+		SUDOCOMMAND="sudo"
+	elif command -v doas >/dev/null 2>&1; then
+		SUDOCOMMAND="doas"
+	else
+		echo 'ERROR: No sudo or doas found'
+		exit 1
+	fi
 	COMPLETIONPATH="/etc/bash_completion.d"
 	COMPLETIONFILE="am-completion.sh"
 	APPSPATH="/opt"

INSTALL

@@ -72,7 +72,7 @@ _enable_bash_completion() {
 		mv /opt/am/am-completion.sh /etc/bash_completion.d/
 	else
 		mkdir -p /etc/bash_completion.d
-		sudo mv /opt/am/am-completion.sh /etc/bash_completion.d/
+		mv /opt/am/am-completion.sh /etc/bash_completion.d/
 	fi
 }
 

README.md

@@ -77,7 +77,7 @@ You can consult the entire **list of managed apps** at [**portable-linux-apps.gi
 ------------------------------------------------------------------------
 # Differences between "AM" and "AppMan"
 "AM" and "AppMan" differ in how they are installed, placed and renamed in the system and how/where they install apps:
-- "**AM**" is installed system-wide (requires `sudo`) in `/opt/am/` as "**APP-MANAGER**", with a symlink named "`am`" in `/usr/local/bin`.
+- "**AM**" is installed system-wide (requires `sudo` or `doas`) in `/opt/am/` as "**APP-MANAGER**", with a symlink named "`am`" in `/usr/local/bin`.
 - "**AppMan**" is portable, you need just to rename the "APP-MANAGER" script as "`appman`" and put it wherewer you want. I recommend to place it in `$HOME/.local/bin` to be used in $PATH, to be managed from other tools (see below).
 
 Both can be updated using "[Topgrade](https://github.com/topgrade-rs/topgrade)".
@@ -94,7 +94,7 @@ Both can be updated using "[Topgrade](https://github.com/topgrade-rs/topgrade)".
 - "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`".
+All options cannot be executed with "`sudo`"/"`doas`".
 
 ------------------------------------------------------------------------
 
@@ -259,7 +259,7 @@ wget -q https://raw.githubusercontent.com/ivan-hc/AM/main/AM-INSTALLER
 chmod a+x ./AM-INSTALLER
 ./AM-INSTALLER
 ```
-Type "1" to install "AM" (requires "sudo" password), "2" to install "AppMan". Any other key will abort the installation.
+Type "1" to install "AM" (requires "sudo"/"doas" password), "2" to install "AppMan". Any other key will abort the installation.
 
 | ![AM-INSTALLER](https://github.com/user-attachments/assets/82b21979-e99d-4bee-b466-716bac1e7e45) |
 | - |
@@ -276,9 +276,7 @@ Below are the **essential system dependencies** that you must install before pro
 - "`wget`" to download all programs and update "AM"/"AppMan" itself.
 
 #### Dependency only for "AM"
-- "`sudo`", required by "AM" to install/remove programs, sandbox AppImages and enable/disable bash-completion.
-
-NOTE: use "AppMan" for non privileged use or if you prefer to gain administration privileges using alternative commands such as `doas` or similar.
+- "`sudo`" or "`doas`", required by "AM" to install/remove programs, sandbox AppImages and enable/disable bash-completion.
 
 #### Extra dependences (recommended)
 The following are optional dependencies that some programs may require:
@@ -1119,7 +1117,7 @@ __________________________________________________________________________
 ### How to update or remove apps manually
 Inside each installed applications directory, there are two scripts called "AM-updater" and "remove", and their purpose is indicated in their name:
 - To update an app manually, run the AM-updater script.
-- To remove an application instead, run the "remove" script (with "`sudo`" if you are an "AM" user).
+- To remove an application instead, run the "remove" script (with "`sudo`" or "`doas`" if you are an "AM" user).
 
 __________________________________________________________________________
 ### Downgrade an installed app to a previous version
@@ -1299,7 +1297,7 @@ or
 ```
 appman -i libfuse2
 ```
-NOTE, in AppMan you still need to use your password (`sudo`) to install the library at system level, in /usr/local/lib
+NOTE, in AppMan you still need to use your password (`sudo` or `doas`) to install the library at system level, in /usr/local/lib
 
 Alternatively you can use the "`nolibfuse`" option to "try" to convert old Type2 AppImages to Type3, so as not to depend on `libfuse2`. In most cases it works, but sometimes it can give errors, depending on how the package was manufactured.
 

modules/database.am

@@ -5,26 +5,26 @@
 ############################################################################################
 
 _clean_lists_and_queries() {
-	# Remove references to URLs, "-a" elements and limit message length to a maximum of 80 characters in "-l" and "-q"
+	# Remove references to URLs, "-a" elements in "-l" and "-q"
 	sed -E 's#(http|https|ftp)://[^ ]*##g; s#(SITE|SOURCE):##g'
 }
 
 _download_markdown() {
-	local disk_usage=""
-	local app_version=""
-	local markdown_url="$AMCATALOGUEMARKDOWNS/${1}.md"
-	local cache_dir="$AMCACHEDIR/about"
-	local app_status=" STATUS: NOT INSTALLED"
-	local package_name=${1^^}
+	disk_usage=""
+	app_version=""
+	markdown_url="$AMCATALOGUEMARKDOWNS/${1}.md"
+	cache_dir="$AMCACHEDIR/about"
+	app_status=" STATUS: NOT INSTALLED"
+	package_name="$1"
 	if curl -o /dev/null -sIf "$markdown_url"; then
 		mkdir -p "$cache_dir" && wget -q "$markdown_url" -P "$cache_dir"
 		sed -i '1,${ /^\s*#/ d; /^\s*!/ d; /\[Applications]/d; /\ --- /d; /\ | - | /d; /\!\[/d; }' "$cache_dir/$1.md"
 		sed -i '$!N;s/^\s*\n\s*$//;P;D' "$cache_dir/$1.md"
-		printf ' PACKAGE: %s\n' "$package_name"
+		printf ' PACKAGE: %s\n' "$package_name" | tr '[:lower:]' '[:upper:]'
 		if [ -f "$APPSPATH/$1/remove" ]; then
 			disk_usage=$(du -sm "$APPSPATH/$1" | cut -f1)
 			app_version=$(cat "$AMCACHEDIR"/version-args 2>/dev/null | grep -w " ◆ $1	|" | sed 's:.*|	::')
-			app_status=$(echo -e " STATUS: INSTALLED, ABOUT $disk_usage MB OF DISK SPACE IN USE\n VERSION: $app_version")
+			app_status=$(printf " STATUS: INSTALLED, ABOUT $disk_usage MB OF DISK SPACE IN USE\n VERSION: $app_version")
 		fi
 		printf '%s\n' "$app_status"
 		cat -s "$cache_dir/$1.md"
@@ -39,16 +39,16 @@ _download_markdown() {
 }
 
 _generate_3rd_party() {
-	local disk_usage=""
-	local app_version=""
-	local app_status=" STATUS: NOT INSTALLED"
-	local package_name=${1^^}
+	disk_usage=""
+	app_version=""
+	app_status=" STATUS: NOT INSTALLED"
+	package_name="$1"
 	if grep -q "◆ $arg : " "$AMPATH/$arch-apps"; then
-		printf ' PACKAGE: %s\n' "$arg" | tr a-z A-Z
+		printf ' PACKAGE: %s\n' "$arg" | tr '[:lower:]' '[:upper:]'
 		if [ -f "$APPSPATH/$1/remove" ]; then
 			disk_usage=$(du -sm "$APPSPATH/$1" | cut -f1)
 			app_version=$(cat "$AMCACHEDIR"/version-args 2>/dev/null | grep -w " ◆ $1	|" | sed 's:.*|	::')
-			app_status=$(echo -e " STATUS: INSTALLED, ABOUT $disk_usage MB OF DISK SPACE IN USE\n VERSION: $app_version")
+			app_status=$(printf " STATUS: INSTALLED, ABOUT $disk_usage MB OF DISK SPACE IN USE\n VERSION: $app_version")
 		fi
 		printf '%s\n' "$app_status"
 		grep "◆ $arg : " < "$AMPATH/$arch-apps" | cut -d':' -f2- | sed 's/^./\n /' | sed 's# SOURCE:#\n\n SOURCE:#g'
@@ -58,32 +58,25 @@ _generate_3rd_party() {
 }
 
 _download_lib() {
-	local lib_name_upper=${1^^}
-	printf "%s\n" " LIBRARY: $lib_name_upper"
-	if [[ -f "$APPSPATH/$1/remove" ]]; then 
-		local lib_path=$(grep "usr/local/lib" "$APPSPATH/$1/remove" | head -1)
-		local disk_usage=$(du -sm "$lib_path" | cut -f1)
-
-		if [[ "$disk_usage" -eq 0 ]]; then
-			printf "%s\n" " STATUS: INSTALLED, LESS THAN 1 MB OF DISK SPACE IN USE"
-		else
-			printf "%s\n" " STATUS: INSTALLED, ABOUT $disk_usage MB OF DISK SPACE IN USE"
-		fi
+	printf "%s\n" " LIBRARY: $1" | tr '[:lower:]' '[:upper:]'
+	if [ -f "$APPSPATH/$1/remove" ]; then 
+		disk_usage=$(find /usr/local/lib -type f -name "$(echo "$1" | sed -e "s/[0-9]//")*" -exec du -sm {} + | tr '	' '\n' | head -1)
+		printf "%s\n" " STATUS: INSTALLED, ABOUT $disk_usage MB OF DISK SPACE IN USE"
 	else 
 		printf "%s\n" " STATUS: NOT INSTALLED"
 	fi
 	echo ""
 	grep "◆ $1 : " "$AMPATH/libs-list" | sed 's#.*:##' | sed 's/(/\n (/g'
 	echo "" && echo " SITE/SOURCES:" && echo ""
-	local site_source=$(wget -qO- "$APPSDB/$1" | grep -Eo "(http|https)://[a-zA-Z0-9./?=_%:-]*" | head -1)
+	site_source=$(wget -qO- "$APPSDB/$1" | grep -Eo "(http|https)://[a-zA-Z0-9./?=_%:-]*" | head -1)
 	echo " $site_source"
 	echo ""
 }
 
 _list() {
-	LIBNUMBER=$(cat $APPSPATH/*/remove 2> /dev/null | grep "usr/local/lib" | wc -l)
-	ITEMSNUMBER=$(cd $APPSPATH && find -name 'remove' -printf "%h\n" 2>/dev/null | sort -u | wc -l)
-	if [ "$AMCLI" == am ]; then
+	LIBNUMBER=$(cat "$APPSPATH/*/remove" 2> /dev/null | grep "usr/local/lib" | wc -l)
+	ITEMSNUMBER=$(cd "$APPSPATH" && find -name 'remove' -printf "%h\n" 2>/dev/null | sort -u | wc -l)
+	if [ "$AMCLI" = am ]; then
 		ITEMSNUMBER=$(("$ITEMSNUMBER"-1))
 	fi
 	APPSNUMBER=$(echo "$(("$ITEMSNUMBER" - "$LIBNUMBER"))")
@@ -97,8 +90,8 @@ _list() {
 	fi
 
 	wget -q --tries=10 --timeout=20 --spider https://github.com && _completion_lists
-	if cat $APPSPATH/*/remove 2> /dev/null | grep -q "usr/local/lib"; then
-		if [ "$LIBNUMBER" == 1 ]; then
+	if cat "$APPSPATH/*/remove" 2> /dev/null | grep -q "usr/local/lib"; then
+		if [ "$LIBNUMBER" = 1 ]; then
 			MESSAGE=$(echo " YOU HAVE INSTALLED $APPSNUMBER APPLICATIONS OUT OF $(grep -e "$" -c $AMPATH/$arch-apps) AVAILABLE, AND $LIBNUMBER LIBRARY")
 		else
 			MESSAGE=$(echo " YOU HAVE INSTALLED $APPSNUMBER APPLICATIONS OUT OF $(grep -e "$" -c $AMPATH/$arch-apps) AVAILABLE, AND $LIBNUMBER LIBRARIES")
@@ -140,7 +133,7 @@ case "$1" in
 			elif grep -q "◆ $arg : " "$AMPATH/libs-list"; then
 				_download_lib "$arg"
 			else
-				printf '%s is not a valid argument\n' " $arg" | tr a-z A-Z
+				printf '%s is not a valid argument\n' " $arg" | tr '[:lower:]' '[:upper:]'
 			fi
 			printf "%s\n" "-----------------------------------------------------------------------"
 		done
@@ -150,17 +143,17 @@ case "$1" in
 		_list
 		if [ "$2" = --appimages ]; then
 			if test -f "$AMCACHEDIR/$arch-appimages"; then
-				echo -e "\n$MESSAGE\n$MESSAGE2\n LIST OF THE $(grep -e "$" -c "$AMCACHEDIR/$arch-appimages") APPIMAGES AVAILABLE IN THE 'AM' REPOSITORY:\n\n$(cat "$AMCACHEDIR/$arch-appimages" | _clean_lists_and_queries)\n" | less -I
-				echo -e "\n$MESSAGE\n$MESSAGE2"
+				printf "\n$MESSAGE\n$MESSAGE2\n LIST OF THE $(grep -e "$" -c "$AMCACHEDIR/$arch-appimages") APPIMAGES AVAILABLE IN THE 'AM' REPOSITORY:\n\n$(fold -sw 81 "$AMCACHEDIR/$arch-appimages" | _clean_lists_and_queries)\n" | less -I
+				printf "\n$MESSAGE\n$MESSAGE2\n"
 			else
 				_online_check
 				curl -Ls "$AMREPO/programs/$arch-appimages" > "$AMCACHEDIR/$arch-appimages"
-				echo -e "\n$MESSAGE\n$MESSAGE2\n LIST OF THE $(grep -e "$" -c "$AMCACHEDIR/$arch-appimages") APPIMAGES AVAILABLE IN THE 'AM' REPOSITORY:\n\n$(cat "$AMCACHEDIR/$arch-appimages" | _clean_lists_and_queries)\n" | less -I
-				echo -e "\n$MESSAGE\n$MESSAGE2"
+				printf "\n$MESSAGE\n$MESSAGE2\n LIST OF THE $(grep -e "$" -c "$AMCACHEDIR/$arch-appimages") APPIMAGES AVAILABLE IN THE 'AM' REPOSITORY:\n\n$(fold -sw 81 "$AMCACHEDIR/$arch-appimages" | _clean_lists_and_queries)\n" | less -I
+				printf "\n$MESSAGE\n$MESSAGE2\n"
 			fi
 		else
-			echo -e "\n$MESSAGE\n$MESSAGE2\n LIST OF THE $(grep -e "$" -c "$AMPATH/$arch-apps") APPLICATIONS AVAILABLE IN THE 'AM' REPOSITORY:\n\n$(cat "$AMPATH/$arch-apps" | _clean_lists_and_queries)\n" | less -I
-			echo -e "\n$MESSAGE\n$MESSAGE2"
+			printf "\n$MESSAGE\n$MESSAGE2\n LIST OF THE $(grep -e "$" -c "$AMPATH/$arch-apps") APPLICATIONS AVAILABLE IN THE 'AM' REPOSITORY:\n\n$(fold -sw 81 "$AMPATH/$arch-apps" | _clean_lists_and_queries)\n" | less -I
+			printf "\n$MESSAGE\n$MESSAGE2\n"
 		fi
 		;;
 
@@ -174,27 +167,27 @@ case "$1" in
 		wget -q --tries=10 --timeout=20 --spider https://github.com && _completion_lists
 		if [ "$2" = --pkg ]; then
 			ARGS=$(echo "$@" | cut -f3- -d ' ' | sed 's/ /, /g')
-			echo -e "\n Search results for packages: $ARGS\n" | tr a-z A-Z
-			grep -i -E "$(echo "$@" | cut -f3- -d ' ' | tr -s ' ' '|')" "$AMPATH/$arch-apps" --color=always | _clean_lists_and_queries
-			grep -i -E "$(echo "$@" | cut -f3- -d ' ' | tr -s ' ' '|')" "$AMPATH/libs-list" --color=always | _clean_lists_and_queries
+			printf "\n Search results for packages: $ARGS\n\n" | tr '[:lower:]' '[:upper:]'
+			grep -i -E "$(echo "$@" | cut -f3- -d ' ' | tr -s ' ' '|')" "$AMPATH/$arch-apps" --color=always | _clean_lists_and_queries | fold -sw 81
+			grep -i -E "$(echo "$@" | cut -f3- -d ' ' | tr -s ' ' '|')" "$AMPATH/libs-list" --color=always | _clean_lists_and_queries | fold -sw 81
 			echo ""
 			exit 0
 		fi
 		if [ "$2" = --appimages ]; then
 			ARGS=$(echo "$@" | cut -f3- -d ' ')
-			echo -e "\n Search results for \"$ARGS\":\n" | tr a-z A-Z
+			printf "\n Search results for \"$ARGS\":\n\n" | tr '[:lower:]' '[:upper:]'
 			PATTERN="$(echo "$@" | cut -f3- -d ' ' | sed 's/ /(?=.*/g; s/$/)/g; s/(/)(/g; s/^/(?=.*/g;')"
 			if ! test -f "$AMCACHEDIR/$arch-appimages"; then
 				_online_check
 				curl -Ls "$AMREPO/programs/$arch-appimages" > "$AMCACHEDIR/$arch-appimages"
 			fi
-			grep -P -i "$PATTERN" "$AMCACHEDIR/$arch-appimages" | _clean_lists_and_queries
+			grep -P -i "$PATTERN" "$AMCACHEDIR/$arch-appimages" | _clean_lists_and_queries | fold -sw 81
 		else
 			ARGS=$(echo "$@" | cut -f2- -d ' ')
-			echo -e "\n Search results for \"$ARGS\":\n" | tr a-z A-Z
+			printf "\n Search results for \"$ARGS\":\n\n" | tr '[:lower:]' '[:upper:]'
 			PATTERN="$(echo "$@" | cut -f2- -d ' ' | sed 's/ /(?=.*/g; s/$/)/g; s/(/)(/g; s/^/(?=.*/g;')"
-			grep -P -i "$PATTERN" "$AMPATH/$arch-apps" | _clean_lists_and_queries
-			grep -P -i "$PATTERN" "$AMPATH/libs-list" | _clean_lists_and_queries
+			grep -P -i "$PATTERN" "$AMPATH/$arch-apps" | _clean_lists_and_queries | fold -sw 81
+			grep -P -i "$PATTERN" "$AMPATH/libs-list" | _clean_lists_and_queries | fold -sw 81
 		fi
 		echo ""
 		exit 0