dotlrn (2.5.0+dfsg-2) interpreters-bashisms.dpatch

Summary

 etc/install/functions.sh                   |    4 ++--
 etc/install/install-and-alert.sh           |   14 +++++++-------
 etc/install/warn-if-installation-errors.sh |    2 +-
 packages/acs-lang/bin/check-catalog.sh     |    6 +++---
 packages/acs-lang/bin/list-keys.sh         |    2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

    
download this patch

Patch contents

#! /bin/sh /usr/share/dpatch/dpatch-run
## interpreters-bashisms.dpatch by Hector Romojaro <hromojaro@dia.uned.es>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/etc/install/functions.sh trunk/etc/install/functions.sh
--- trunk~/etc/install/functions.sh	2004-04-25 11:32:27.000000000 +0200
+++ trunk/etc/install/functions.sh	2010-05-19 13:03:50.000000000 +0200
@@ -23,10 +23,10 @@
 
     interactive=$1
     
-    if [ "$interactive" == "yes" ]; then
+    if [ "$interactive" = "yes" ]; then
         echo "Continue? (y/n)"
         read continue
-        if [ "$continue" == "n" ]; then
+        if [ "$continue" = "n" ]; then
             echo "$0: exiting on users request"
             exit
         fi
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/etc/install/install-and-alert.sh trunk/etc/install/install-and-alert.sh
--- trunk~/etc/install/install-and-alert.sh	2003-11-04 15:39:04.000000000 +0100
+++ trunk/etc/install/install-and-alert.sh	2010-05-19 13:14:50.000000000 +0200
@@ -12,11 +12,11 @@
 script_path=$(dirname $(which $0))
 cd $script_path
 
-source ./functions.sh
+. ./functions.sh
 
 # Get a proper environment set up
 if [ -f ~/.bashrc ]; then
-    source ~/.bashrc
+    . ~/.bashrc
 fi
 
 # Look for two-part command line arguments
@@ -28,20 +28,20 @@
 server_overridden="no"
 for arg in "$@"
   do
-  if [ $config_val_next == "1" ]; then
+  if [ $config_val_next = "1" ]; then
       export config_file=$arg
       config_val_next=0
   fi
-  if [ $server_next == "1" ]; then
+  if [ $server_next = "1" ]; then
       # Overrides server setting in config file
       export server=$arg
       server_next=0
       server_overridden="yes"
   fi
-  if [ $arg == "--config-file" ]; then
+  if [ $arg = "--config-file" ]; then
       config_val_next=1
   fi
-  if [ $arg == "--server" ]; then
+  if [ $arg = "--server" ]; then
       server_next=1
   fi
 done
@@ -62,7 +62,7 @@
     mkdir -p $output_dir
 fi
 installation_output_file="${output_dir}/installation-output"
-./install.sh $@ &> $installation_output_file
+./install.sh $@ >$installation_output_file 2>&1
 
 # Get lines with alert keywords or lines with failed TclWebtest tests
 error_lines=$(egrep -i "(FAILED: .+\.test)|($alert_keyword)" $installation_output_file)
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/etc/install/warn-if-installation-errors.sh trunk/etc/install/warn-if-installation-errors.sh
--- trunk~/etc/install/warn-if-installation-errors.sh	2003-11-04 15:39:04.000000000 +0100
+++ trunk/etc/install/warn-if-installation-errors.sh	2010-05-19 12:59:59.000000000 +0200
@@ -9,7 +9,7 @@
 
 file_name=$1
 
-source ./functions.sh
+. ./functions.sh
 
 alert_keyword=`get_config_param alert_keyword`
 
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/packages/acs-lang/bin/check-catalog.sh trunk/packages/acs-lang/bin/check-catalog.sh
--- trunk~/packages/acs-lang/bin/check-catalog.sh	2003-10-30 14:10:53.000000000 +0100
+++ trunk/packages/acs-lang/bin/check-catalog.sh	2010-05-19 12:57:04.000000000 +0200
@@ -34,7 +34,7 @@
 export script_path=$(dirname $(which $0))
 
 ### Functions start
-source ${script_path}/functions.sh
+. ${script_path}/functions.sh
 
 get_date_time_key() {
     message_key=$1
@@ -72,7 +72,7 @@
     do
         catalog_package_version=$(cat $catalog_file | ${script_path}/mygrep '<message_catalog .*package_version="([^"]+)"')
 
-        if [ ! "$info_file_package_version" == "$catalog_package_version" ]; then
+        if [ ! "$info_file_package_version" = "$catalog_package_version" ]; then
             echo "$0: $package_key - Warning: package version $catalog_package_version in file $catalog_file does not equal version $info_file_package_version in info file."
         fi
     done
@@ -152,7 +152,7 @@
 find_dirs="$packages_dir ${packages_dir}../www"
 
 # Process arguments
-if [ "$#" == "0" ]; then
+if [ "$#" = "0" ]; then
     # No package provided - check all packages
     for catalog_dir in $(find $package_dir -iname catalog -type d)
     do
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/packages/acs-lang/bin/list-keys.sh trunk/packages/acs-lang/bin/list-keys.sh
--- trunk~/packages/acs-lang/bin/list-keys.sh	2003-10-31 13:58:29.000000000 +0100
+++ trunk/packages/acs-lang/bin/list-keys.sh	2010-05-19 12:58:17.000000000 +0200
@@ -5,7 +5,7 @@
 # @author Peter Marklund
 
 export script_path=$(dirname $(which $0))
-source ${script_path}/functions.sh
+. ${script_path}/functions.sh
 
 for en_us_file in $(find_en_us_files)
 do