Merge pull request #822 from ivan-hc/dev

"AM" 7.5: Allow "-l" and "-q" to show only available AppImages

Author: ivan-hc

APP-MANAGER

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-AMVERSION="7.4"
+AMVERSION="7.5"
 
 # Determine main repository and branch
 AMREPO="https://raw.githubusercontent.com/ivan-hc/AM/main"
@@ -468,6 +468,7 @@ function _generate_options_list() {
 		unlock
 		update
 		web
+		--appimages
 		--apps
 		--byname
 		--config

README.md

@@ -514,7 +514,9 @@ See also "[How to update or remove apps manually](#how-to-update-or-remove-apps-
 
  `-l`
 
- DESCRIPTION:	Shows the list of all the apps available in the repository.
+ `-l --appimages`
+
+ DESCRIPTION:	Shows the list of all the apps available in the repository. Add the "--appimages" option to list only the AppImages.
  ___________________________________________________________________________
 
  `-o`, `overwrite`
@@ -532,9 +534,11 @@ See also "[How to update or remove apps manually](#how-to-update-or-remove-apps-
 
  `-q {KEYWORD}`
 
+ `-q --appimages {KEYWORD}`
+
  `-q --pkg {PROGRAM1} {PROGRAM2}`
 
- DESCRIPTION:	Can be used to search for keywords and terms in the list of available applications packages to display matches. This can be useful if you are looking for applications having a specific feature. Add the suboption "--pkg" to search only the names of one or more apps.
+ DESCRIPTION:	Can be used to search for keywords and terms in the list of available applications packages to display matches. This can be useful if you are looking for applications having a specific feature. Add the "--appimages" option to list only the AppImages. Add the suboption "--pkg" to search only the names of one or more apps.
  ___________________________________________________________________________
 
  `-r`, `remove`
@@ -893,6 +897,10 @@ Option `-q` or `query` shows search results from the list above.
 
 https://github.com/ivan-hc/AM/assets/88724353/2ac875df-5210-4d77-91d7-24c45eceaa2b
 
+From version 7.5 it is possibler to add the `--appimages` option to list only the AppImages.
+
+https://github.com/user-attachments/assets/864e95dd-0f69-4b8b-b6b3-289af3610aac
+
 ------------------------------------------------------------------------
 
 | [Back to "Guides and tutorials"](#guides-and-tutorials) | [Back to "Main Index"](#main-index) |

modules/database.am

@@ -106,8 +106,6 @@ _list() {
 	else
 		MESSAGE=$(echo " YOU HAVE INSTALLED $APPSNUMBER APPLICATIONS OUT OF $(grep -e "$" -c $AMPATH/$arch-apps) AVAILABLE")
 	fi
-	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"
 }
 
 # Define functions
@@ -150,6 +148,20 @@ case "$1" in
 
 	'-l'|'list')
 		_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"
+			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"
+			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"
+		fi
 		;;
 
 	'-q'|'query')
@@ -168,11 +180,22 @@ case "$1" in
 			echo ""
 			exit 0
 		fi
-		ARGS=$(echo "$@" | cut -f2- -d ' ')
-		echo -e "\n Search results for \"$ARGS\":\n" | tr a-z A-Z
-		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
+		if [ "$2" = --appimages ]; then
+			ARGS=$(echo "$@" | cut -f3- -d ' ')
+			echo -e "\n Search results for \"$ARGS\":\n" | tr a-z A-Z
+			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
+		else
+			ARGS=$(echo "$@" | cut -f2- -d ' ')
+			echo -e "\n Search results for \"$ARGS\":\n" | tr a-z A-Z
+			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
+		fi
 		echo ""
 		exit 0
 		;;

modules/help.am

@@ -156,8 +156,11 @@ function _help_body() {
  -l, list
 
  SYNOPSIS:	-l
+ 		-l --appimages
 
  DESCRIPTION:	Shows the list of all the apps available in the repository.
+
+ Add the "--appimages" option to list only the AppImages.
  __________________________________________________________________________
 
  -o, overwrite
@@ -170,10 +173,13 @@ function _help_body() {
  -q, query
 
  SYNOPSIS:	-q {KEYWORD}
+ 		-q --appimages {KEYWORD}
  		-q --pkg {PROGRAM1} {PROGRAM2}
 
  DESCRIPTION:	Search for keywords in the list of available applications.
 
+ Add the "--appimages" option to list only the AppImages.
+
  Add the "--pkg" option to search only the names of one or more apps.
  __________________________________________________________________________
 

programs/aarch64-appimages

@@ -0,0 +1,6 @@
+◆ 86box : Emulator of x86-based machines based on PCem.
+◆ appimagetool : Tool to generate an AppImage from an existing AppDir.
+◆ crossmobile : Create native iOS/Android/Windows apps in Java. 
+◆ nanosaur : Pangea Software’s game, adventure of a cybernetic dinosaur.
+◆ streamlink : Command-line which pipes video streams from various services.
+◆ zmninja : Ionic app for Home/Commerical Security Surveillance.

programs/aarch64-apps

@@ -1,13 +1,11 @@
 ◆ 86box : Emulator of x86-based machines based on PCem.
-◆ aih2am : Tool to convert apps from appimage.github.io to AM's installers.
 ◆ antares : An useful SQL client based on Electron.js and Vue.js.
 ◆ appimagetool : Tool to generate an AppImage from an existing AppDir.
 ◆ arch-deployer : Script to convert Arch Linux packages to AppDir/AppImage.
 ◆ btop : A command line utility to monitor system resources, like Htop.
 ◆ crossmobile : Create native iOS/Android/Windows apps in Java. 
 ◆ figma-linux : First interface design tool based in the browser (graphics). 
 ◆ freac : fre:ac, free audio converter and CD ripper for various encoders.
-◆ github2am : CLI to convert apps from any github repository to AM's installers.
 ◆ nanosaur : Pangea Software’s game, adventure of a cybernetic dinosaur.
 ◆ streamlink : Command-line which pipes video streams from various services.
 ◆ supertuxkart : Free kart racing game focused on fun.

programs/appimage-lister-uniq.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+DIRS=$(find . -type d | grep "/" | sed 's:.*/::')
+for arch in $DIRS; do
+	rm -f "$arch-appimages"
+	ARGS=$(awk -v FS="(◆ | : )" '{print $2}' <"$arch-apps")
+	for arg in $ARGS; do
+		if grep -qe "appimage\|mage\$" "./$arch/$arg" 1> /dev/null; then
+			if ! grep "◆ $arg :" "$arch-apps" | grep -ie "\"kdegames\"\|\"kdeutils\"" 1> /dev/null; then
+				grep "◆ $arg :" "$arch-apps" >> "$arch-appimages"
+			fi
+		fi
+	done
+done

programs/i686-appimages

@@ -0,0 +1,17 @@
+◆ appimagelauncher : CLI helper for running and integrating AppImages.
+◆ appimagetool : Tool to generate an AppImage from an existing AppDir.
+◆ appimageupdate : Tool to update an AppImage using embedded information.
+◆ appimageupdatetool : Tool to update an AppImage using embedded information.
+◆ armagetronad : Multiplayer game in 3d that emulates the movie "Tron".
+◆ chromium : Web Browser. Open source base of Google Chrome, Edge and Brave.
+◆ gimp : GNU Image Manipulation Program, cross-platform image and photo editor.
+◆ kdegames : Full & updatable KDE Games suite from Debian Stable (recommended).
+◆ pkg2appimage : Utility to convert .yml recipes to AppDir (see appimagetool).
+◆ python2.7 : Interactive high-level object-oriented language (version 2.7).
+◆ python3.10 : Interactive high-level object-oriented language (version 3.10).
+◆ python3.5 : Interactive high-level object-oriented language (version 3.5).
+◆ python3.6 : Interactive high-level object-oriented language (version 3.6).
+◆ python3.7 : Interactive high-level object-oriented language (version 3.7).
+◆ python3.8 : Interactive high-level object-oriented language (version 3.8).
+◆ python3.9 : Interactive high-level object-oriented language (version 3.9).
+◆ vlc : Free and Open Source Video & Media player for Audio, streaming and more.