Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

[ipfire-2.x.git] / src / scripts / readhash

diff --git a/src/scripts/readhash b/src/scripts/readhash
index b3428d41cfc6f721d0568710af9deec678e56972..63a3e0f88d8b8ad5227a1a0989df73fa7e9006f2 100644 (file)
--- a/src/scripts/readhash
+++ b/src/scripts/readhash
@@ -4,7 +4,7 @@
 # commands to run to set these as shell environment variables, it is
 # intended to be used as follows:
 #
-#   eval $(readhash /var/ipcop/main/settings)
+#   eval $(readhash /var/ipfire/main/settings)
 #
 
 # shell variables must consist of alphanumeric characters and underscores,
@@ -16,7 +16,7 @@ VARNAME='[A-Za-z_][A-zA-z0-9_]*'
 VARCHARS='A-Za-z0-9=/,._@#+-'
 VARVAL="[${VARCHARS}]*"
 
-sed -ne "s/^\(${VARNAME}\)=\(${VARVAL}\)$/\1=\2/p" $1
+sed -ne "s/\(${VARNAME}\)=\(${VARVAL}\)$/\1=\2/p" $1
 
 # Accept space only if it's quoted
-sed -ne "s/^\(${VARNAME}\)=\('[ ${VARCHARS}]*'\)$/\1=\2/p" $1
+sed -ne "s/\(${VARNAME}\)=\('[ ${VARCHARS}]*'\)$/\1=\2/p" $1