diff options
author | Eric Hameleers <alien@slackware.com> | 2016-06-24 12:07:47 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2016-06-24 12:07:47 +0200 |
commit | cf192125b3fea07c7f0e00bb125bfa1b2f6ec7c8 (patch) | |
tree | 18cfa13edd861837d6403b760e0d8815995194e1 /make_slackware_live.sh | |
parent | 5b833f4bcaf12a47dfb551d6bc7d9209c851b720 (diff) | |
download | liveslak-cf192125b3fea07c7f0e00bb125bfa1b2f6ec7c8.tar.gz liveslak-cf192125b3fea07c7f0e00bb125bfa1b2f6ec7c8.tar.xz |
KDE launcher bug has been fixed in Slackware 14.2.
Diffstat (limited to 'make_slackware_live.sh')
-rwxr-xr-x | make_slackware_live.sh | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh index 6c92546..4e41b35 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -1284,15 +1284,18 @@ echo "-- Configuring KDE4." # Adjust some usability issues with the default desktop layout: if [ -f ${LIVE_ROOTDIR}/usr/share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js ]; then - sed -i \ - -e '/showActivityManager/a konsole = panel.addWidget("quicklaunch")' \ - -e '/showActivityManager/a dolphin = panel.addWidget("quicklaunch")' \ - -e '/showActivityManager/a firefox = panel.addWidget("quicklaunch")' \ - -e '$a firefox.writeConfig("iconUrls","file:///usr/share/applications/mozilla-firefox.desktop")' \ - -e '$a dolphin.writeConfig("iconUrls","file:////usr/share/applications/kde4/dolphin.desktop")' \ - -e '$a konsole.writeConfig("iconUrls","file:///usr/share/applications/kde4/konsole.desktop")' \ - -e '/tasks.writeConfig/d' \ - ${LIVE_ROOTDIR}/usr/share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js + # Only apply to an unmodified file (Slackware 14.2 already implements it): + if grep -q 'tasks.writeConfig' ${LIVE_ROOTDIR}/usr/share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js ]; then + sed -i \ + -e '/showActivityManager/a konsole = panel.addWidget("quicklaunch")' \ + -e '/showActivityManager/a dolphin = panel.addWidget("quicklaunch")' \ + -e '/showActivityManager/a firefox = panel.addWidget("quicklaunch")' \ + -e '$a firefox.writeConfig("iconUrls","file:///usr/share/applications/mozilla-firefox.desktop")' \ + -e '$a dolphin.writeConfig("iconUrls","file:////usr/share/applications/kde4/dolphin.desktop")' \ + -e '$a konsole.writeConfig("iconUrls","file:///usr/share/applications/kde4/konsole.desktop")' \ + -e '/tasks.writeConfig/d' \ + ${LIVE_ROOTDIR}/usr/share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js + fi fi # Prepare some KDE4 defaults for the 'live' user and any new users. |