Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync #930

Merged
merged 3 commits into from
Sep 7, 2024
Merged

Sync #930

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion programs/x86_64-appimages
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 3 additions & 2 deletions programs/x86_64-apps
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
73 changes: 73 additions & 0 deletions programs/x86_64/ente-auth
Original file line number Diff line number Diff line change
@@ -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
17 changes: 8 additions & 9 deletions programs/x86_64/ente → programs/x86_64/ente-photos
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# AM INSTALL SCRIPT VERSION 3.5
set -u
APP=ente
APP=ente-photos
SITE="ente-io/photos-desktop"

# CREATE DIRECTORIES AND ADD REMOVER
Expand All @@ -14,11 +14,11 @@ 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
# 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"
mv ./tmp/*.zsync ./"$APP".zsync 2>/dev/null
# Keep this space in sync with other installation scripts
rm -R -f ./tmp || exit 1
echo "$version" > ./version
chmod a+x ./"$APP" || exit 1
Expand All @@ -30,19 +30,18 @@ ln -s "/opt/$APP/$APP" "/usr/local/bin/$APP"
cat >> ./AM-updater << 'EOF'
#!/bin/sh
set -u
APP=ente
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" ] || [ -e /opt/"$APP"/*.zsync ]; then
if [ "$version" != "$version0" ]; 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; }
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 ./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"; }
mv --backup=t ./tmp/*mage ./"$APP"
chmod a+x ./"$APP" || exit 1
echo "$version" > ./version
rm -R -f ./*zs-old ./*.part ./tmp ./*~
Expand Down