From 14435ceb9d456422906a70076ce4354cdcd98fec Mon Sep 17 00:00:00 2001 From: Raymond Toy <toy.raymond@gmail.com> Date: Sun, 30 Oct 2011 15:31:56 -0700 Subject: [PATCH] Solaris /bin/sh doesn't like ${VERSION:+ -v "$VERSION"}. Simplify it. --- tools/build-all.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/build-all.sh b/tools/build-all.sh index 3b69e1c00..e9d137fa8 100755 --- a/tools/build-all.sh +++ b/tools/build-all.sh @@ -46,7 +46,7 @@ do C) CREATE_OPT="$OPTARG" ;; o) OLDLISP="$OPTARG" ;; 8) OLD8="$OPTARG" ;; - v) VERSION="$OPTARG" ;; + v) VERSION="$OPTARG"; VERSION_SET=true ;; U) UPDATE_TRANS="-U" ;; P) UPDATE_POT="" ;; \?) usage ;; @@ -83,16 +83,19 @@ buildx86 () buildsun4 () { + if [ "$VERSION_SET" = true ]; then + VERS="-v '"$VERSION"'" + fi # Build non-unicode versions if [ -n "$OLD8" ]; then set -x - src/tools/build.sh -b ${BASE}-8bit $bootfiles ${VERSION:+-v "$VERSION"} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" + src/tools/build.sh -b ${BASE}-8bit $bootfiles ${VERS} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" set +x fi # Build the unicode version. if [ -n "$OLDLISP" ]; then set -x - src/tools/build.sh -b ${BASE} $bootfiles ${VERSION:+-v "$VERSION"} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" + src/tools/build.sh -b ${BASE} $bootfiles ${VERS} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" set +x fi } -- GitLab