Skip to content

Commit 70cd3da

Browse files
Andreas PoulsenMarcus Funch
authored andcommitted
Make relevant scripts work with snaps, particularly firefox
1 parent bf5b2c6 commit 70cd3da

File tree

4 files changed

+24
-4
lines changed

4 files changed

+24
-4
lines changed
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#!/usr/bin/env bash
22

3-
sed -i "s/firefox/google-chrome/" /etc/dconf/db/os2borgerpc.d/02-launcher-favorites
3+
if [ -d "/snap/firefox" ]; then
4+
sed -i "s/firefox_firefox/google-chrome/" /etc/dconf/db/os2borgerpc.d/02-launcher-favorites
5+
else
6+
sed -i "s/firefox/google-chrome/" /etc/dconf/db/os2borgerpc.d/02-launcher-favorites
7+
fi
48

59
dconf update

os2borgerpc/desktop/desktop_launcher_program_shortcut.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
ADD=$1
1111
PROGRAM=$2
1212

13+
if [ -f "/var/lib/snapd/desktop/applications/${PROGRAM}_$PROGRAM.desktop" ]; then
14+
PROGRAM="${PROGRAM}_$PROGRAM"
15+
fi
16+
1317
if [ "$ADD" = "True" ]; then
1418

1519
# Append the program specified above to the menu/launcher

os2borgerpc/desktop/desktop_program_shortcut.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,16 @@ SHADOW=.skjult
2222

2323
if [ "$ADD" = 'True' ]; then
2424
mkdir --parents /home/$SHADOW/Skrivebord
25-
cp "/usr/share/applications/$PROGRAM.desktop" /home/$SHADOW/Skrivebord/
25+
if [ -f "/var/lib/snapd/desktop/applications/${PROGRAM}_$PROGRAM.desktop" ]; then
26+
cp "/var/lib/snapd/desktop/applications/${PROGRAM}_$PROGRAM.desktop" /home/$SHADOW/Skrivebord/
27+
else
28+
cp "/usr/share/applications/$PROGRAM.desktop" /home/$SHADOW/Skrivebord/
29+
fi
2630
else
2731
echo "Forsøger at slette programmet $PROGRAM"
28-
rm "/home/$SHADOW/Skrivebord/$PROGRAM.desktop"
32+
if [ -f "/home/$SHADOW/Skrivebord/${PROGRAM}_$PROGRAM.desktop" ]; then
33+
rm "/home/$SHADOW/Skrivebord/${PROGRAM}_$PROGRAM.desktop"
34+
else
35+
rm "/home/$SHADOW/Skrivebord/$PROGRAM.desktop"
36+
fi
2937
fi

os2borgerpc/os2borgerpc/browser_set_default.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ BROWSER="$(lower "$1")"
1717
FILE="/usr/share/applications/defaults.list"
1818

1919
if [ "$BROWSER" = "firefox" ]; then
20-
DESKTOP_FILE=firefox.desktop
20+
if [ -d "/snap/firefox" ]; then
21+
DESKTOP_FILE=firefox_firefox.desktop
22+
else
23+
DESKTOP_FILE=firefox.desktop
24+
fi
2125
else
2226
DESKTOP_FILE=google-chrome.desktop
2327
fi

0 commit comments

Comments
 (0)