From c681a5bf272fedd10e33d0c50fce11bb497097e0 Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 07:26:28 +0200 Subject: [PATCH 01/26] Update install.am: remove unneeded patches --- modules/install.am | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/modules/install.am b/modules/install.am index d7cb261c8..555e6b0c3 100644 --- a/modules/install.am +++ b/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,13 +29,7 @@ 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() { @@ -51,11 +37,6 @@ function _apply_patches() { _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 } From bc1ecdade035475a2e448adee996638073083cb0 Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 07:31:24 +0200 Subject: [PATCH 02/26] Update download.am: remove unneeded patches --- modules/download.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/download.am b/modules/download.am index b8fc674ce..4eed64809 100644 --- a/modules/download.am +++ b/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 From f9bef456cd3831c2372314b3b687a1f5b0da7548 Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 14:50:09 +0200 Subject: [PATCH 03/26] Update README.md --- README.md | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 91a318e59..481a90a25 100644 --- a/README.md +++ b/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,16 @@ 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. + +------------------------------------------------------------------------ - "**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 +128,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. From eaa18df1373cef9c1e8ed5ca176de332acacf3cc Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:01:08 +0200 Subject: [PATCH 04/26] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 481a90a25..b53d1c29d 100644 --- a/README.md +++ b/README.md @@ -118,6 +118,8 @@ NOTE, all installation scripts used before June 28, 2024 show launchers in /usr/ ``` 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: From b7cd5a2034edfea90401efa8a9d4a9ca879b7f2d Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:20:29 +0200 Subject: [PATCH 05/26] Update appimageupdate --- programs/x86_64/appimageupdate | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/x86_64/appimageupdate b/programs/x86_64/appimageupdate index be841a0ff..2d3169b4c 100644 --- a/programs/x86_64/appimageupdate +++ b/programs/x86_64/appimageupdate @@ -12,7 +12,7 @@ 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 # Use tar fx ./*tar* here for example in this line in case a compressed file is downloaded. @@ -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 From 2af756a591b05a3d7f3c6253504fdf566b2cd1f0 Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:25:09 +0200 Subject: [PATCH 06/26] Enable zsync in 5 apps --- programs/x86_64/appimagehelper | 2 +- programs/x86_64/appimagetool | 2 +- programs/x86_64/appimageupdate | 2 +- programs/x86_64/appimageupdatetool | 2 +- programs/x86_64/pkg2appimage | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/x86_64/appimagehelper b/programs/x86_64/appimagehelper index bae513538..8451098e9 100644 --- a/programs/x86_64/appimagehelper +++ b/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" diff --git a/programs/x86_64/appimagetool b/programs/x86_64/appimagetool index f3b6df001..4026ad039 100644 --- a/programs/x86_64/appimagetool +++ b/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" diff --git a/programs/x86_64/appimageupdate b/programs/x86_64/appimageupdate index 2d3169b4c..8d61c8c76 100644 --- a/programs/x86_64/appimageupdate +++ b/programs/x86_64/appimageupdate @@ -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.*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" diff --git a/programs/x86_64/appimageupdatetool b/programs/x86_64/appimageupdatetool index 7926d7252..5343c8206 100644 --- a/programs/x86_64/appimageupdatetool +++ b/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" diff --git a/programs/x86_64/pkg2appimage b/programs/x86_64/pkg2appimage index 0288bd1b5..ac0d840e4 100644 --- a/programs/x86_64/pkg2appimage +++ b/programs/x86_64/pkg2appimage @@ -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/AppImageCommunity/pkg2appimage/releases | sed 's/[()",{} ]/\n/g' | grep -oi "https.*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" From 527a62eb69e31bc57d517397b5a32444658c51c7 Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:43:50 +0200 Subject: [PATCH 07/26] Update README.md --- README.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b53d1c29d..5cce4f488 100644 --- a/README.md +++ b/README.md @@ -1312,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. ------------------------------------------------------------------------ From 90944e3b22adcd553d469b0d5f01957250ca8e33 Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:51:32 +0200 Subject: [PATCH 08/26] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5cce4f488..de8ef1724 100644 --- a/README.md +++ b/README.md @@ -265,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; From 73deaffd2a82dab2dabf685bc75dd98b0581f3a9 Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 16:20:35 +0200 Subject: [PATCH 09/26] Enable zsync in wine* --- programs/x86_64/wine-devel | 2 +- programs/x86_64/wine-stable | 2 +- programs/x86_64/wine-staging | 2 +- programs/x86_64/wine-staging-ge-proton | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/x86_64/wine-devel b/programs/x86_64/wine-devel index 424e8f642..3d0762715 100644 --- a/programs/x86_64/wine-devel +++ b/programs/x86_64/wine-devel @@ -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/mmtrt/WINE_AppImage/releases | sed 's/[()",{} ]/\n/g' | grep -oi "https.*mage$" | grep -vi "i386|i686|aarch64|arm64|armv7l\|v8" | grep -i "devel" | 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" diff --git a/programs/x86_64/wine-stable b/programs/x86_64/wine-stable index f4a274d8c..3e1db3a93 100644 --- a/programs/x86_64/wine-stable +++ b/programs/x86_64/wine-stable @@ -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/mmtrt/WINE_AppImage/releases | sed 's/[()",{} ]/\n/g' | grep -oi "https.*mage$" | grep -vi "i386|i686|aarch64|arm64|armv7l\|v8" | grep -i "stable" | 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" diff --git a/programs/x86_64/wine-staging b/programs/x86_64/wine-staging index 4f692cf74..43e0caad1 100644 --- a/programs/x86_64/wine-staging +++ b/programs/x86_64/wine-staging @@ -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/mmtrt/WINE_AppImage/releases | sed 's/[()",{} ]/\n/g' | grep -oi "https.*mage$" | grep -vi "i386|i686|aarch64|arm64|armv7l\|proton\|v8" | grep -i "staging" | 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" diff --git a/programs/x86_64/wine-staging-ge-proton b/programs/x86_64/wine-staging-ge-proton index 768fb5196..da0cc539d 100644 --- a/programs/x86_64/wine-staging-ge-proton +++ b/programs/x86_64/wine-staging-ge-proton @@ -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/mmtrt/WINE_AppImage/releases | sed 's/[()",{} ]/\n/g' | grep -oi "https.*mage$" | grep -vi "i386|i686|aarch64|arm64|armv7l\|v8" | grep -i "proton" | 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" From 8a0480cad5aced567f565213d72530b745409b47 Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 16:56:58 +0200 Subject: [PATCH 10/26] Update install.am: update filters for tar, zip and deb packages --- modules/install.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/install.am b/modules/install.am index 555e6b0c3..7dcfb375e 100644 --- a/modules/install.am +++ b/modules/install.am @@ -130,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 @@ -143,12 +143,12 @@ 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 From 8b4a153f2db7ff04483fafdbb99504e5522c5f1c Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:14:54 +0200 Subject: [PATCH 11/26] Update install.am: update filter for apps with zsync enabled --- modules/install.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/install.am b/modules/install.am index 7dcfb375e..84b417b99 100644 --- a/modules/install.am +++ b/modules/install.am @@ -153,7 +153,7 @@ function _install_arg() { 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 From f51a63d3c90338917929fa5a276fa8c37ca918ac Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:34:32 +0200 Subject: [PATCH 12/26] Update templates for pkg2appimaged apps and Firefox profiles --- templates/AM-SAMPLE-Firefox-webapp | 23 +++++++++++------------ templates/AM-SAMPLE-pkg2appimage | 4 ++-- templates/AM-SAMPLE-pkg2appimage-custom | 4 ++-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/templates/AM-SAMPLE-Firefox-webapp b/templates/AM-SAMPLE-Firefox-webapp index d5c2eb4ee..fc4b7aff7 100644 --- a/templates/AM-SAMPLE-Firefox-webapp +++ b/templates/AM-SAMPLE-Firefox-webapp @@ -5,23 +5,22 @@ APPNAME="GIVEMEANAME" ICONURL="YOURICONURL" # CREATING THE FOLDER -mkdir /opt/$APP -cd /opt/$APP; +mkdir /opt/"$APP" +cd /opt/"$APP" # ADD THE REMOVER -echo '#!/bin/sh' >> /opt/$APP/remove -echo "rm -R -f /usr/share/applications/AM-$APP.desktop /opt/$APP /usr/local/bin/$APP" >> /opt/$APP/remove -chmod a+x /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 -cat >> /usr/local/bin/$APP << 'EOF' +cat >> /usr/local/bin/"$APP" << 'EOF' #!/bin/sh sh -c 'XAPP_FORCE_GTKWINDOW_ICON=/opt/ffwa-SAMPLE/icons/ffwa-SAMPLE firefox --class WebApp-SAMPLE --profile /opt/ffwa-SAMPLE --no-remote -url 'MYWEBSITE'' EOF -chmod a+x /usr/local/bin/$APP +chmod a+x /usr/local/bin/"$APP" # LAUNCHER -rm /usr/share/applications/AM-$APP.desktop echo "[Desktop Entry] Name=$APPNAME Exec=$APP @@ -29,14 +28,14 @@ Icon=/opt/$APP/icons/$APP Type=Application Terminal=false Categories=YOURCATEGORY; -Comment=Web Application & Firefox Profile for $APPNAME" >> /usr/share/applications/AM-$APP.desktop +Comment=Web Application & Firefox Profile for $APPNAME" > /usr/local/share/applications/"$APP"-AM.desktop # ICON -mkdir /opt/$APP/icons -wget $ICONURL -O /opt/$APP/icons/$APP +mkdir /opt/"$APP"/icons +wget "$ICONURL" -O /opt/"$APP"/icons/"$APP" # ADD PREFERENCES -cat >> /opt/$APP/prefs.js << 'EOF' +cat >> /opt/"$APP"/prefs.js << 'EOF' // Mozilla User Preferences // DO NOT EDIT THIS FILE. diff --git a/templates/AM-SAMPLE-pkg2appimage b/templates/AM-SAMPLE-pkg2appimage index 4d5b13962..7be17d9e0 100644 --- a/templates/AM-SAMPLE-pkg2appimage +++ b/templates/AM-SAMPLE-pkg2appimage @@ -6,7 +6,7 @@ APP=SAMPLE # CREATE DIRECTORIES AND ADD REMOVER [ -n "$APP" ] && mkdir -p "/opt/$APP/tmp" "/opt/$APP/icons" && cd "/opt/$APP/tmp" || exit 1 printf "#!/bin/sh\nset -e\nrm -f /usr/local/bin/$APP\nrm -R -f /opt/$APP" > "/opt/$APP/remove" -printf '\n%s' "rm -f /usr/share/applications/AM-$APP.desktop" >> "/opt/$APP/remove" +printf '\n%s' "rm -f /usr/local/share/applications/$APP-AM.desktop" >> "/opt/$APP/remove" chmod a+x "/opt/$APP/remove" # DOWNLOADING THE DEPENDENCIES @@ -120,5 +120,5 @@ while [ "$COUNT" -lt 10 ]; do # Tries to get the actual icon/desktop if it is a COUNT=$((COUNT + 1)) done sed -i "s#Exec=[^ ]*#Exec=$APP#g; s#Icon=.*#Icon=/opt/$APP/icons/$APP#g" ./"$APP".desktop -mv ./"$APP".desktop /usr/share/applications/AM-"$APP".desktop && mv ./DirIcon ./icons/"$APP" 1>/dev/null +mv ./"$APP".desktop /usr/local/share/applications/"$APP"-AM.desktop && mv ./DirIcon ./icons/"$APP" 1>/dev/null rm -R -f ./squashfs-root diff --git a/templates/AM-SAMPLE-pkg2appimage-custom b/templates/AM-SAMPLE-pkg2appimage-custom index 145ce79a7..587e073fa 100644 --- a/templates/AM-SAMPLE-pkg2appimage-custom +++ b/templates/AM-SAMPLE-pkg2appimage-custom @@ -6,7 +6,7 @@ APP=SAMPLE # CREATE DIRECTORIES AND ADD REMOVER [ -n "$APP" ] && mkdir -p "/opt/$APP/tmp" "/opt/$APP/icons" && cd "/opt/$APP/tmp" || exit 1 printf "#!/bin/sh\nset -e\nrm -f /usr/local/bin/$APP\nrm -R -f /opt/$APP" > "/opt/$APP/remove" -printf '\n%s' "rm -f /usr/share/applications/AM-$APP.desktop" >> "/opt/$APP/remove" +printf '\n%s' "rm -f /usr/local/share/applications/$APP-AM.desktop" >> "/opt/$APP/remove" chmod a+x "/opt/$APP/remove" # DOWNLOADING THE DEPENDENCIES @@ -174,5 +174,5 @@ while [ "$COUNT" -lt 10 ]; do # Tries to get the actual icon/desktop if it is a COUNT=$((COUNT + 1)) done sed -i "s#Exec=[^ ]*#Exec=$APP#g; s#Icon=.*#Icon=/opt/$APP/icons/$APP#g" ./"$APP".desktop -mv ./"$APP".desktop /usr/share/applications/AM-"$APP".desktop && mv ./DirIcon ./icons/"$APP" 1>/dev/null +mv ./"$APP".desktop /usr/local/share/applications/"$APP"-AM.desktop && mv ./DirIcon ./icons/"$APP" 1>/dev/null rm -R -f ./squashfs-root From a552df73cc8b88a0e487ef6e3f18f9811404bfa7 Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:42:40 +0200 Subject: [PATCH 13/26] Update firefox webapps --- programs/x86_64/ffwa-facebook | 10 +++++----- programs/x86_64/ffwa-github | 10 +++++----- programs/x86_64/ffwa-gmail | 10 +++++----- programs/x86_64/ffwa-netflix | 10 +++++----- programs/x86_64/ffwa-reddit | 10 +++++----- programs/x86_64/ffwa-twitter | 10 +++++----- programs/x86_64/ffwa-whatsapp | 10 +++++----- programs/x86_64/ffwa-wikipedia | 10 +++++----- programs/x86_64/ffwa-youtube | 10 +++++----- 9 files changed, 45 insertions(+), 45 deletions(-) diff --git a/programs/x86_64/ffwa-facebook b/programs/x86_64/ffwa-facebook index ac7b74c8b..e08a09a3e 100644 --- a/programs/x86_64/ffwa-facebook +++ b/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 diff --git a/programs/x86_64/ffwa-github b/programs/x86_64/ffwa-github index f0add0087..2df425fe1 100644 --- a/programs/x86_64/ffwa-github +++ b/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 diff --git a/programs/x86_64/ffwa-gmail b/programs/x86_64/ffwa-gmail index 5a6eb08be..27384f657 100644 --- a/programs/x86_64/ffwa-gmail +++ b/programs/x86_64/ffwa-gmail @@ -4,13 +4,13 @@ APP=ffwa-gmail APPNAME="Gmail" 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 diff --git a/programs/x86_64/ffwa-netflix b/programs/x86_64/ffwa-netflix index 8297ac504..df2e4a376 100644 --- a/programs/x86_64/ffwa-netflix +++ b/programs/x86_64/ffwa-netflix @@ -4,13 +4,13 @@ APP=ffwa-netflix APPNAME="Netflix" 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 diff --git a/programs/x86_64/ffwa-reddit b/programs/x86_64/ffwa-reddit index bcc8daebe..d156fa04f 100644 --- a/programs/x86_64/ffwa-reddit +++ b/programs/x86_64/ffwa-reddit @@ -4,13 +4,13 @@ APP=ffwa-reddit APPNAME="Reddit" 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 diff --git a/programs/x86_64/ffwa-twitter b/programs/x86_64/ffwa-twitter index 9c5c0e97f..9ecf0f526 100644 --- a/programs/x86_64/ffwa-twitter +++ b/programs/x86_64/ffwa-twitter @@ -4,13 +4,13 @@ APP=ffwa-twitter APPNAME="Twitter" 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 diff --git a/programs/x86_64/ffwa-whatsapp b/programs/x86_64/ffwa-whatsapp index 97b37132c..f3d51294c 100644 --- a/programs/x86_64/ffwa-whatsapp +++ b/programs/x86_64/ffwa-whatsapp @@ -4,13 +4,13 @@ APP=ffwa-whatsapp APPNAME="WhatsApp" 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 diff --git a/programs/x86_64/ffwa-wikipedia b/programs/x86_64/ffwa-wikipedia index f3b66d7fa..2cfdd56a1 100644 --- a/programs/x86_64/ffwa-wikipedia +++ b/programs/x86_64/ffwa-wikipedia @@ -4,13 +4,13 @@ APP=ffwa-wikipedia APPNAME="Wikipedia" 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 diff --git a/programs/x86_64/ffwa-youtube b/programs/x86_64/ffwa-youtube index f21d605b6..45f167baf 100644 --- a/programs/x86_64/ffwa-youtube +++ b/programs/x86_64/ffwa-youtube @@ -4,13 +4,13 @@ APP=ffwa-youtube APPNAME="YouTube" 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 From c56d66546d71da11598a7e112f24e3183cf41c93 Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:45:00 +0200 Subject: [PATCH 14/26] Delete templates/AM-SAMPLE-Anywhere-generic --- templates/AM-SAMPLE-Anywhere-generic | 70 ---------------------------- 1 file changed, 70 deletions(-) delete mode 100644 templates/AM-SAMPLE-Anywhere-generic diff --git a/templates/AM-SAMPLE-Anywhere-generic b/templates/AM-SAMPLE-Anywhere-generic deleted file mode 100644 index 1d9ebf32c..000000000 --- a/templates/AM-SAMPLE-Anywhere-generic +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh - -APP=SAMPLE -SITE="REPLACETHIS" - -# CREATE THE FOLDER -mkdir /opt/$APP -cd /opt/$APP - -# ADD THE REMOVER -echo '#!/bin/sh' >> /opt/$APP/remove -echo "rm -R -f /usr/share/applications/AM-$APP.desktop /opt/$APP /usr/local/bin/$APP" >> /opt/$APP/remove -chmod a+x /opt/$APP/remove - -# DOWNLOAD THE ARCHIVE -mkdir tmp -cd ./tmp - -version=$(THISISTHEURL) -wget $version -echo "$version" >> /opt/$APP/version -cd .. -FUNCTION -rm -R -f ./tmp - -# LINK -ln -s /opt/$APP/$APP /usr/local/bin/$APP - -# SCRIPT TO UPDATE THE PROGRAM -cat >> /opt/$APP/AM-updater << 'EOF' -#!/usr/bin/env bash -APP=SAMPLE -version0=$(cat /opt/$APP/version) -version=$(THISISTHEURL) -if [ $version = $version0 ]; then - echo "Update not needed!" -else - notify-send "A new version of $APP is available, please wait" - mkdir /opt/$APP/tmp - cd /opt/$APP/tmp - wget $version - cd .. - FUNCTION - rm ./version - echo $version >> ./version - rm -R -f ./tmp ./*~ - notify-send "$APP is updated!" -fi -EOF -chmod a+x /opt/$APP/AM-updater - -# LAUNCHER & ICON -app=$(echo $APP | cut -c -3) -cd /opt/$APP -mv ./*.desktop ./$APP.desktop 2>/dev/null -CHANGEEXEC=$(cat ./$APP.desktop | grep Exec= | tr ' ' '\n' | tr '=' '\n' | tr '/' '\n' | grep $app | head -1) -sed -i "s#$CHANGEEXEC#$APP#g" ./$APP.desktop -sed -i "s#Exec=/bin/#Exec=#g" ./$APP.desktop -sed -i "s#Exec=/usr/bin/#Exec=#g" ./$APP.desktop -CHANGEICON=$(cat ./$APP.desktop | grep Icon= | head -1) -sed -i "s#$CHANGEICON#Icon=/opt/$APP/icons/$APP#g" ./$APP.desktop - -mkdir icons -mv ./*.svg ./icons/$APP 2>/dev/null -mv ./*.png ./icons/$APP 2>/dev/null -mv ./*$app*.png ./icons/$APP 2>/dev/null -mv ./*128*.png ./icons/$APP 2>/dev/null -mv ./*256*.png ./icons/$APP 2>/dev/null - -mv ./$APP.desktop /usr/share/applications/AM-$APP.desktop From 4fd8943a236b97295d3d35597ba2ff829d698a1c Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:45:08 +0200 Subject: [PATCH 15/26] Delete templates/AM-SAMPLE-AUR-generic --- templates/AM-SAMPLE-AUR-generic | 70 --------------------------------- 1 file changed, 70 deletions(-) delete mode 100644 templates/AM-SAMPLE-AUR-generic diff --git a/templates/AM-SAMPLE-AUR-generic b/templates/AM-SAMPLE-AUR-generic deleted file mode 100644 index af9697cd6..000000000 --- a/templates/AM-SAMPLE-AUR-generic +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh - -APP=SAMPLE -SITE="REPLACETHIS" - -# CREATE THE FOLDER -mkdir /opt/$APP -cd /opt/$APP - -# ADD THE REMOVER -echo '#!/bin/sh' >> /opt/$APP/remove -echo "rm -R -f /usr/share/applications/AM-$APP.desktop /opt/$APP /usr/local/bin/$APP" >> /opt/$APP/remove -chmod a+x /opt/$APP/remove - -# DOWNLOAD THE ARCHIVE -mkdir tmp -cd ./tmp - -version=$(echo $(curl -Ls https://aur.archlinux.org/packages/AURREPO | grep -Eo "(http|https)://[a-zA-Z0-9./?=_%:-]*" | grep -i "FILENAMEEXTENSION" | grep -w -v aarch64 | grep -w -v arm64 | grep -w -v armv7l | grep -w -v ".asc" | grep -w -v "archlinux.org" | head -1)) -wget $version -echo "$version" >> /opt/$APP/version -cd .. -FUNCTION -rm -R -f ./tmp - -# LINK -ln -s /opt/$APP/$APP /usr/local/bin/$APP - -# SCRIPT TO UPDATE THE PROGRAM -cat >> /opt/$APP/AM-updater << 'EOF' -#!/usr/bin/env bash -APP=SAMPLE -version0=$(cat /opt/$APP/version) -version=$(echo $(curl -Ls https://aur.archlinux.org/packages/AURREPO | grep -Eo "(http|https)://[a-zA-Z0-9./?=_%:-]*" | grep -i "FILENAMEEXTENSION" | grep -w -v aarch64 | grep -w -v arm64 | grep -w -v armv7l | grep -w -v ".asc" | grep -w -v "archlinux.org" | head -1)) -if [ $version = $version0 ]; then - echo "Update not needed!" -else - notify-send "A new version of $APP is available, please wait" - mkdir /opt/$APP/tmp - cd /opt/$APP/tmp - wget $version - cd .. - FUNCTION - rm ./version - echo $version >> ./version - rm -R -f ./tmp ./*~ - notify-send "$APP is updated!" -fi -EOF -chmod a+x /opt/$APP/AM-updater - -# LAUNCHER & ICON -app=$(echo $APP | cut -c -3) -cd /opt/$APP -mv ./*.desktop ./$APP.desktop 2>/dev/null -CHANGEEXEC=$(cat ./$APP.desktop | grep Exec= | tr ' ' '\n' | tr '=' '\n' | tr '/' '\n' | grep $app | head -1) -sed -i "s#$CHANGEEXEC#$APP#g" ./$APP.desktop -sed -i "s#Exec=/bin/#Exec=#g" ./$APP.desktop -sed -i "s#Exec=/usr/bin/#Exec=#g" ./$APP.desktop -CHANGEICON=$(cat ./$APP.desktop | grep Icon= | head -1) -sed -i "s#$CHANGEICON#Icon=/opt/$APP/icons/$APP#g" ./$APP.desktop - -mkdir icons -mv ./*.svg ./icons/$APP 2>/dev/null -mv ./*.png ./icons/$APP 2>/dev/null -mv ./*$app*.png ./icons/$APP 2>/dev/null -mv ./*128*.png ./icons/$APP 2>/dev/null -mv ./*256*.png ./icons/$APP 2>/dev/null - -mv ./$APP.desktop /usr/share/applications/AM-$APP.desktop From 8f97b5eca44677fbe9ddaa140210616522da95ba Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:45:16 +0200 Subject: [PATCH 16/26] Delete templates/AM-SAMPLE-AppImage-from-AUR --- templates/AM-SAMPLE-AppImage-from-AUR | 106 -------------------------- 1 file changed, 106 deletions(-) delete mode 100644 templates/AM-SAMPLE-AppImage-from-AUR diff --git a/templates/AM-SAMPLE-AppImage-from-AUR b/templates/AM-SAMPLE-AppImage-from-AUR deleted file mode 100644 index d695873c9..000000000 --- a/templates/AM-SAMPLE-AppImage-from-AUR +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh - -APP=SAMPLE -SITE="REPLACETHIS" - -# CREATE THE FOLDER -mkdir /opt/$APP -cd /opt/$APP - -# ADD THE REMOVER -echo '#!/bin/sh' >> /opt/$APP/remove -echo "rm -R -f /usr/share/applications/AM-$APP.desktop /opt/$APP /usr/local/bin/$APP" >> /opt/$APP/remove -chmod a+x /opt/$APP/remove - -# DOWNLOAD THE ARCHIVE -mkdir tmp -cd ./tmp - -version=$(echo $(curl -Ls https://aur.archlinux.org/packages/AURREPO | grep -Eo "(http|https)://[a-zA-Z0-9./?=_%:-]*" | grep -i ".appimage" | grep -w -v arm64 | grep -w -v armv7l | grep -w -v ".asc" | grep -w -v ".zsync" | grep -w -v "archlinux.org" | head -1)) -wget $version -echo "$version" >> /opt/$APP/version -cd .. -mv ./tmp/* ./$APP -chmod a+x /opt/$APP/$APP -rmdir ./tmp - -# LINK -ln -s /opt/$APP/$APP /usr/local/bin/$APP - -# SCRIPT TO UPDATE THE PROGRAM -cat >> /opt/$APP/AM-updater << 'EOF' -#!/usr/bin/env bash -APP=SAMPLE -version0=$(cat /opt/$APP/version) -version=$(echo $(curl -Ls https://aur.archlinux.org/packages/AURREPO | grep -Eo "(http|https)://[a-zA-Z0-9./?=_%:-]*" | grep -i ".appimage" | grep -w -v arm64 | grep -w -v armv7l | grep -w -v ".asc" | grep -w -v ".zsync" | grep -w -v "archlinux.org" | head -1)) -if [ $version = $version0 ]; then - echo "Update not needed!" -else - notify-send "A new version of $APP is available, please wait" - mkdir /opt/$APP/tmp - cd /opt/$APP/tmp - wget $version - cd .. - rm ./version - echo $version >> ./version - mv --backup=t ./tmp/* ./$APP - chmod a+x /opt/$APP/$APP - rm -R -f ./tmp ./*~ - notify-send "$APP is updated!" -fi -EOF -chmod a+x /opt/$APP/AM-updater - -# LAUNCHER & ICON -app=$(echo $APP | cut -c -3) -cd /opt/$APP -./$APP --appimage-extract *.desktop 1>/dev/null -./$APP --appimage-extract share/applications/*.desktop 1>/dev/null -./$APP --appimage-extract usr/share/applications/*.desktop 1>/dev/null -mv squashfs-root/*.desktop ./$APP.desktop -mv squashfs-root/share/applications/*.desktop ./$APP.desktop -mv squashfs-root/usr/share/applications/*.desktop ./$APP.desktop -if [ ! -e ./$APP.desktop ]; then - rm ./$APP.desktop; ./$APP --appimage-extract usr/share/applications/*$app*.desktop - mv squashfs-root/usr/share/applications/*.desktop ./$APP.desktop -fi -if [ ! -e ./$APP.desktop ]; then - rm ./$APP.desktop; ./$APP --appimage-extract share/applications/*$app*.desktop 1>/dev/null - mv squashfs-root/share/applications/*.desktop ./$APP.desktop -fi -CHANGEEXEC=$(cat ./$APP.desktop | grep Exec= | tr ' ' '\n' | tr '=' '\n' | tr '/' '\n' | grep $app | head -1) -sed -i "s#$CHANGEEXEC#$APP#g" ./$APP.desktop -sed -i "s#AppRun#$APP#g" ./$APP.desktop -sed -i "s#Exec=/bin/#Exec=#g" ./$APP.desktop -sed -i "s#Exec=/usr/bin/#Exec=#g" ./$APP.desktop -CHANGEICON=$(cat ./$APP.desktop | grep Icon= | head -1) -sed -i "s#$CHANGEICON#Icon=/opt/$APP/icons/$APP#g" ./$APP.desktop - -mkdir icons -mv $(./$APP --appimage-extract *.png) ./icons/$APP 2>/dev/null -mv $(./$APP --appimage-extract *.svg) ./icons/$APP 2>/dev/null -./$APP --appimage-extract share/icons/*/*/* 1>/dev/null -./$APP --appimage-extract usr/share/icons/*/*/* 1>/dev/null -./$APP --appimage-extract share/icons/*/*/*/* 1>/dev/null -./$APP --appimage-extract usr/share/icons/*/*/*/* 1>/dev/null -mv ./squashfs-root/share/icons/hicolor/22x22/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/24x24/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/32x32/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/48x48/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/64x64/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/128x128/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/256x256/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/512x512/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/scalable/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/22x22/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/24x24/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/32x32/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/48x48/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/64x64/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/128x128/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/256x256/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/512x512/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/scalable/apps/*$app* ./icons/$APP 2>/dev/null - -rm -R -f /opt/$APP/squashfs-root -mv ./$APP.desktop /usr/share/applications/AM-$APP.desktop From eb75ea087cf81ced5d473fc38739ae7594965d95 Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:45:31 +0200 Subject: [PATCH 17/26] Delete templates/AM-SAMPLE-AppImage-from-Anywhere --- templates/AM-SAMPLE-AppImage-from-Anywhere | 109 --------------------- 1 file changed, 109 deletions(-) delete mode 100644 templates/AM-SAMPLE-AppImage-from-Anywhere diff --git a/templates/AM-SAMPLE-AppImage-from-Anywhere b/templates/AM-SAMPLE-AppImage-from-Anywhere deleted file mode 100644 index 1bfcae1a3..000000000 --- a/templates/AM-SAMPLE-AppImage-from-Anywhere +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh - -APP=SAMPLE -SITE="REPLACETHIS" - -# CREATE THE FOLDER -mkdir /opt/$APP -cd /opt/$APP - -# ADD THE REMOVER -echo '#!/bin/sh' >> /opt/$APP/remove -echo "rm -R -f /usr/share/applications/AM-$APP.desktop /opt/$APP /usr/local/bin/$APP" >> /opt/$APP/remove -chmod a+x /opt/$APP/remove - -# DOWNLOAD THE ARCHIVE -mkdir tmp -cd ./tmp - -version=$(ANAMAZINGFUNCTION) -wget $version -echo "$version" >> /opt/$APP/version -cd .. -mv ./tmp/*mage ./$APP -chmod a+x /opt/$APP/$APP -rmdir ./tmp - -# LINK -ln -s /opt/$APP/$APP /usr/local/bin/$APP - -# SCRIPT TO UPDATE THE PROGRAM -cat >> /opt/$APP/AM-updater << 'EOF' -#!/usr/bin/env bash -APP=SAMPLE -version0=$(cat /opt/$APP/version) -version=$(ANAMAZINGFUNCTION) -if [ $version = $version0 ]; then - echo "Update not needed!" -else - notify-send "A new version of $APP is available, please wait" - mkdir /opt/$APP/tmp - cd /opt/$APP/tmp - wget $version - if ls . | grep mage; then - cd .. - if test -f ./tmp/*mage; then rm ./version - fi - echo $version >> ./version - mv --backup=t ./tmp/*mage ./$APP - chmod a+x /opt/$APP/$APP - rm -R -f ./tmp ./*~ - fi - notify-send "$APP is updated!" -fi -EOF -chmod a+x /opt/$APP/AM-updater - -# LAUNCHER & ICON -app=$(echo $APP | cut -c -3) -cd /opt/$APP -./$APP --appimage-extract *.desktop 1>/dev/null -./$APP --appimage-extract share/applications/*.desktop 1>/dev/null -./$APP --appimage-extract usr/share/applications/*.desktop 1>/dev/null -mv squashfs-root/*.desktop ./$APP.desktop -mv squashfs-root/share/applications/*.desktop ./$APP.desktop -mv squashfs-root/usr/share/applications/*.desktop ./$APP.desktop -if [ ! -e ./$APP.desktop ]; then - rm ./$APP.desktop; ./$APP --appimage-extract usr/share/applications/*$app*.desktop - mv squashfs-root/usr/share/applications/*.desktop ./$APP.desktop -fi -if [ ! -e ./$APP.desktop ]; then - rm ./$APP.desktop; ./$APP --appimage-extract share/applications/*$app*.desktop 1>/dev/null - mv squashfs-root/share/applications/*.desktop ./$APP.desktop -fi -CHANGEEXEC=$(cat ./$APP.desktop | grep Exec= | tr ' ' '\n' | tr '=' '\n' | tr '/' '\n' | grep $app | head -1) -sed -i "s#$CHANGEEXEC#$APP#g" ./$APP.desktop -sed -i "s#AppRun#$APP#g" ./$APP.desktop -sed -i "s#Exec=/bin/#Exec=#g" ./$APP.desktop -sed -i "s#Exec=/usr/bin/#Exec=#g" ./$APP.desktop -CHANGEICON=$(cat ./$APP.desktop | grep Icon= | head -1) -sed -i "s#$CHANGEICON#Icon=/opt/$APP/icons/$APP#g" ./$APP.desktop - -mkdir icons -mv $(./$APP --appimage-extract *.png) ./icons/$APP 2>/dev/null -mv $(./$APP --appimage-extract *.svg) ./icons/$APP 2>/dev/null -./$APP --appimage-extract share/icons/*/*/* 1>/dev/null -./$APP --appimage-extract usr/share/icons/*/*/* 1>/dev/null -./$APP --appimage-extract share/icons/*/*/*/* 1>/dev/null -./$APP --appimage-extract usr/share/icons/*/*/*/* 1>/dev/null -mv ./squashfs-root/share/icons/hicolor/22x22/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/24x24/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/32x32/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/48x48/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/64x64/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/128x128/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/256x256/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/512x512/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/scalable/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/22x22/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/24x24/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/32x32/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/48x48/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/64x64/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/128x128/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/256x256/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/512x512/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/scalable/apps/*$app* ./icons/$APP 2>/dev/null - -rm -R -f /opt/$APP/squashfs-root -mv ./$APP.desktop /usr/share/applications/AM-$APP.desktop From 5571490236384bf9a1f4770abddd9bbd6dc60544 Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:45:44 +0200 Subject: [PATCH 18/26] Delete templates/AM-SAMPLE-AppImage-from-GitHub --- templates/AM-SAMPLE-AppImage-from-GitHub | 110 ----------------------- 1 file changed, 110 deletions(-) delete mode 100644 templates/AM-SAMPLE-AppImage-from-GitHub diff --git a/templates/AM-SAMPLE-AppImage-from-GitHub b/templates/AM-SAMPLE-AppImage-from-GitHub deleted file mode 100644 index d7e640c17..000000000 --- a/templates/AM-SAMPLE-AppImage-from-GitHub +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/sh - -APP=SAMPLE -REPO="REPLACETHIS" - -# CREATE THE FOLDER -mkdir /opt/$APP -cd /opt/$APP - -# ADD THE REMOVER -echo '#!/bin/sh' >> /opt/$APP/remove -echo "rm -R -f /usr/share/applications/AM-$APP.desktop /opt/$APP /usr/local/bin/$APP" >> /opt/$APP/remove -chmod a+x /opt/$APP/remove - -# DOWNLOAD THE ARCHIVE -mkdir tmp -cd ./tmp - -version=$(curl -Ls https://api.github.com/repos/$REPO/releases | grep -w -v i386 | grep -w -v i686 | grep -w -v aarch64 | grep -w -v arm64 | grep -w -v armv7l | grep browser_download_url | grep -i appimage | cut -d '"' -f 4 | head -1) -wget $version -echo "$version" >> /opt/$APP/version -cd .. -mv ./tmp/*mage ./$APP -chmod a+x /opt/$APP/$APP -rmdir ./tmp - -# LINK -ln -s /opt/$APP/$APP /usr/local/bin/$APP - -# SCRIPT TO UPDATE THE PROGRAM -cat >> /opt/$APP/AM-updater << 'EOF' -#!/usr/bin/env bash -APP=SAMPLE -REPO="REPLACETHIS" -version0=$(cat /opt/$APP/version) -version=$(curl -Ls https://api.github.com/repos/$REPO/releases | grep -w -v i386 | grep -w -v i686 | grep -w -v aarch64 | grep -w -v arm64 | grep -w -v armv7l | grep browser_download_url | grep -i appimage | cut -d '"' -f 4 | head -1) -if [ $version = $version0 ]; then - echo "Update not needed!" -else - notify-send "A new version of $APP is available, please wait" - mkdir /opt/$APP/tmp - cd /opt/$APP/tmp - wget $version - if ls . | grep mage; then - cd .. - if test -f ./tmp/*mage; then rm ./version - fi - echo $version >> ./version - mv --backup=t ./tmp/*mage ./$APP - chmod a+x /opt/$APP/$APP - rm -R -f ./tmp ./*~ - fi - notify-send "$APP is updated!" -fi -EOF -chmod a+x /opt/$APP/AM-updater - -# LAUNCHER & ICON -app=$(echo $APP | cut -c -3) -cd /opt/$APP -./$APP --appimage-extract *.desktop 1>/dev/null -./$APP --appimage-extract share/applications/*.desktop 1>/dev/null -./$APP --appimage-extract usr/share/applications/*.desktop 1>/dev/null -mv squashfs-root/*.desktop ./$APP.desktop -mv squashfs-root/share/applications/*.desktop ./$APP.desktop -mv squashfs-root/usr/share/applications/*.desktop ./$APP.desktop -if [ ! -e ./$APP.desktop ]; then - rm ./$APP.desktop; ./$APP --appimage-extract usr/share/applications/*$app*.desktop - mv squashfs-root/usr/share/applications/*.desktop ./$APP.desktop -fi -if [ ! -e ./$APP.desktop ]; then - rm ./$APP.desktop; ./$APP --appimage-extract share/applications/*$app*.desktop 1>/dev/null - mv squashfs-root/share/applications/*.desktop ./$APP.desktop -fi -CHANGEEXEC=$(cat ./$APP.desktop | grep Exec= | tr ' ' '\n' | tr '=' '\n' | tr '/' '\n' | grep $app | head -1) -sed -i "s#$CHANGEEXEC#$APP#g" ./$APP.desktop -sed -i "s#AppRun#$APP#g" ./$APP.desktop -sed -i "s#Exec=/bin/#Exec=#g" ./$APP.desktop -sed -i "s#Exec=/usr/bin/#Exec=#g" ./$APP.desktop -CHANGEICON=$(cat ./$APP.desktop | grep Icon= | head -1) -sed -i "s#$CHANGEICON#Icon=/opt/$APP/icons/$APP#g" ./$APP.desktop - -mkdir icons -mv $(./$APP --appimage-extract *.png) ./icons/$APP 2>/dev/null -mv $(./$APP --appimage-extract *.svg) ./icons/$APP 2>/dev/null -./$APP --appimage-extract share/icons/*/*/* 1>/dev/null -./$APP --appimage-extract usr/share/icons/*/*/* 1>/dev/null -./$APP --appimage-extract share/icons/*/*/*/* 1>/dev/null -./$APP --appimage-extract usr/share/icons/*/*/*/* 1>/dev/null -mv ./squashfs-root/share/icons/hicolor/22x22/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/24x24/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/32x32/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/48x48/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/64x64/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/128x128/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/256x256/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/512x512/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/scalable/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/22x22/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/24x24/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/32x32/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/48x48/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/64x64/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/128x128/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/256x256/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/512x512/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/scalable/apps/*$app* ./icons/$APP 2>/dev/null - -rm -R -f /opt/$APP/squashfs-root -mv ./$APP.desktop /usr/share/applications/AM-$APP.desktop From f741f380bebc78871cdbe21b7dc27555d7c2654d Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:45:50 +0200 Subject: [PATCH 19/26] Delete templates/AM-SAMPLE-AppImage-from-GitLab --- templates/AM-SAMPLE-AppImage-from-GitLab | 110 ----------------------- 1 file changed, 110 deletions(-) delete mode 100644 templates/AM-SAMPLE-AppImage-from-GitLab diff --git a/templates/AM-SAMPLE-AppImage-from-GitLab b/templates/AM-SAMPLE-AppImage-from-GitLab deleted file mode 100644 index e23cf559d..000000000 --- a/templates/AM-SAMPLE-AppImage-from-GitLab +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/sh - -APP=SAMPLE -REPOID="REPLACETHIS" - -# CREATE THE FOLDER -mkdir /opt/$APP -cd /opt/$APP - -# ADD THE REMOVER -echo '#!/bin/sh' >> /opt/$APP/remove -echo "rm -R -f /usr/share/applications/AM-$APP.desktop /opt/$APP /usr/local/bin/$APP" >> /opt/$APP/remove -chmod a+x /opt/$APP/remove - -# DOWNLOAD THE ARCHIVE -mkdir tmp -cd ./tmp - -version=$(curl -Ls https://gitlab.com/api/v4/projects/$REPOID/releases/ | jq '.' | grep -Eo "(http|https)://[a-zA-Z0-9./?=_%:-]*" | grep -i .appimage | head -1 | sed 's#/file/#/raw/#') -wget $version -echo "$version" >> /opt/$APP/version -cd .. -mv ./tmp/*mage ./$APP -chmod a+x /opt/$APP/$APP -rmdir ./tmp - -# LINK -ln -s /opt/$APP/$APP /usr/local/bin/$APP - -# SCRIPT TO UPDATE THE PROGRAM -cat >> /opt/$APP/AM-updater << 'EOF' -#!/usr/bin/env bash -APP=SAMPLE -REPOID="REPLACETHIS" -version0=$(cat /opt/$APP/version) -version=$(curl -Ls https://gitlab.com/api/v4/projects/$REPOID/releases/ | jq '.' | grep -Eo "(http|https)://[a-zA-Z0-9./?=_%:-]*" | grep -i .appimage | head -1 | sed 's#/file/#/raw/#') -if [ $version = $version0 ]; then - echo "Update not needed!" -else - notify-send "A new version of $APP is available, please wait" - mkdir /opt/$APP/tmp - cd /opt/$APP/tmp - wget $version - if ls . | grep mage; then - cd .. - if test -f ./tmp/*mage; then rm ./version - fi - echo $version >> ./version - mv --backup=t ./tmp/*mage ./$APP - chmod a+x /opt/$APP/$APP - rm -R -f ./tmp ./*~ - fi - notify-send "$APP is updated!" -fi -EOF -chmod a+x /opt/$APP/AM-updater - -# LAUNCHER & ICON -app=$(echo $APP | cut -c -3) -cd /opt/$APP -./$APP --appimage-extract *.desktop 1>/dev/null -./$APP --appimage-extract share/applications/*.desktop 1>/dev/null -./$APP --appimage-extract usr/share/applications/*.desktop 1>/dev/null -mv squashfs-root/*.desktop ./$APP.desktop -mv squashfs-root/share/applications/*.desktop ./$APP.desktop -mv squashfs-root/usr/share/applications/*.desktop ./$APP.desktop -if [ ! -e ./$APP.desktop ]; then - rm ./$APP.desktop; ./$APP --appimage-extract usr/share/applications/*$app*.desktop - mv squashfs-root/usr/share/applications/*.desktop ./$APP.desktop -fi -if [ ! -e ./$APP.desktop ]; then - rm ./$APP.desktop; ./$APP --appimage-extract share/applications/*$app*.desktop 1>/dev/null - mv squashfs-root/share/applications/*.desktop ./$APP.desktop -fi -CHANGEEXEC=$(cat ./$APP.desktop | grep Exec= | tr ' ' '\n' | tr '=' '\n' | tr '/' '\n' | grep $app | head -1) -sed -i "s#$CHANGEEXEC#$APP#g" ./$APP.desktop -sed -i "s#AppRun#$APP#g" ./$APP.desktop -sed -i "s#Exec=/bin/#Exec=#g" ./$APP.desktop -sed -i "s#Exec=/usr/bin/#Exec=#g" ./$APP.desktop -CHANGEICON=$(cat ./$APP.desktop | grep Icon= | head -1) -sed -i "s#$CHANGEICON#Icon=/opt/$APP/icons/$APP#g" ./$APP.desktop - -mkdir icons -mv $(./$APP --appimage-extract *.png) ./icons/$APP 2>/dev/null -mv $(./$APP --appimage-extract *.svg) ./icons/$APP 2>/dev/null -./$APP --appimage-extract share/icons/*/*/* 1>/dev/null -./$APP --appimage-extract usr/share/icons/*/*/* 1>/dev/null -./$APP --appimage-extract share/icons/*/*/*/* 1>/dev/null -./$APP --appimage-extract usr/share/icons/*/*/*/* 1>/dev/null -mv ./squashfs-root/share/icons/hicolor/22x22/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/24x24/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/32x32/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/48x48/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/64x64/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/128x128/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/256x256/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/512x512/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/scalable/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/22x22/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/24x24/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/32x32/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/48x48/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/64x64/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/128x128/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/256x256/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/512x512/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/scalable/apps/*$app* ./icons/$APP 2>/dev/null - -rm -R -f /opt/$APP/squashfs-root -mv ./$APP.desktop /usr/share/applications/AM-$APP.desktop From 6ae31aa826990cda9051bce76944bc989896414b Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:45:57 +0200 Subject: [PATCH 20/26] Delete templates/AM-SAMPLE-AppImage-generic --- templates/AM-SAMPLE-AppImage-generic | 112 --------------------------- 1 file changed, 112 deletions(-) delete mode 100644 templates/AM-SAMPLE-AppImage-generic diff --git a/templates/AM-SAMPLE-AppImage-generic b/templates/AM-SAMPLE-AppImage-generic deleted file mode 100644 index 44246523a..000000000 --- a/templates/AM-SAMPLE-AppImage-generic +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh - -APP=SAMPLE -REPO="REPLACETHIS" - -# CREATE THE FOLDER -mkdir /opt/$APP -cd /opt/$APP - -# ADD THE REMOVER -echo '#!/bin/sh' >> /opt/$APP/remove -echo "rm -R -f /usr/share/applications/AM-$APP.desktop /opt/$APP /usr/local/bin/$APP" >> /opt/$APP/remove -chmod a+x /opt/$APP/remove - -# DOWNLOAD THE ARCHIVE -mkdir tmp -cd ./tmp - -version=$(CHECKVERSION) -url=$(CHECKURL) -wget $url -echo "$version" >> /opt/$APP/version -cd .. -mv ./tmp/*mage ./$APP -chmod a+x /opt/$APP/$APP -rmdir ./tmp - -# LINK -ln -s /opt/$APP/$APP /usr/local/bin/$APP - -# SCRIPT TO UPDATE THE PROGRAM -cat >> /opt/$APP/AM-updater << 'EOF' -#!/usr/bin/env bash -APP=SAMPLE -REPO="REPLACETHIS" -version0=$(cat /opt/$APP/version) -version=$(CHECKVERSION) -url=$(CHECKURL) -if [ $version = $version0 ]; then - echo "Update not needed!" -else - notify-send "A new version of $APP is available, please wait" - mkdir /opt/$APP/tmp - cd /opt/$APP/tmp - wget $url - if ls . | grep mage; then - cd .. - if test -f ./tmp/*mage; then rm ./version - fi - echo $version >> ./version - mv --backup=t ./tmp/*mage ./$APP - chmod a+x /opt/$APP/$APP - rm -R -f ./tmp ./*~ - fi - notify-send "$APP is updated!" -fi -EOF -chmod a+x /opt/$APP/AM-updater - -# LAUNCHER & ICON -app=$(echo $APP | cut -c -3) -cd /opt/$APP -./$APP --appimage-extract *.desktop 1>/dev/null -./$APP --appimage-extract share/applications/*.desktop 1>/dev/null -./$APP --appimage-extract usr/share/applications/*.desktop 1>/dev/null -mv squashfs-root/*.desktop ./$APP.desktop -mv squashfs-root/share/applications/*.desktop ./$APP.desktop -mv squashfs-root/usr/share/applications/*.desktop ./$APP.desktop -if [ ! -e ./$APP.desktop ]; then - rm ./$APP.desktop; ./$APP --appimage-extract usr/share/applications/*$app*.desktop - mv squashfs-root/usr/share/applications/*.desktop ./$APP.desktop -fi -if [ ! -e ./$APP.desktop ]; then - rm ./$APP.desktop; ./$APP --appimage-extract share/applications/*$app*.desktop 1>/dev/null - mv squashfs-root/share/applications/*.desktop ./$APP.desktop -fi -CHANGEEXEC=$(cat ./$APP.desktop | grep Exec= | tr ' ' '\n' | tr '=' '\n' | tr '/' '\n' | grep $app | head -1) -sed -i "s#$CHANGEEXEC#$APP#g" ./$APP.desktop -sed -i "s#AppRun#$APP#g" ./$APP.desktop -sed -i "s#Exec=/bin/#Exec=#g" ./$APP.desktop -sed -i "s#Exec=/usr/bin/#Exec=#g" ./$APP.desktop -CHANGEICON=$(cat ./$APP.desktop | grep Icon= | head -1) -sed -i "s#$CHANGEICON#Icon=/opt/$APP/icons/$APP#g" ./$APP.desktop - -mkdir icons -mv $(./$APP --appimage-extract *.png) ./icons/$APP 2>/dev/null -mv $(./$APP --appimage-extract *.svg) ./icons/$APP 2>/dev/null -./$APP --appimage-extract share/icons/*/*/* 1>/dev/null -./$APP --appimage-extract usr/share/icons/*/*/* 1>/dev/null -./$APP --appimage-extract share/icons/*/*/*/* 1>/dev/null -./$APP --appimage-extract usr/share/icons/*/*/*/* 1>/dev/null -mv ./squashfs-root/share/icons/hicolor/22x22/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/24x24/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/32x32/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/48x48/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/64x64/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/128x128/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/256x256/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/512x512/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/scalable/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/22x22/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/24x24/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/32x32/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/48x48/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/64x64/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/128x128/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/256x256/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/512x512/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/scalable/apps/*$app* ./icons/$APP 2>/dev/null - -rm -R -f /opt/$APP/squashfs-root -mv ./$APP.desktop /usr/share/applications/AM-$APP.desktop From 009bf4866d63861ecf1c0f89d3cc630224c65a8a Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:46:04 +0200 Subject: [PATCH 21/26] Delete templates/AM-SAMPLE-AppImage.GitHub.io --- templates/AM-SAMPLE-AppImage.GitHub.io | 89 -------------------------- 1 file changed, 89 deletions(-) delete mode 100644 templates/AM-SAMPLE-AppImage.GitHub.io diff --git a/templates/AM-SAMPLE-AppImage.GitHub.io b/templates/AM-SAMPLE-AppImage.GitHub.io deleted file mode 100644 index d6cfe31af..000000000 --- a/templates/AM-SAMPLE-AppImage.GitHub.io +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh - -APP=SAMPLE -APPNAME=APPIMAGENAME - -CATEGORIES=$(curl -L -s https://raw.githubusercontent.com/AppImage/appimage.github.io/master/apps/$APPNAME.md | grep -E -i categories | cut -c 17-) -ICONURL="https://appimage.github.io/database/$(curl -L -s https://raw.githubusercontent.com/AppImage/appimage.github.io/master/apps/$APPNAME.md | grep -E -i icons | sed -n 2p | cut -c 5-)" -REPO=$(curl -L -s https://raw.githubusercontent.com/AppImage/appimage.github.io/master/apps/$APPNAME.md | grep -A1 "type: GitHub" | sed -n 2p | cut -c 10-) -USER=$(echo $REPO | sed 's:/[^/]*$::') -REPO2=$(echo $REPO | sed 's:.*/::') -FILENAMEEXTENTION="/.*/.*.*mage" -URL=https://github.com/$REPO/releases/latest -COMMENT=$(curl -L -s https://raw.githubusercontent.com/AppImage/appimage.github.io/master/apps/$APPNAME.md | grep "Comment:" | cut -c 14-) - -# CREATE THE FOLDER -mkdir /opt/$APP -cd /opt/$APP - -# ADD THE REMOVER -echo '#!/bin/sh' >> /opt/$APP/remove -echo "rm -R -f /usr/share/applications/AM-$APP.desktop /opt/$APP /usr/local/bin/$APP" >> /opt/$APP/remove -chmod a+x /opt/$APP/remove - -# DOWNLOAD THE APPIMAGE -mkdir tmp -cd ./tmp - -download=$(curl -Ls https://api.github.com/repos/$REPO/releases/latest | jq '.' | grep -E browser_download_url | awk -F '[""]' '{print $4}' | grep -w -v i386 | grep -w -v i686 | grep -w -v arm64 | grep -w -v armv7l | egrep ''$FILENAMEEXTENTION'' -o | head -1); -wget https:$download - -version=$(curl -Ls https://api.github.com/repos/$REPO/releases/latest | jq '.' | grep -E tag_name | awk -F '[""]' '{print $4}') -echo "$version" >> /opt/$APP/version - -cd .. -mv ./tmp/*mage ./$APP -chmod a+x /opt/$APP/$APP -rmdir ./tmp - -# LINK -ln -s /opt/$APP/$APP /usr/local/bin/$APP - -# SCRIPT TO UPDATE THE PROGRAM -cat >> /opt/$APP/AM-updater << 'EOF' -#!/usr/bin/env bash -APP=SAMPLE -APPNAME=APPIMAGENAME -REPO=$(curl -L -s https://raw.githubusercontent.com/AppImage/appimage.github.io/master/apps/$APPNAME.md | grep -A1 "type: GitHub" | sed -n 2p | cut -c 10-) -version0=$(cat /opt/$APP/version) -url=https://github.com/FUNCTION2/FUNCTION3/releases/latest -if curl -L -s $url | grep -ioF "$version0"; then - echo "Update not needed!" -else - notify-send "A new version of $APP is available, please wait" - mkdir /opt/$APP/tmp - cd /opt/$APP/tmp - URL=https://github.com/FUNCTION2/FUNCTION3/releases/latest - wget https://github.com/$(wget https://github.com/FUNCTION2/FUNCTION3/releases/latest -O - | grep -w -v i386 | grep -w -v i686 | grep -w -v arm64 | grep -w -v armv7l | egrep ''FUNCTION4'' -o | head -1); - wget https:$download - version=$(curl -Ls https://api.github.com/repos/FUNCTION2/FUNCTION3/releases/latest | jq '.' | grep -E tag_name | awk -F '[""]' '{print $4}') - cd .. - if test -f ./tmp/*mage; then rm ./version - fi - echo $version >> ./version - mv --backup=t ./tmp/*mage ./$APP - chmod a+x /opt/$APP/$APP - rm -R -f ./tmp ./*~ - notify-send "$APP is updated!" -fi -EOF -sed -i s/FUNCTION2/$USER/g /opt/$APP/AM-updater -sed -i s/FUNCTION3/$REPO2/g /opt/$APP/AM-updater -sed -i s/FUNCTION4/$FILENAMEEXTENTION/g /opt/$APP/AM-updater -chmod a+x /opt/$APP/AM-updater - -# LAUNCHER -rm /usr/share/applications/AM-$APP.desktop -wget $(curl -Ls https://api.github.com/repos/AppImage/appimage.github.io/contents/database/$APPNAME/ | jq '.' | grep download_url | head -1 | cut -c 22- | rev | cut -c 3- | rev) -O $APP.desktopapp=$(echo $APP | cut -c -3) -CHANGEEXEC=$(cat ./$APP.desktop | grep Exec= | tr ' ' '\n' | tr '=' '\n' | tr '/' '\n' | grep $app | head -1) -sed -i "s#$CHANGEEXEC#$APP#g" ./$APP.desktop -sed -i "s#AppRun#$APP#g" ./$APP.desktop -sed -i "s#Exec=/bin/#Exec=#g" ./$APP.desktop -sed -i "s#Exec=/usr/bin/#Exec=#g" ./$APP.desktop -CHANGEICON=$(cat ./$APP.desktop | grep Icon= | head -1) -sed -i "s#$CHANGEICON#Icon=/opt/$APP/icons/$APP#g" ./$APP.desktop -mv ./$APP.desktop /usr/share/applications/AM-$APP.desktop - -# ICON -mkdir ./icons -wget $ICONURL -O /opt/$APP/icons/$APP From 0938b99ed3394a1dd274426d119c83608ff2638a Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:46:12 +0200 Subject: [PATCH 22/26] Delete templates/AM-SAMPLE-GitHub-generic --- templates/AM-SAMPLE-GitHub-generic | 71 ------------------------------ 1 file changed, 71 deletions(-) delete mode 100644 templates/AM-SAMPLE-GitHub-generic diff --git a/templates/AM-SAMPLE-GitHub-generic b/templates/AM-SAMPLE-GitHub-generic deleted file mode 100644 index 0df2c6a36..000000000 --- a/templates/AM-SAMPLE-GitHub-generic +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh - -APP=SAMPLE -REPO="REPLACETHIS" - -# CREATE THE FOLDER -mkdir /opt/$APP -cd /opt/$APP - -# ADD THE REMOVER -echo '#!/bin/sh' >> /opt/$APP/remove -echo "rm -R -f /usr/share/applications/AM-$APP.desktop /opt/$APP /usr/local/bin/$APP" >> /opt/$APP/remove -chmod a+x /opt/$APP/remove - -# DOWNLOAD THE ARCHIVE -mkdir tmp -cd ./tmp - -version=$(curl -Ls https://api.github.com/repos/$REPO/releases | grep -w -v i386 | grep -w -v i686 | grep -w -v aarch64 | grep -w -v arm64 | grep -w -v armv7l | grep browser_download_url | grep -i "FILENAMEEXTENSION" | cut -d '"' -f 4 | head -1) -wget $version -echo "$version" >> /opt/$APP/version -cd .. -FUNCTION -rm -R -f ./tmp - -# LINK -ln -s /opt/$APP/$APP /usr/local/bin/$APP - -# SCRIPT TO UPDATE THE PROGRAM -cat >> /opt/$APP/AM-updater << 'EOF' -#!/usr/bin/env bash -APP=SAMPLE -REPO="REPLACETHIS" -version0=$(cat /opt/$APP/version) -version=$(curl -Ls https://api.github.com/repos/$REPO/releases | grep -w -v i386 | grep -w -v i686 | grep -w -v aarch64 | grep -w -v arm64 | grep -w -v armv7l | grep browser_download_url | grep -i "FILENAMEEXTENSION" | cut -d '"' -f 4 | head -1) -if [ $version = $version0 ]; then - echo "Update not needed!" -else - notify-send "A new version of $APP is available, please wait" - mkdir /opt/$APP/tmp - cd /opt/$APP/tmp - wget $version - cd .. - FUNCTION - rm ./version - echo $version >> ./version - rm -R -f ./tmp ./*~ - notify-send "$APP is updated!" -fi -EOF -chmod a+x /opt/$APP/AM-updater - -# LAUNCHER & ICON -app=$(echo $APP | cut -c -3) -cd /opt/$APP -mv ./*.desktop ./$APP.desktop 2>/dev/null -CHANGEEXEC=$(cat ./$APP.desktop | grep Exec= | tr ' ' '\n' | tr '=' '\n' | tr '/' '\n' | grep $app | head -1) -sed -i "s#$CHANGEEXEC#$APP#g" ./$APP.desktop -sed -i "s#Exec=/bin/#Exec=#g" ./$APP.desktop -sed -i "s#Exec=/usr/bin/#Exec=#g" ./$APP.desktop -CHANGEICON=$(cat ./$APP.desktop | grep Icon= | head -1) -sed -i "s#$CHANGEICON#Icon=/opt/$APP/icons/$APP#g" ./$APP.desktop - -mkdir icons -mv ./*.svg ./icons/$APP 2>/dev/null -mv ./*.png ./icons/$APP 2>/dev/null -mv ./*$app*.png ./icons/$APP 2>/dev/null -mv ./*128*.png ./icons/$APP 2>/dev/null -mv ./*256*.png ./icons/$APP 2>/dev/null - -mv ./$APP.desktop /usr/share/applications/AM-$APP.desktop From d1fa5b2f814de0974c3413681895df4f8f2c45f8 Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:46:20 +0200 Subject: [PATCH 23/26] Delete templates/AM-SAMPLE-Unified --- templates/AM-SAMPLE-Unified | 124 ------------------------------------ 1 file changed, 124 deletions(-) delete mode 100644 templates/AM-SAMPLE-Unified diff --git a/templates/AM-SAMPLE-Unified b/templates/AM-SAMPLE-Unified deleted file mode 100644 index adc007a29..000000000 --- a/templates/AM-SAMPLE-Unified +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/sh -# UNIFIED TEMPLATE FOR APPIMAGE/TAR/ZIP ARCHIVES - -APP=SAMPLE -site="REPLACETHIS" -url="CHECKTHEURL" -version="CHECKTHEVERSION" - -# CREATE THE FOLDER -mkdir /opt/$APP -cd /opt/$APP - -# ADD THE REMOVER -echo '#!/bin/sh' >> /opt/$APP/remove -echo "rm -R -f /usr/share/applications/AM-$APP.desktop /opt/$APP /usr/local/bin/$APP" >> /opt/$APP/remove -chmod a+x /opt/$APP/remove - -# FUNCTIONS -mkdir tmp -cd ./tmp - -_appimage(){ - wget "$url" -O $APP.AppImage; cd ..; mv --backup=t ./tmp/*mage ./$APP 2> /dev/null; chmod a+x /opt/$APP/$APP -} - -_tar(){ - wget "$url"; cd .. tar xf ./tmp/*tar.xz -C ./tmp/ && mv --backup=t ./tmp/*/* . 2> /dev/null -} - -_zip(){ - wget "$url"; unzip ./*.zip; rm ./*.zip; cd ..; mv --backup=t ./tmp/* ./ 2> /dev/null -} - -#_appimage -#_tar -#_zip - -rm -R -f ./version -rm -R -f ./tmp -echo "$version" >> ./version - -# LINK (be sure that it redirects to the correct binary in case of tar/zip packages) -ln -s /opt/$APP/$APP /usr/local/bin/$APP - -# SCRIPT TO UPDATE THE PROGRAM -cat >> /opt/$APP/AM-updater << 'EOF' -#!/usr/bin/env bash -APP=SAMPLE -version0=$(cat /opt/$APP/version) -version="CHECKTHEVERSION" -URL="CHECKTHEURL" -if [ $version = $version0 ]; then - echo "Update not needed!" -else - notify-send "A new version of $APP is available, please wait" - mkdir /opt/$APP/tmp - cd /opt/$APP/tmp - - _appimage(){ - wget "$url" -O $APP.AppImage; cd ..; mv --backup=t ./tmp/*mage ./$APP 2> /dev/null; chmod a+x /opt/$APP/$APP - } - - _tar(){ - wget "$url"; cd .. tar xf ./tmp/*tar.xz -C ./tmp/ && mv --backup=t ./tmp/*/* . 2> /dev/null - } - - _zip(){ - wget "$url"; unzip ./*.zip; rm ./*.zip; cd ..; mv --backup=t ./tmp/* ./ 2> /dev/null - } - - #_appimage - #_tar - #_zip - - rm ./version - echo "$version" >> /opt/$APP/version - rm -R -f ./tmp ./*~ - notify-send "$APP is updated!" -fi -EOF -chmod a+x /opt/$APP/AM-updater - -# LAUNCHER -app=$(echo $APP | cut -c -3) -cd /opt/$APP - -# IF THE APP IS AN APPIMAGE, USE THIS FUNCTION -_appimage_launcher(){ - ./$APP --appimage-extract *.desktop 1>/dev/null - ./$APP --appimage-extract share/applications/*.desktop 1>/dev/null - ./$APP --appimage-extract usr/share/applications/*.desktop 1>/dev/null - mv squashfs-root/*.desktop ./$APP.desktop 2>/dev/null - mv squashfs-root/share/applications/*.desktop ./$APP.desktop 2>/dev/null - mv squashfs-root/usr/share/applications/*.desktop ./$APP.desktop 2>/dev/null - if [ ! -e ./$APP.desktop ]; then - rm ./$APP.desktop; ./$APP --appimage-extract usr/share/applications/*$app*.desktop - mv squashfs-root/usr/share/applications/*.desktop ./$APP.desktop 2>/dev/null - fi - if [ ! -e ./$APP.desktop ]; then - rm ./$APP.desktop; ./$APP --appimage-extract share/applications/*$app*.desktop 1>/dev/null - mv squashfs-root/share/applications/*.desktop ./$APP.desktop 2>/dev/null - fi - rm -R -f /opt/$APP/squashfs-root -} - -#_appimage_launcher - -# IF THE APP IS ANOTHER KIND OF APP, USE THIS SPACE TO DOWNLOAD OR CREATE THE LAUNCHER -#wget DESKTOPFILE -O $APP.desktop 2> /dev/null - -# PACH THE LAUNCHER -CHANGEEXEC=$(cat ./$APP.desktop | grep Exec= | tr ' ' '\n' | tr '=' '\n' | tr '/' '\n' | grep $app | head -1) -sed -i "s#$CHANGEEXEC#$APP#g" ./$APP.desktop 2>/dev/null -sed -i "s#AppRun#$APP#g" ./$APP.desktop 2>/dev/null -sed -i "s#Exec=/bin/#Exec=#g" ./$APP.desktop 2>/dev/null -sed -i "s#Exec=/usr/bin/#Exec=#g" ./$APP.desktop 2>/dev/null -CHANGEICON=$(cat ./$APP.desktop | grep Icon= | head -1) -sed -i "s#$CHANGEICON#Icon=/opt/$APP/icons/$APP#g" ./$APP.desktop 2>/dev/null - -mv ./$APP.desktop /usr/share/applications/AM-$APP.desktop 2>/dev/null - -# ICON -mkdir icons -wget https://portable-linux-apps.github.io/icons/$APP.png -O ./icons/$APP 2>/dev/null From 9328c54b18dc0e951f093ca4208c0ba6c7e30f99 Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:46:35 +0200 Subject: [PATCH 24/26] Delete templates/AM-SAMPLE-for-zsync --- templates/AM-SAMPLE-for-zsync | 107 ---------------------------------- 1 file changed, 107 deletions(-) delete mode 100644 templates/AM-SAMPLE-for-zsync diff --git a/templates/AM-SAMPLE-for-zsync b/templates/AM-SAMPLE-for-zsync deleted file mode 100644 index 3e58ca811..000000000 --- a/templates/AM-SAMPLE-for-zsync +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh - -APP=SAMPLE -URL="DIRECTURL2THEAPPIMAGE" - -# CREATE THE FOLDER -mkdir /opt/$APP -cd /opt/$APP - -# ADD THE REMOVER -echo '#!/bin/sh' >> /opt/$APP/remove -echo "rm -R -f /usr/share/applications/AM-$APP.desktop /opt/$APP /usr/local/bin/$APP" >> /opt/$APP/remove -chmod a+x /opt/$APP/remove - -# DOWNLOAD THE APPIMAGE -mkdir tmp -wget $URL -O $APP -cd ./tmp -wget $URL.asc 2> /dev/null -wget $URL.zsync 2> /dev/null -wget $URL.zsync.asc 2> /dev/null -cd .. -chmod a+x /opt/$APP/$APP -mv ./tmp/*mage.zsync ./$APP.zsync 2> /dev/null -#mv ./tmp/*mage.asc ./$APP.asc 2> /dev/null -#mv ./tmp/*zsync.asc ./$APP.zsync.asc 2> /dev/null -rm -R -f ./tmp - -# LINK -ln -s /opt/$APP/$APP /usr/local/bin/$APP - -# SCRIPT TO UPDATE THE PROGRAM -cat >> /opt/$APP/AM-updater << 'EOF' -#!/bin/sh -APP=SAMPLE -URL="DIRECTURL2THEAPPIMAGE" - -cd /opt/$APP -mkdir tmp -cd ./tmp -wget $URL.asc 2> /dev/null -wget $URL.zsync 2> /dev/null -wget $URL.zsync.asc 2> /dev/null -cd .. -mv ./tmp/*mage.zsync ./$APP.zsync -#mv ./tmp/*mage.asc ./$APP.asc -#mv ./tmp/*zsync.asc ./$APP.zsync.asc -rm -R -f ./tmp -zsync /opt/$APP/$APP.zsync -rm -R -f /opt/$APP/*zs-old /opt/$APP/*.part -chmod a+x /opt/$APP/$APP -EOF -chmod a+x /opt/$APP/AM-updater - -# LAUNCHER & ICON -app=$(echo $APP | cut -c -3) -cd /opt/$APP -./$APP --appimage-extract *.desktop 1>/dev/null -./$APP --appimage-extract share/applications/*.desktop 1>/dev/null -./$APP --appimage-extract usr/share/applications/*.desktop 1>/dev/null -mv squashfs-root/*.desktop ./$APP.desktop -mv squashfs-root/share/applications/*.desktop ./$APP.desktop -mv squashfs-root/usr/share/applications/*.desktop ./$APP.desktop -if [ ! -e ./$APP.desktop ]; then - rm ./$APP.desktop; ./$APP --appimage-extract usr/share/applications/*$app*.desktop - mv squashfs-root/usr/share/applications/*.desktop ./$APP.desktop -fi -if [ ! -e ./$APP.desktop ]; then - rm ./$APP.desktop; ./$APP --appimage-extract share/applications/*$app*.desktop 1>/dev/null - mv squashfs-root/share/applications/*.desktop ./$APP.desktop -fi -CHANGEEXEC=$(cat ./$APP.desktop | grep Exec= | tr ' ' '\n' | tr '=' '\n' | tr '/' '\n' | grep $app | head -1) -sed -i "s#$CHANGEEXEC#$APP#g" ./$APP.desktop -sed -i "s#AppRun#$APP#g" ./$APP.desktop -sed -i "s#Exec=/bin/#Exec=#g" ./$APP.desktop -sed -i "s#Exec=/usr/bin/#Exec=#g" ./$APP.desktop -CHANGEICON=$(cat ./$APP.desktop | grep Icon= | head -1) -sed -i "s#$CHANGEICON#Icon=/opt/$APP/icons/$APP#g" ./$APP.desktop - -mkdir icons -mv $(./$APP --appimage-extract *.png) ./icons/$APP 2>/dev/null -mv $(./$APP --appimage-extract *.svg) ./icons/$APP 2>/dev/null -./$APP --appimage-extract share/icons/*/*/* 1>/dev/null -./$APP --appimage-extract usr/share/icons/*/*/* 1>/dev/null -./$APP --appimage-extract share/icons/*/*/*/* 1>/dev/null -./$APP --appimage-extract usr/share/icons/*/*/*/* 1>/dev/null -mv ./squashfs-root/share/icons/hicolor/22x22/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/24x24/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/32x32/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/48x48/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/64x64/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/128x128/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/256x256/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/512x512/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/scalable/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/22x22/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/24x24/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/32x32/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/48x48/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/64x64/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/128x128/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/256x256/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/512x512/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/scalable/apps/*$app* ./icons/$APP 2>/dev/null - -rm -R -f /opt/$APP/squashfs-root -mv ./$APP.desktop /usr/share/applications/AM-$APP.desktop From 72a472e7fb016f419df8c7ef1e572b55696300d0 Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:46:42 +0200 Subject: [PATCH 25/26] Delete templates/AM-SAMPLE-for-appimageupdate --- templates/AM-SAMPLE-for-appimageupdate | 94 -------------------------- 1 file changed, 94 deletions(-) delete mode 100644 templates/AM-SAMPLE-for-appimageupdate diff --git a/templates/AM-SAMPLE-for-appimageupdate b/templates/AM-SAMPLE-for-appimageupdate deleted file mode 100644 index 114420866..000000000 --- a/templates/AM-SAMPLE-for-appimageupdate +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/sh - -APP=SAMPLE - -# CREATE THE FOLDER -mkdir /opt/$APP -cd /opt/$APP - -# ADD THE REMOVER -echo '#!/bin/sh' >> /opt/$APP/remove -echo "rm -R -f /usr/share/applications/AM-$APP.desktop /opt/$APP /usr/local/bin/$APP" >> /opt/$APP/remove -chmod a+x /opt/$APP/remove - -# DOWNLOAD THE APPIMAGE -mkdir tmp -cd ./tmp - -WGET-THE-APPIMAGE - -cd .. -mv ./tmp/*mage ./$APP -chmod a+x /opt/$APP/$APP - -cd ./tmp -wget https://github.com/AppImage/AppImageUpdate/releases/download/continuous/appimageupdatetool-x86_64.AppImage 2> /dev/null -cd .. -mv ./tmp/appimageupdatetool-x86_64.AppImage ./updater 2> /dev/null -chmod a+x ./updater - -# LINK -ln -s /opt/$APP/$APP /usr/local/bin/$APP - -# SCRIPT TO UPDATE -echo '#!/bin/sh -APP='$APP' -cd /opt/$APP -./updater -O ./$APP -chmod a+x /opt/$APP/$APP -rm -R -f /opt/$APP/*zs-old && rm -R -f /opt/$APP/*.part' >> /opt/$APP/AM-updater -chmod a+x /opt/$APP/AM-updater - -# LAUNCHER & ICON -app=$(echo $APP | cut -c -3) -cd /opt/$APP -./$APP --appimage-extract *.desktop 1>/dev/null -./$APP --appimage-extract share/applications/*.desktop 1>/dev/null -./$APP --appimage-extract usr/share/applications/*.desktop 1>/dev/null -mv squashfs-root/*.desktop ./$APP.desktop -mv squashfs-root/share/applications/*.desktop ./$APP.desktop -mv squashfs-root/usr/share/applications/*.desktop ./$APP.desktop -if [ ! -e ./$APP.desktop ]; then - rm ./$APP.desktop; ./$APP --appimage-extract usr/share/applications/*$app*.desktop - mv squashfs-root/usr/share/applications/*.desktop ./$APP.desktop -fi -if [ ! -e ./$APP.desktop ]; then - rm ./$APP.desktop; ./$APP --appimage-extract share/applications/*$app*.desktop 1>/dev/null - mv squashfs-root/share/applications/*.desktop ./$APP.desktop -fi -CHANGEEXEC=$(cat ./$APP.desktop | grep Exec= | tr ' ' '\n' | tr '=' '\n' | tr '/' '\n' | grep $app | head -1) -sed -i "s#$CHANGEEXEC#$APP#g" ./$APP.desktop -sed -i "s#AppRun#$APP#g" ./$APP.desktop -sed -i "s#Exec=/bin/#Exec=#g" ./$APP.desktop -sed -i "s#Exec=/usr/bin/#Exec=#g" ./$APP.desktop -CHANGEICON=$(cat ./$APP.desktop | grep Icon= | head -1) -sed -i "s#$CHANGEICON#Icon=/opt/$APP/icons/$APP#g" ./$APP.desktop - -mkdir icons -mv $(./$APP --appimage-extract *.png) ./icons/$APP 2>/dev/null -mv $(./$APP --appimage-extract *.svg) ./icons/$APP 2>/dev/null -./$APP --appimage-extract share/icons/*/*/* 1>/dev/null -./$APP --appimage-extract usr/share/icons/*/*/* 1>/dev/null -./$APP --appimage-extract share/icons/*/*/*/* 1>/dev/null -./$APP --appimage-extract usr/share/icons/*/*/*/* 1>/dev/null -mv ./squashfs-root/share/icons/hicolor/22x22/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/24x24/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/32x32/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/48x48/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/64x64/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/128x128/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/256x256/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/512x512/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/share/icons/hicolor/scalable/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/22x22/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/24x24/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/32x32/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/48x48/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/64x64/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/128x128/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/256x256/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/512x512/apps/*$app* ./icons/$APP 2>/dev/null -mv ./squashfs-root/usr/share/icons/hicolor/scalable/apps/*$app* ./icons/$APP 2>/dev/null - -rm -R -f /opt/$APP/squashfs-root -mv ./$APP.desktop /usr/share/applications/AM-$APP.desktop From 73aae455bc69c2c21d3e887104c452f8c9030ed1 Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Mon, 8 Jul 2024 18:29:26 +0200 Subject: [PATCH 26/26] Update APP-MANAGER --- APP-MANAGER | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/APP-MANAGER b/APP-MANAGER index 30aeb553b..c44626758 100755 --- a/APP-MANAGER +++ b/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"