Skip to content

Commit c41adb5

Browse files
committed
Issue #10: well 3.4.0 is the end of the line (rather beginning og the line). In versions older than 3.4.0, topaz does not support the -- option which allows adding custom options on the commanline, a feature that superdoit depends upon
1 parent dc43abd commit c41adb5

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

bin/superdoit_stone

+12-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ fi
2323
scriptFile=$1
2424
shift
2525

26-
defaultTopazArgs="-L" # if no topaz args specified, then default to -L
2726
for arg in "$@"; do
2827
if [[ "$endOfScriptArgs"x = "x" ]] && [[ "$arg" = "--" ]] ; then
2928
endOfScriptArgs="true"
@@ -35,7 +34,7 @@ for arg in "$@"; do
3534
stoneName=$arg
3635
else
3736
topazArgs="$topazArgs $arg"
38-
defaultTopazArgs=""
37+
defaultTopazArgs=" " # explicit empty defaultTopazArgs
3938
fi
4039
fi
4140
fi
@@ -95,8 +94,18 @@ useBootstrapSuperDoit_file="true"
9594
if [ "$useBootstrapSuperDoit_file" = "true" ]; then
9695
# Rowan extent NOT NEEDED in stone ... bootstrap superDoit using .gs files
9796
vers=`awk 'NR==2{print $1; exit}' $GEMSTONE/version.txt`
97+
if [ "$defaultTopazArgs"x = "x" ] ; then
98+
case $vers in
99+
3.4*|3.5.*|3.6.*|3.7.*)
100+
defaultTopazArgs="-L";; # if no topaz args specified, then default to -L
101+
*)
102+
defaultTopazArgs="-l";; # -L not supported, so use -l
103+
esac
104+
fi
98105
case $vers in
99-
3.1.0.6|3.4.*) export bootstrapSuperDoit_file="$gemstoneDir/bootstrap/bootstrapSuperDoit_34x.gs" ;;
106+
# in gemstone versions prior to 3.4.0 topaz does not support the -- command
107+
# line option, so it is not possible to add custom command line options
108+
3.4.*) export bootstrapSuperDoit_file="$gemstoneDir/bootstrap/bootstrapSuperDoit_34x.gs" ;;
100109
3.5.*) export bootstrapSuperDoit_file="$gemstoneDir/bootstrap/bootstrapSuperDoit_35x.gs" ;;
101110
3.6.0) export bootstrapSuperDoit_file="$gemstoneDir/bootstrap/bootstrapSuperDoit_360.gs" ;;
102111
3.6.1) export bootstrapSuperDoit_file="$gemstoneDir/bootstrap/bootstrapSuperDoit_361x.gs" ;;

0 commit comments

Comments
 (0)