From: pawelz Date: Fri, 12 Jun 2009 06:54:53 +0000 (+0000) Subject: - kills bashizm in awesome-client. X-Git-Tag: auto/th/awesome-3_3-4~1 X-Git-Url: https://git.pld-linux.org/?p=packages%2Fawesome.git;a=commitdiff_plain;h=66965aef24c733f77d17cc7156bcbad4d0bdd39e;hp=436726853093a5c59c2b82b12afe3753d271ed65 - kills bashizm in awesome-client. - patch sent to awesome-devel mailing list. I hope it will be applied in next release of awesome. Changed files: awesome-client-bashizm.patch -> 1.1 --- diff --git a/awesome-client-bashizm.patch b/awesome-client-bashizm.patch new file mode 100644 index 0000000..fe9c111 --- /dev/null +++ b/awesome-client-bashizm.patch @@ -0,0 +1,40 @@ +diff --git a/utils/awesome-client b/utils/awesome-client +index a125869..e99faf3 100755 +--- a/utils/awesome-client ++++ b/utils/awesome-client +@@ -1,7 +1,8 @@ + #!/bin/sh + + # rlwrap provides readline to stuff which doesn't know readline by itself +-RLWRAP=`which rlwrap 2>/dev/null` ++RLWRAP=$(which rlwrap 2>/dev/null) ++READ_OPTIONS="-r" + + if [ "$RLWRAP" != "" ] + then +@@ -10,7 +11,15 @@ then + A_RERUN="no" exec $RLWRAP $0 + fi + else +- USE_READLINE="-e" ++ if [ "$BASH" ] ++ then ++ READ_PARAMETERS=" -e" ++ fi ++fi ++ ++if [ $BASH ] ++then ++ READ_OPTIONS="$READ_OPTIONS -p awesome# " + fi + + DBUS_SEND=dbus-send +@@ -32,7 +41,7 @@ a_dbus_send() + $DBUS_METHOD string:"$1" | tail -n +2 + } + +-while read ${USE_READLINE} -r -p "awesome# " line ++while read ${USE_READLINE} -r ${READ_OPTIONS} line + do + a_dbus_send "$line" + done