Skip to content

Commit ef21f7a

Browse files
authored
Update dayon - install two launchers assistant/assisted
fix RetGal/Dayon#310
1 parent 99c39d2 commit ef21f7a

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

programs/x86_64/dayon

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SITE="RetGal/Dayon"
88
# CREATE DIRECTORIES AND ADD REMOVER
99
[ -n "$APP" ] && mkdir -p "/opt/$APP/tmp" "/opt/$APP/icons" && cd "/opt/$APP/tmp" || exit 1
1010
printf "#!/bin/sh\nset -e\nrm -f /usr/local/bin/$APP\nrm -R -f /opt/$APP" > ../remove
11-
printf '\n%s' "rm -f /usr/local/share/applications/$APP-AM.desktop" >> ../remove
11+
printf '\n%s' "rm -f /usr/local/share/applications/$APP-*-AM.desktop" >> ../remove
1212
chmod a+x ../remove || exit 1
1313

1414
# DOWNLOAD AND PREPARE THE APP, $version is also used for updates
@@ -57,21 +57,21 @@ EOF
5757
chmod a+x ./AM-updater || exit 1
5858

5959
# LAUNCHER & ICON
60-
./"$APP" --appimage-extract *.desktop 1>/dev/null && mv ./squashfs-root/*.desktop ./"$APP".desktop
60+
./"$APP" --appimage-extract *.desktop 1>/dev/null && mv ./squashfs-root/assistant.desktop ./"$APP"-assistant-AM.desktop && mv ./squashfs-root/assisted.desktop ./"$APP"-assisted-AM.desktop
6161
./"$APP" --appimage-extract .DirIcon 1>/dev/null && mv ./squashfs-root/.DirIcon ./DirIcon
6262
COUNT=0
6363
while [ "$COUNT" -lt 10 ]; do # Tries to get the actual icon/desktop if it is a symlink to another symlink
64-
if [ -L ./"$APP".desktop ]; then
65-
LINKPATH="$(readlink ./"$APP".desktop | sed 's|^\./||' 2>/dev/null)"
66-
./"$APP" --appimage-extract "$LINKPATH" 1>/dev/null && mv ./squashfs-root/"$LINKPATH" ./"$APP".desktop
67-
fi
64+
#if [ -L ./"$APP".desktop ]; then
65+
# LINKPATH="$(readlink ./"$APP".desktop | sed 's|^\./||' 2>/dev/null)"
66+
# ./"$APP" --appimage-extract "$LINKPATH" 1>/dev/null && mv ./squashfs-root/"$LINKPATH" ./"$APP".desktop
67+
#fi
6868
if [ -L ./DirIcon ]; then
6969
LINKPATH="$(readlink ./DirIcon | sed 's|^\./||' 2>/dev/null)"
7070
./"$APP" --appimage-extract "$LINKPATH" 1>/dev/null && mv ./squashfs-root/"$LINKPATH" ./DirIcon
7171
fi
7272
[ ! -L ./"$APP".desktop ] && [ ! -L ./DirIcon ] && break
7373
COUNT=$((COUNT + 1))
7474
done
75-
sed -i "s#Exec=[^ ]*#Exec=$APP#g; s#Icon=.*#Icon=/opt/$APP/icons/$APP#g; s# --no-sandbox##g" ./"$APP".desktop
76-
mv ./"$APP".desktop /usr/local/share/applications/"$APP"-AM.desktop && mv ./DirIcon ./icons/"$APP" 1>/dev/null
75+
sed -i "s#Exec=[^ ]*#Exec=$APP#g; s#Icon=.*#Icon=/opt/$APP/icons/$APP#g; s# --no-sandbox##g" ./"$APP"*.desktop
76+
mv ./"$APP"*.desktop /usr/local/share/applications/ && mv ./DirIcon ./icons/"$APP" 1>/dev/null
7777
rm -R -f ./squashfs-root

0 commit comments

Comments
 (0)