SF.net SVN: geany:[3039] trunk

[eht16 at users.sourceforge.net]

Revision: 3039
          http://geany.svn.sourceforge.net/geany/?rev=3039&view=rev
Author:   eht16
Date:     2008-10-02 16:10:45 +0000 (Thu, 02 Oct 2008)

Log Message:
-----------
Remove more bashisms and avoid using 'which' which is not LSB-compliant.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/scripts/svn-changes.sh
    trunk/scripts/wafinit.sh

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-10-02 15:48:50 UTC (rev 3038)
+++ trunk/ChangeLog	2008-10-02 16:10:45 UTC (rev 3039)
@@ -11,6 +11,9 @@
    Add an option to store the project file of new projects inside the
    project base directory.
    Doc: Add descriptions for the Search tab in the preferences dialog.
+*  scripts/svn-changes.sh, scripts/wafinit.sh:
+   Remove more bashisms and avoid using 'which' which is not
+   LSB-compliant.
 
 
 2008-10-01  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/scripts/svn-changes.sh
===================================================================
--- trunk/scripts/svn-changes.sh	2008-10-02 15:48:50 UTC (rev 3038)
+++ trunk/scripts/svn-changes.sh	2008-10-02 16:10:45 UTC (rev 3039)
@@ -27,8 +27,8 @@
 # show modifications
 if [ -n "$files" ]; then
 	echo 'Changes:'
-	if [[ -z $SPACES ]]; then
-		files+=':'
+	if [ -z $SPACES ]; then
+		files="${files}:"
 	fi
 	# indent and wrap
 	OUTFILE=/tmp/fmt

Modified: trunk/scripts/wafinit.sh
===================================================================
--- trunk/scripts/wafinit.sh	2008-10-02 15:48:50 UTC (rev 3038)
+++ trunk/scripts/wafinit.sh	2008-10-02 16:10:45 UTC (rev 3039)
@@ -3,11 +3,10 @@
 # This script creates a "configure" script and a Makefile to imitate autotools
 # but Waf is actually used to build
 
-WAF=`which waf`
-if [ "x$WAF" = "x" ]
-then
+WAF="waf"
+(waf --version) < /dev/null > /dev/null 2>&1 || {
     WAF="./waf"
-fi
+}
 
 # Makefile
 cat > Makefile << EOF


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.