From 7256028779a875fe5e7f0f562a4b346b91d25d26 Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Sat, 7 Sep 2024 05:56:52 +0200 Subject: [PATCH 1/3] Update x86_64-appimages --- programs/x86_64-appimages | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/x86_64-appimages b/programs/x86_64-appimages index 1999af2e2..8e5d7c29f 100644 --- a/programs/x86_64-appimages +++ b/programs/x86_64-appimages @@ -483,7 +483,8 @@ ◆ encryptpad : Secure text editor and binary encryptor with passwords. ◆ endless-sky : Space exploration and combat game. ◆ enoseannotator : View, annotate and store measurements of the eNose sensor. -◆ ente : Desktop app for ente.io. +◆ ente-auth : Fully open source, End to End Encrypted alternative to Google Photos and Apple Photos. +◆ ente-photos : Binary releases of the Ente Photos desktop app. ◆ enve : Create 2D Animations. ◆ envkey : EnvKey’s cross-platform native app. ◆ eosvc : Application for management of self-employeed people. From d8345eaec3ab42194dd6aeab2aebafe011107b3e Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Sat, 7 Sep 2024 05:57:12 +0200 Subject: [PATCH 2/3] Add files via upload --- programs/x86_64-apps | 5 ++- programs/x86_64/ente-auth | 73 +++++++++++++++++++++++++++++++++++++ programs/x86_64/ente-photos | 73 +++++++++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+), 2 deletions(-) create mode 100644 programs/x86_64/ente-auth create mode 100644 programs/x86_64/ente-photos diff --git a/programs/x86_64-apps b/programs/x86_64-apps index 708ed9142..186ba0b99 100644 --- a/programs/x86_64-apps +++ b/programs/x86_64-apps @@ -538,7 +538,8 @@ ◆ encryptpad : Secure text editor and binary encryptor with passwords. ◆ endless-sky : Space exploration and combat game. ◆ enoseannotator : View, annotate and store measurements of the eNose sensor. -◆ ente : Desktop app for ente.io. +◆ ente-auth : Fully open source, End to End Encrypted alternative to Google Photos and Apple Photos. +◆ ente-photos : Binary releases of the Ente Photos desktop app. ◆ enve : Create 2D Animations. ◆ envkey : EnvKey’s cross-platform native app. ◆ eosvc : Application for management of self-employeed people. @@ -1416,8 +1417,8 @@ ◆ pb-for-desktop : Pushbullet Desktop app. ◆ pboy : A small .pdf management tool with a command-line UI. ◆ pcloud : Europe's most secure cloud storage trusted by 20 million people. -◆ pcsx-redux : The PCSX-Redux project is a collection of tools, research, hardware design, and libraries aiming at development and reverse engineering on the PlayStation 1. The core product itself, PCSX-Redux, is yet another fork of the Playstation emulator, PCSX. ◆ pcsx2 : The Playstation 2 Emulator. +◆ pcsx-redux : The PCSX-Redux project is a collection of tools, research, hardware design, and libraries aiming at development and reverse engineering on the PlayStation 1. The core product itself, PCSX-Redux, is yet another fork of the Playstation emulator, PCSX. ◆ pdf2htmlex : Convert PDF to HTML without losing text or format. ◆ pdf4qt : Open source PDF editor. ◆ pdfcompress : A utility to compress PDF documentas based on Ghostscript and YAD. diff --git a/programs/x86_64/ente-auth b/programs/x86_64/ente-auth new file mode 100644 index 000000000..05d8e0a3c --- /dev/null +++ b/programs/x86_64/ente-auth @@ -0,0 +1,73 @@ +#!/bin/sh + +# AM INSTALL SCRIPT VERSION 3.5 +set -u +APP=ente-auth +SITE="ente-io/ente" + +# 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" > ../remove +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/ente-io/ente/releases | sed 's/[()",{} ]/\n/g' | grep -oi "https.*mage$" | grep -vi "i386\|i686\|aarch64\|arm64\|armv7l" | head -1) +wget "$version" || exit 1 +# Keep this space in sync with other installation scripts +# Use tar fx ./*tar* here for example in this line in case a compressed file is downloaded. +cd .. +mv ./tmp/*mage ./"$APP" +# Keep this space in sync with other installation scripts +rm -R -f ./tmp || exit 1 +echo "$version" > ./version +chmod a+x ./"$APP" || exit 1 + +# LINK TO PATH +ln -s "/opt/$APP/$APP" "/usr/local/bin/$APP" + +# SCRIPT TO UPDATE THE PROGRAM +cat >> ./AM-updater << 'EOF' +#!/bin/sh +set -u +APP=ente-auth +SITE="ente-io/ente" +version0=$(cat "/opt/$APP/version") +version=$(curl -Ls https://api.github.com/repos/ente-io/ente/releases | sed 's/[()",{} ]/\n/g' | grep -oi "https.*mage$" | grep -vi "i386\|i686\|aarch64\|arm64\|armv7l" | head -1) +[ -n "$version" ] || { echo "Error getting link"; exit 1; } +if [ "$version" != "$version0" ]; then + mkdir "/opt/$APP/tmp" && cd "/opt/$APP/tmp" || exit 1 + notify-send "A new version of $APP is available, please wait" + wget "$version" || exit 1 + # Use tar fx ./*tar* here for example in this line in case a compressed file is downloaded. + cd .. + mv --backup=t ./tmp/*mage ./"$APP" + chmod a+x ./"$APP" || exit 1 + echo "$version" > ./version + rm -R -f ./*zs-old ./*.part ./tmp ./*~ + notify-send "$APP is updated!" +else + echo "Update not needed!" +fi +EOF +chmod a+x ./AM-updater || exit 1 + +# LAUNCHER & ICON +./"$APP" --appimage-extract *.desktop 1>/dev/null && mv ./squashfs-root/*.desktop ./"$APP".desktop +./"$APP" --appimage-extract .DirIcon 1>/dev/null && mv ./squashfs-root/.DirIcon ./DirIcon +COUNT=0 +while [ "$COUNT" -lt 10 ]; do # Tries to get the actual icon/desktop if it is a symlink to another symlink + if [ -L ./"$APP".desktop ]; then + LINKPATH="$(readlink ./"$APP".desktop | sed 's|^\./||' 2>/dev/null)" + ./"$APP" --appimage-extract "$LINKPATH" 1>/dev/null && mv ./squashfs-root/"$LINKPATH" ./"$APP".desktop + fi + if [ -L ./DirIcon ]; then + LINKPATH="$(readlink ./DirIcon | sed 's|^\./||' 2>/dev/null)" + ./"$APP" --appimage-extract "$LINKPATH" 1>/dev/null && mv ./squashfs-root/"$LINKPATH" ./DirIcon + fi + [ ! -L ./"$APP".desktop ] && [ ! -L ./DirIcon ] && break + 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/local/share/applications/"$APP"-AM.desktop && mv ./DirIcon ./icons/"$APP" 1>/dev/null +rm -R -f ./squashfs-root diff --git a/programs/x86_64/ente-photos b/programs/x86_64/ente-photos new file mode 100644 index 000000000..062204a6e --- /dev/null +++ b/programs/x86_64/ente-photos @@ -0,0 +1,73 @@ +#!/bin/sh + +# AM INSTALL SCRIPT VERSION 3.5 +set -u +APP=ente-photos +SITE="ente-io/photos-desktop" + +# 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" > ../remove +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/ente-io/photos-desktop/releases | sed 's/[()",{} ]/\n/g' | grep -oi "https.*mage$" | grep -vi "i386\|i686\|aarch64\|arm64\|armv7l" | head -1) +wget "$version" || exit 1 +# Keep this space in sync with other installation scripts +# Use tar fx ./*tar* here for example in this line in case a compressed file is downloaded. +cd .. +mv ./tmp/*mage ./"$APP" +# Keep this space in sync with other installation scripts +rm -R -f ./tmp || exit 1 +echo "$version" > ./version +chmod a+x ./"$APP" || exit 1 + +# LINK TO PATH +ln -s "/opt/$APP/$APP" "/usr/local/bin/$APP" + +# SCRIPT TO UPDATE THE PROGRAM +cat >> ./AM-updater << 'EOF' +#!/bin/sh +set -u +APP=ente-photos +SITE="ente-io/photos-desktop" +version0=$(cat "/opt/$APP/version") +version=$(curl -Ls https://api.github.com/repos/ente-io/photos-desktop/releases | sed 's/[()",{} ]/\n/g' | grep -oi "https.*mage$" | grep -vi "i386\|i686\|aarch64\|arm64\|armv7l" | head -1) +[ -n "$version" ] || { echo "Error getting link"; exit 1; } +if [ "$version" != "$version0" ]; then + mkdir "/opt/$APP/tmp" && cd "/opt/$APP/tmp" || exit 1 + notify-send "A new version of $APP is available, please wait" + wget "$version" || exit 1 + # Use tar fx ./*tar* here for example in this line in case a compressed file is downloaded. + cd .. + mv --backup=t ./tmp/*mage ./"$APP" + chmod a+x ./"$APP" || exit 1 + echo "$version" > ./version + rm -R -f ./*zs-old ./*.part ./tmp ./*~ + notify-send "$APP is updated!" +else + echo "Update not needed!" +fi +EOF +chmod a+x ./AM-updater || exit 1 + +# LAUNCHER & ICON +./"$APP" --appimage-extract *.desktop 1>/dev/null && mv ./squashfs-root/*.desktop ./"$APP".desktop +./"$APP" --appimage-extract .DirIcon 1>/dev/null && mv ./squashfs-root/.DirIcon ./DirIcon +COUNT=0 +while [ "$COUNT" -lt 10 ]; do # Tries to get the actual icon/desktop if it is a symlink to another symlink + if [ -L ./"$APP".desktop ]; then + LINKPATH="$(readlink ./"$APP".desktop | sed 's|^\./||' 2>/dev/null)" + ./"$APP" --appimage-extract "$LINKPATH" 1>/dev/null && mv ./squashfs-root/"$LINKPATH" ./"$APP".desktop + fi + if [ -L ./DirIcon ]; then + LINKPATH="$(readlink ./DirIcon | sed 's|^\./||' 2>/dev/null)" + ./"$APP" --appimage-extract "$LINKPATH" 1>/dev/null && mv ./squashfs-root/"$LINKPATH" ./DirIcon + fi + [ ! -L ./"$APP".desktop ] && [ ! -L ./DirIcon ] && break + 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/local/share/applications/"$APP"-AM.desktop && mv ./DirIcon ./icons/"$APP" 1>/dev/null +rm -R -f ./squashfs-root From b55999dba60f31e1b139f91a83b7df2b464791e0 Mon Sep 17 00:00:00 2001 From: iVAN <88724353+ivan-hc@users.noreply.github.com> Date: Sat, 7 Sep 2024 05:57:54 +0200 Subject: [PATCH 3/3] Delete programs/x86_64/ente --- programs/x86_64/ente | 74 -------------------------------------------- 1 file changed, 74 deletions(-) delete mode 100644 programs/x86_64/ente diff --git a/programs/x86_64/ente b/programs/x86_64/ente deleted file mode 100644 index e74f30848..000000000 --- a/programs/x86_64/ente +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh - -# AM INSTALL SCRIPT VERSION 3.5 -set -u -APP=ente -SITE="ente-io/photos-desktop" - -# 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" > ../remove -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/ente-io/photos-desktop/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 -# Use tar fx ./*tar* here for example in this line in case a compressed file is downloaded. -cd .. -mv ./tmp/*mage ./"$APP" -mv ./tmp/*.zsync ./"$APP".zsync 2>/dev/null -rm -R -f ./tmp || exit 1 -echo "$version" > ./version -chmod a+x ./"$APP" || exit 1 - -# LINK TO PATH -ln -s "/opt/$APP/$APP" "/usr/local/bin/$APP" - -# SCRIPT TO UPDATE THE PROGRAM -cat >> ./AM-updater << 'EOF' -#!/bin/sh -set -u -APP=ente -SITE="ente-io/photos-desktop" -version0=$(cat "/opt/$APP/version") -version=$(curl -Ls https://api.github.com/repos/ente-io/photos-desktop/releases | sed 's/[()",{} ]/\n/g' | grep -oi "https.*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 - [ -e ../*.zsync ] || notify-send "A new version of $APP is available, please wait" - [ -e ../*.zsync ] && wget "$version.zsync" 2>/dev/null || { wget "$version" || exit 1; } - # Use tar fx ./*tar* here for example in this line in case a compressed file is downloaded. - cd .. - mv ./tmp/*.zsync ./"$APP".zsync 2>/dev/null || mv --backup=t ./tmp/*mage ./"$APP" - [ -e ./*.zsync ] && { zsync ./"$APP".zsync || notify-send -u critical "zsync failed to update $APP"; } - chmod a+x ./"$APP" || exit 1 - echo "$version" > ./version - rm -R -f ./*zs-old ./*.part ./tmp ./*~ - notify-send "$APP is updated!" -else - echo "Update not needed!" -fi -EOF -chmod a+x ./AM-updater || exit 1 - -# LAUNCHER & ICON -./"$APP" --appimage-extract *.desktop 1>/dev/null && mv ./squashfs-root/*.desktop ./"$APP".desktop -./"$APP" --appimage-extract .DirIcon 1>/dev/null && mv ./squashfs-root/.DirIcon ./DirIcon -COUNT=0 -while [ "$COUNT" -lt 10 ]; do # Tries to get the actual icon/desktop if it is a symlink to another symlink - if [ -L ./"$APP".desktop ]; then - LINKPATH="$(readlink ./"$APP".desktop | sed 's|^\./||' 2>/dev/null)" - ./"$APP" --appimage-extract "$LINKPATH" 1>/dev/null && mv ./squashfs-root/"$LINKPATH" ./"$APP".desktop - fi - if [ -L ./DirIcon ]; then - LINKPATH="$(readlink ./DirIcon | sed 's|^\./||' 2>/dev/null)" - ./"$APP" --appimage-extract "$LINKPATH" 1>/dev/null && mv ./squashfs-root/"$LINKPATH" ./DirIcon - fi - [ ! -L ./"$APP".desktop ] && [ ! -L ./DirIcon ] && break - 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/local/share/applications/"$APP"-AM.desktop && mv ./DirIcon ./icons/"$APP" 1>/dev/null -rm -R -f ./squashfs-root