[SCM] xbmc/master: Don't break scripts trying to eliminate bashism. :-)

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Sun Dec 28 09:54:53 UTC 2014


The following commit has been merged in the master branch:
commit f81aac1703bc36aff42c6b06c4801acaf6c6c462
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Sun Dec 7 16:17:00 2014 +0100

    Don't break scripts trying to eliminate bashism. :-)
    
    Git-Dch: Ignore

diff --git a/debian/patches/0019-Fix-bashisms-in-shell-scripts.patch b/debian/patches/0019-Fix-bashisms-in-shell-scripts.patch
index 1257277..b58b465 100644
--- a/debian/patches/0019-Fix-bashisms-in-shell-scripts.patch
+++ b/debian/patches/0019-Fix-bashisms-in-shell-scripts.patch
@@ -6,19 +6,6 @@ Subject: [PATCH] Fix bashisms in shell scripts
 Bashisms in scripts may cause problems on systems where the default
 shell is not Bash.
 
-diff --git a/tools/Linux/xbmc-standalone.sh.in b/tools/Linux/xbmc-standalone.sh.in
-index d392a6c..0d24fcd 100644
---- a/tools/Linux/xbmc-standalone.sh.in
-+++ b/tools/Linux/xbmc-standalone.sh.in
-@@ -34,7 +34,7 @@ do
-   $XBMC
-   RET=$?
-   NOW=$(date +%s)
--  if [ $(( ($RET >= 64 && $RET <=66) || $RET == 0 )) = "1" ]; then # clean exit
-+  if [ $(( ($RET >= 64 && $RET <=66) || $RET = 0 )) = "1" ]; then # clean exit
-     LOOP=0
-   else # crash
-     DIFF=$((NOW-LASTSUCCESSFULSTART))
 diff --git a/tools/Linux/xbmc.sh.in b/tools/Linux/xbmc.sh.in
 index db99670..d80392c 100644
 --- a/tools/Linux/xbmc.sh.in
@@ -34,16 +21,3 @@ index db99670..d80392c 100644
      fi
      single_stacktrace "$PWD" 1
      # Find in plugins directories
-@@ -134,10 +134,10 @@ do
-   LOOP=0
-   "$LIBDIR/xbmc/xbmc.bin" $SAVED_ARGS
-   RET=$?
--  if [ $(( $RET == 65 )) = "1" ]
-+  if [ $(( $RET = 65 )) = "1" ]
-   then # User requested to restart app
-     LOOP=1
--  elif [ $(( ($RET >= 131 && $RET <= 136) || $RET == 139 )) = "1" ]
-+  elif [ $(( ($RET >= 131 && $RET <= 136) || $RET = 139 )) = "1" ]
-   then # Crashed with core dump
-     print_crash_report
-   fi

-- 
xbmc packaging



More information about the pkg-multimedia-commits mailing list