Browse Source

AddSVN now works with non-gnu (BSD/OSX) sed


git-svn-id: http://svn.dmdirc.com/trunk@4159 00569f92-eb28-0410-84fd-f71c24880f
tags/0.6
Shane Mc Cormack 16 years ago
parent
commit
fb6007ba3e
1 changed files with 10 additions and 3 deletions
  1. 10
    3
      AddSVN.sh

+ 10
- 3
AddSVN.sh View File

@@ -10,16 +10,23 @@ fi;
10 10
 SVNREV=`$SVN info | grep Revision`
11 11
 SVNREV=${SVNREV##*: }
12 12
 
13
+GNUSED=`sed --version 2>&1 | grep GNU`
14
+if [ "" != "${GNUSED}" ]; then
15
+	PARAM="-r"
16
+else
17
+	PARAM="-E"
18
+fi;
19
+
13 20
 if [ "${1}" = "--pre" ]; then
14 21
 	# Substitute the version string
15
-	${SED} -r 's/int SVN_REVISION = /int SVN_REVISION = '${SVNREV}'; \/\/ /' ${PWD}/src/com/dmdirc/Main.java > ${PWD}/src/com/dmdirc/Main.java.tmp 2>/dev/null
22
+	${SED} ${PARAM} 's/int SVN_REVISION = /int SVN_REVISION = '${SVNREV}'; \/\/ /' ${PWD}/src/com/dmdirc/Main.java > ${PWD}/src/com/dmdirc/Main.java.tmp 2>/dev/null
16 23
 elif [ "${1}" = "--post" ]; then
17 24
 	# Unsubstitute the version string
18
-	${SED} -r 's/int SVN_REVISION = .* ([0-9]+);/int SVN_REVISION = \1;/' ${PWD}/src/com/dmdirc/Main.java > ${PWD}/src/com/dmdirc/Main.java.tmp 2>/dev/null
25
+	${SED} ${PARAM} 's/int SVN_REVISION = .* ([0-9]+);/int SVN_REVISION = \1;/' ${PWD}/src/com/dmdirc/Main.java > ${PWD}/src/com/dmdirc/Main.java.tmp #2>/dev/null
19 26
 fi;
20 27
 
21 28
 if [ -e ${PWD}/src/com/dmdirc/Main.java.tmp ]; then
22 29
 	mv ${PWD}/src/com/dmdirc/Main.java.tmp ${PWD}/src/com/dmdirc/Main.java
23 30
 fi;
24 31
 
25
-cat ${PWD}/src/com/dmdirc/Main.java | grep SVN
32
+cat ${PWD}/src/com/dmdirc/Main.java | grep SVN

Loading…
Cancel
Save