[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#772318: kmix: bashism in /bin/sh script



tags 772318 + upstream patch
forwarded 772318 https://bugs.kde.org/show_bug.cgi?id=341640
thanks

I've raised this upstream on the KDE BTS with a patch. I've also attached a 
copy of the patch here.

--
Jim Scadden
Description: Allow kmixremote to function correctly when using dash as /bin/sh
Author: Jim Scadden <jims@silentasylum.co.uk>
Bug-Debian: http://bugs.debian.org/772318
Bug: https://bugs.kde.org/show_bug.cgi?id=341640
Forwarded: https://bugs.kde.org/show_bug.cgi?id=341640
Last-Update: 2014-12-07

--- a/apps/kmixremote
+++ b/apps/kmixremote
@@ -7,7 +7,7 @@
 # Mute
 #################################################################################
 
-function usage
+usage()
 {
   echo "Usage:"
   echo "List mixers    #   $0 list"
@@ -15,19 +15,19 @@
   echo "Get Volume     #   $0 get  [--master | <mixer> <control>]"
   echo "Set Volume     #   $0 set  [--master | <mixer> <control>] <0..100>"
   echo "Mute/Unmute    #   $0 mute [--master | <mixer> <control>] true|false"
-  echo 
+  echo
 }
 
-function exit_with_error
+exit_with_error()
 {
   echo "Error: $1"
-  echo 
+  echo
   usage
   exit 1
 }
 
 # Prints the mixer DBUS ID's on the console. leaving out the "/Mixers/" prefix
-function listMixers
+listMixers()
 {
   qdbus org.kde.kmix /Mixers org.freedesktop.DBus.Properties.Get org.kde.KMix.MixSet mixers | cut -f3 -d/
   errorCode=$?
@@ -37,7 +37,7 @@
 }
 
 # Prints the mixer control DBUS ID's of the given mixer on the console. leaving out the "/Mixers/" prefix
-function listControls
+listControls()
 {
   qdbus org.kde.kmix $1 org.freedesktop.DBus.Properties.Get org.kde.KMix.Mixer controls  | cut -f4 -d/
   errorCode=$?
@@ -55,10 +55,11 @@
 # Read args
 while true; do
   arg=$1
-  shift
   if test -z "$arg"; then
     break
-  elif test "x--master" = "x$arg"; then
+  fi
+  shift
+  if test "x--master" = "x$arg"; then
     mixer=`qdbus org.kde.kmix /Mixers org.kde.KMix.MixSet.currentMasterMixer`
     control=`qdbus org.kde.kmix /Mixers org.kde.KMix.MixSet.currentMasterControl`
   elif test "x--help" = "x$arg" -o "x-h" = "x$arg"; then

Reply to: