File xfce-utils-4.8.3-fix-xfhelp4-invocation.patch of Package xfce-utils

Overview Repositories Revisions Requests Users Attributes Meta

File xfce-utils-4.8.3-fix-xfhelp4-invocation.patch of Package xfce-utils

Index: xfce-utils-4.8.3/scripts/xfhelp4.in
===================================================================
--- xfce-utils-4.8.3.orig/scripts/xfhelp4.in
+++ xfce-utils-4.8.3/scripts/xfhelp4.in
@@ -22,8 +22,14 @@
 
 HELP_DIR="@_docdir_@"
 
-if [ ! x"$1" = x"" ]; then
+if [ -n "$1" ]; then
+    HELP_FILE=
     MODULE="${1%.html}"
+    case $1 in
+        *.html)
+            HELP_FILE="$1"
+            ;;
+    esac
 else
     MODULE="xfce-utils"
 fi
@@ -37,7 +43,7 @@ else
   LC="C"
 fi
 
-LC_CLEAN="`echo $LC | sed 's/$..$_.*/\1/'`"
+LC_CLEAN="${LC%_*}"
 
 if [ -r "$HELP_DIR/$MODULE/html/$LC/index.html" ]
 then
@@ -48,8 +54,22 @@ then
 elif [ -r "$HELP_DIR/$MODULE/html/C/index.html" ]
 then
   URL="$HELP_DIR/$MODULE/html/C/index.html"
+elif [ -n "$HELP_FILE" ]
+then
+  if [ -r "$HELP_DIR/$MODULE/html/$LC/$HELP_FILE" ]
+  then
+    URL="$HELP_DIR/$MODULE/html/$LC/$HELP_FILE"
+  elif [ -r "$HELP_DIR/$MODULE/html/$LC_CLEAN/$HELP_FILE" ]
+  then
+    URL="$HELP_DIR/$MODULE/html/$LC_CLEAN/$HELP_FILE"
+  elif [ -r "$HELP_DIR/$MODULE/html/C/$HELP_FILE" ]
+  then
+    URL="$HELP_DIR/$MODULE/html/C/$HELP_FILE"
+  else
+    URL="$HELP_DIR/xfce-utils/html/C/index.html"
+  fi
 else
   URL="$HELP_DIR/xfce-utils/html/C/index.html"
 fi
 
-xfbrowser4 $URL
+xfbrowser4 "${URL}"

Places

File xfce-utils-4.8.3-fix-xfhelp4-invocation.patch of Package xfce-utils

Places