changeset
fix missing double-quote - fixes #306
Sun, 24 Sep 2023 18:37:30 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Sun, 24 Sep 2023 18:37:30 +0200
- changeset 76
- 620358ea3a0b
- parent 75
- b49869bd2a0a
- child 77
- 439902ff0af3
fix missing double-quote - fixes #306
--- a/src/test/resources/golden-sample/configure Fri Sep 22 23:22:28 2023 +0200 +++ b/src/test/resources/golden-sample/configure Sun Sep 24 18:37:30 2023 +0200 @@ -30,8 +30,8 @@ # custom variables HOST=`uname -n` -PREFIX=`pwd`/work -INSTALL_DIR=$PREFIX +PREFIX="`pwd`/work" +INSTALL_DIR="$PREFIX" # features FEATURE_PG=auto @@ -170,22 +170,22 @@ # generate vars.mk cat > "$TEMP_DIR/vars.mk" << __EOF__ -PREFIX=$PREFIX -EPREFIX=$EPREFIX -BINDIR=$BINDIR -SBINDIR=$SBINDIR -LIBDIR=$LIBDIR -LIBEXECDIR=$LIBEXECDIR -DATADIR=$DATADIR -SYSCONFDIR=$SYSCONFDIR -SHAREDSTATEDIR=$SHAREDSTATEDIR -LOCALSTATEDIR=$LOCALSTATEDIR -INCLUDEDIR=$INCLUDEDIR -INFODIR=$INFODIR -MANDIR=$MANDIR -HOST=$HOST -PREFIX=$PREFIX -INSTALL_DIR=$INSTALL_DIR +PREFIX="$PREFIX" +EPREFIX="$EPREFIX" +BINDIR="$BINDIR" +SBINDIR="$SBINDIR" +LIBDIR="$LIBDIR" +LIBEXECDIR="$LIBEXECDIR" +DATADIR="$DATADIR" +SYSCONFDIR="$SYSCONFDIR" +SHAREDSTATEDIR="$SHAREDSTATEDIR" +LOCALSTATEDIR="$LOCALSTATEDIR" +INCLUDEDIR="$INCLUDEDIR" +INFODIR="$INFODIR" +MANDIR="$MANDIR" +HOST="$HOST" +PREFIX="$PREFIX" +INSTALL_DIR="$INSTALL_DIR" __EOF__ sort -u -o "$TEMP_DIR/vars.mk" "$TEMP_DIR/vars.mk"
--- a/src/test/resources/golden-sample/configure2 Fri Sep 22 23:22:28 2023 +0200 +++ b/src/test/resources/golden-sample/configure2 Sun Sep 24 18:37:30 2023 +0200 @@ -176,19 +176,19 @@ # generate vars.mk cat > "$TEMP_DIR/vars.mk" << __EOF__ -PREFIX=$PREFIX -EPREFIX=$EPREFIX -BINDIR=$BINDIR -SBINDIR=$SBINDIR -LIBDIR=$LIBDIR -LIBEXECDIR=$LIBEXECDIR -DATADIR=$DATADIR -SYSCONFDIR=$SYSCONFDIR -SHAREDSTATEDIR=$SHAREDSTATEDIR -LOCALSTATEDIR=$LOCALSTATEDIR -INCLUDEDIR=$INCLUDEDIR -INFODIR=$INFODIR -MANDIR=$MANDIR +PREFIX="$PREFIX" +EPREFIX="$EPREFIX" +BINDIR="$BINDIR" +SBINDIR="$SBINDIR" +LIBDIR="$LIBDIR" +LIBEXECDIR="$LIBEXECDIR" +DATADIR="$DATADIR" +SYSCONFDIR="$SYSCONFDIR" +SHAREDSTATEDIR="$SHAREDSTATEDIR" +LOCALSTATEDIR="$LOCALSTATEDIR" +INCLUDEDIR="$INCLUDEDIR" +INFODIR="$INFODIR" +MANDIR="$MANDIR" __EOF__ sort -u -o "$TEMP_DIR/vars.mk" "$TEMP_DIR/vars.mk"
--- a/test/configure Fri Sep 22 23:22:28 2023 +0200 +++ b/test/configure Sun Sep 24 18:37:30 2023 +0200 @@ -30,8 +30,8 @@ # custom variables HOST=`uname -n` -PREFIX=`pwd`/work -INSTALL_DIR=$PREFIX +PREFIX="`pwd`/work" +INSTALL_DIR="$PREFIX" # features FEATURE_PG=auto @@ -170,22 +170,22 @@ # generate vars.mk cat > "$TEMP_DIR/vars.mk" << __EOF__ -PREFIX=$PREFIX -EPREFIX=$EPREFIX -BINDIR=$BINDIR -SBINDIR=$SBINDIR -LIBDIR=$LIBDIR -LIBEXECDIR=$LIBEXECDIR -DATADIR=$DATADIR -SYSCONFDIR=$SYSCONFDIR -SHAREDSTATEDIR=$SHAREDSTATEDIR -LOCALSTATEDIR=$LOCALSTATEDIR -INCLUDEDIR=$INCLUDEDIR -INFODIR=$INFODIR -MANDIR=$MANDIR -HOST=$HOST -PREFIX=$PREFIX -INSTALL_DIR=$INSTALL_DIR +PREFIX="$PREFIX" +EPREFIX="$EPREFIX" +BINDIR="$BINDIR" +SBINDIR="$SBINDIR" +LIBDIR="$LIBDIR" +LIBEXECDIR="$LIBEXECDIR" +DATADIR="$DATADIR" +SYSCONFDIR="$SYSCONFDIR" +SHAREDSTATEDIR="$SHAREDSTATEDIR" +LOCALSTATEDIR="$LOCALSTATEDIR" +INCLUDEDIR="$INCLUDEDIR" +INFODIR="$INFODIR" +MANDIR="$MANDIR" +HOST="$HOST" +PREFIX="$PREFIX" +INSTALL_DIR="$INSTALL_DIR" __EOF__ sort -u -o "$TEMP_DIR/vars.mk" "$TEMP_DIR/vars.mk"
--- a/test/make/configure.vm Fri Sep 22 23:22:28 2023 +0200 +++ b/test/make/configure.vm Sun Sep 24 18:37:30 2023 +0200 @@ -33,7 +33,7 @@ #if( $var.exec ) ${var.varName}=`${var.value}` #else -${var.varName}=${var.value} +${var.varName}="${var.value}" #end #end @@ -203,21 +203,21 @@ # generate vars.mk cat > "$TEMP_DIR/vars.mk" << __EOF__ -PREFIX=$PREFIX -EPREFIX=$EPREFIX -BINDIR=$BINDIR -SBINDIR=$SBINDIR -LIBDIR=$LIBDIR -LIBEXECDIR=$LIBEXECDIR -DATADIR=$DATADIR -SYSCONFDIR=$SYSCONFDIR -SHAREDSTATEDIR=$SHAREDSTATEDIR -LOCALSTATEDIR=$LOCALSTATEDIR -INCLUDEDIR=$INCLUDEDIR -INFODIR=$INFODIR -MANDIR=$MANDIR +PREFIX="$PREFIX" +EPREFIX="$EPREFIX" +BINDIR="$BINDIR" +SBINDIR="$SBINDIR" +LIBDIR="$LIBDIR" +LIBEXECDIR="$LIBEXECDIR" +DATADIR="$DATADIR" +SYSCONFDIR="$SYSCONFDIR" +SHAREDSTATEDIR="$SHAREDSTATEDIR" +LOCALSTATEDIR="$LOCALSTATEDIR" +INCLUDEDIR="$INCLUDEDIR" +INFODIR="$INFODIR" +MANDIR="$MANDIR" #foreach( $var in $vars ) -${var.varName}=$${var.varName} +${var.varName}="$${var.varName}" #end __EOF__ sort -u -o "$TEMP_DIR/vars.mk" "$TEMP_DIR/vars.mk"
