Attachment 1431 Details for Bug 141 – tdeartwork : fix xscreensaver directory

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] tdeartwork : fix xscreensaver directory

tdeartwork-14.0.0-fix_update_screensaver_list.patch (text/plain), 2.02 KB, created by Francois Andriot on 2013-07-31 04:31:02 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Francois Andriot

Created: 2013-07-31 04:31:02 CDT

Size: 2.02 KB

patch

obsolete

>--- trinity-tdeartwork/tdescreensaver/kxsconfig/update_hacks.sh.ORI	2013-07-31 11:08:50.105439282 +0200
>+++ trinity-tdeartwork/tdescreensaver/kxsconfig/update_hacks.sh	2013-07-31 11:22:06.146113235 +0200
>@@ -1,18 +1,50 @@
> #!/bin/sh
>-scsvs=`cd /usr/lib/xscreensaver/ && ls -1 | grep -v config`
>+
>+#Â Checks for Xscreensaver directory (may vary on different distributions)
>+if [ -d /usr/libexec/xscreensaver ]; then
>+  XSDIR=/usr/libexec/xscreensaver
>+elif [ -d /usr/lib64/xscreensaver ]; then
>+  XSDIR=/usr/lib64/xscreensaver
>+else
>+  XSDIR=/usr/lib/xscreensaver
>+fi
>+
>+#Â Gets list of screensavers. Exclude 'config'.
>+scsvs=""
>+pushd "${XSDIR}" >/dev/null
>+for i in *; do
>+  if [ "${i}" != "config" ]; then
>+    scsvs="${scsvs} ${i}"
>+  fi
>+done
>+popd >/dev/null
>+
> echo $scsvs
>+
>+#Â Removes useless .desktop files, if any
>+for f in ScreenSavers/*.desktop; do
>+  #Â Gets the command line for this screensaver
>+  Exec="$(sed -n '/^Exec=kxsconfig / s/.* $.*$/\1/' $f)"
>+  if [ ! -x "${XSDIR}/${Exec}" ]; then
>+    echo "Removing ${f}"
>+    rm -f "${f}"
>+  fi
>+done
>+
>+# Creates missing screensavers .desktop files
> for name in $scsvs; do
>-    if test -f /usr/lib/xscreensaver/$name && test -f /usr/share/xscreensaver/config/$name.xml && test ! -f ScreenSavers/$name.desktop; then
>+    if test -f "${XSDIR}/$name" && test -f "/usr/share/xscreensaver/config/$name.xml" && test ! -f "ScreenSavers/$name.desktop"; then
>         echo "name: $name"
>         label=`grep '<screensaver.*_label' /usr/share/xscreensaver/config/$name.xml | sed -e 's#^.*_label=\"$.*$\".*$#\1#'`
>         echo "label: $label"
>         f=ScreenSavers/$name.desktop
>         sed -e "s#@NAME@#$name#; s#@LABEL@#$label#" ScreenSavers/xscreensaver.template > $f
>-        if ldd /usr/lib/xscreensaver/$name 2>&1 | grep libGL; then
>+        if ldd "${XSDIR}/$name" 2>&1 | grep libGL; then
>             sed -e "s,@GL1@,X-TDE-Category=OpenGL Screen Savers,; s,@GL2@,X-TDE-Type=OpenGL," $f > $f.new
>         else
>             grep -v @GL $f > $f.new
>         fi
>         mv $f.new $f
>     fi
>-done 
>+done
>+

Actions: View | Diff

Attachments on bug 141: 1431