diff options
| author | ramon <ramongomez@us.es> | 2011-04-27 18:11:20 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2011-04-27 18:11:20 +0000 |
| commit | 724e5e4e64b245522e9b986f38cb8fa2b0808e35 (patch) | |
| tree | 50057ce54d0f72a82fda0f1ae506bc41cf663992 | |
| parent | 0131b6388fe8a5e3e4e088fd12724b86bcac4cf7 (diff) | |
Corregir otra errata en detectar nº de revisión del fichero VERSION.txt
git-svn-id: https://opengnsys.es/svn/trunk@1918 a21b9725-9963-47de-94b9-378ad31fedc9
| -rwxr-xr-x | installer/opengnsys_installer.sh | 2 | ||||
| -rwxr-xr-x | installer/opengnsys_update.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh index 8b3118ce..13920b7c 100755 --- a/installer/opengnsys_installer.sh +++ b/installer/opengnsys_installer.sh @@ -1151,7 +1151,7 @@ function installationSummary() local VERSIONFILE="$INSTALL_TARGET/doc/VERSION.txt" local REVISION=$(LANG=C svn info $SVN_URL|awk '/Revision:/ {print "r"$2}') [ -f $VERSIONFILE ] || echo "OpenGnSys" >$VERSIONFILE - perl -pi -e "s/($| r[0-9])*/ $REVISION/" $VERSIONFILE + perl -pi -e "s/($| r[0-9]*)/ $REVISION/" $VERSIONFILE # Mostrar información. echo diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh index d5d6fa4a..ac20d1a0 100755 --- a/installer/opengnsys_update.sh +++ b/installer/opengnsys_update.sh @@ -36,9 +36,9 @@ if [ -d "$PROGRAMDIR/../installer" ]; then USESVN=0 else USESVN=1 - SVN_URL="http://$OPENGNSYS_SERVER/svn/trunk/" DEPS="$DEPS subversion" fi +SVN_URL="http://$OPENGNSYS_SERVER/svn/trunk/" WORKDIR=/tmp/opengnsys_update mkdir -p $WORKDIR @@ -379,7 +379,7 @@ function createDirs() # Crear usuario ficticio. if id -u $OPENGNSYS_CLIENTUSER &>/dev/null; then - echoAndLog "${FUNCNAME}(): user \"$OPENGNSYS_CLIENTUSER\"is already created" + echoAndLog "${FUNCNAME}(): user \"$OPENGNSYS_CLIENTUSER\" is already created" else echoAndLog "${FUNCNAME}(): creating OpenGnSys user" useradd $OPENGNSYS_CLIENTUSER 2>/dev/null |