[java-parent-projects COMMIT] in /java-parent-project-v3/trunk/bin: create-project-common.sh lock-version-common.sh

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Sep 17 15:39:16 2013
New Revision: 161

URL: http://svn.shibboleth.net/view/java-parent-projects?rev=161&view=rev
Log:
JPAR-19. Instead of relative paths for commands, allow overriding the default path. This was already done in java-parent-project-v2 r141.

Modified:
    java-parent-project-v3/trunk/bin/create-project-common.sh
    java-parent-project-v3/trunk/bin/lock-version-common.sh

Modified: java-parent-project-v3/trunk/bin/create-project-common.sh
URL: http://svn.shibboleth.net/view/java-parent-projects/java-parent-project-v3/trunk/bin/create-project-common.sh?rev=161&r1=160&r2=161&view=diff
==============================================================================
--- java-parent-project-v3/trunk/bin/create-project-common.sh (original)
+++ java-parent-project-v3/trunk/bin/create-project-common.sh Tue Sep 17 15:39:16 2013
@@ -3,14 +3,14 @@
 shopt -s -o nounset
 
 # Commands used herein
-declare -r CP="cp"
-declare -r CURL="curl"
-declare -r ECHO="echo"
-declare -r MKDIR="mkdir"
-declare -r PERL="perl"
-declare -r RM="rm"
-declare -r SVN="svn"
-declare -r TOUCH="touch"
+declare -r CP=${CP:-"/bin/cp"}
+declare -r CURL=${CURL:-"/usr/bin/curl"}
+declare -r ECHO=${ECHO:-"/bin/echo"}
+declare -r MKDIR=${MKDIR:-"/bin/mkdir"}
+declare -r PERL=${PERL:-"/usr/bin/perl"}
+declare -r RM=${RM:-"/bin/rm"}
+declare -r SVN=${SVN:-"/usr/bin/svn"}
+declare -r TOUCH=${TOUCH:-"/usr/bin/touch"}
 
 # URL to the java parent project from which everything inherits
 # we start with the trunk version and then use the *-lock-version commands before

Modified: java-parent-project-v3/trunk/bin/lock-version-common.sh
URL: http://svn.shibboleth.net/view/java-parent-projects/java-parent-project-v3/trunk/bin/lock-version-common.sh?rev=161&r1=160&r2=161&view=diff
==============================================================================
--- java-parent-project-v3/trunk/bin/lock-version-common.sh (original)
+++ java-parent-project-v3/trunk/bin/lock-version-common.sh Tue Sep 17 15:39:16 2013
@@ -1,7 +1,7 @@
 #! /bin/bash
 
-declare -r SVN="/usr/bin/svn"
-declare -r SED="/usr/bin/sed"
+declare -r SVN=${SVN:-"/usr/bin/svn"}
+declare -r SED=${SED:-"/usr/bin/sed"}
 
 # $1 the version number to use
 # $2 the directory of the monolithic project or project module