X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fproduce_feisty_meow.sh;h=efdb78ac585eb2bd927159a30570860330e2408e;hb=2d2b1d669337dd8843f785c2f3d9c6048f730252;hp=dbecd2637009bd8a0182397b5e9f7402f7e1f013;hpb=9c71eb9a29db75fcc1e6376e32a96ea8cf07006a;p=feisty_meow.git diff --git a/scripts/generator/produce_feisty_meow.sh b/scripts/generator/produce_feisty_meow.sh index dbecd263..efdb78ac 100644 --- a/scripts/generator/produce_feisty_meow.sh +++ b/scripts/generator/produce_feisty_meow.sh @@ -33,6 +33,7 @@ export INCLUDED_FROM_BOOTSTRAP=true export BUILD_SCRIPTS_PATH="$( \cd "$(\dirname "$0")" && /bin/pwd )" #echo build scripts dir initial value: $BUILD_SCRIPTS_PATH BUILD_SCRIPTS_PATH="$(echo $BUILD_SCRIPTS_PATH | tr '\\\\' '/' )" +#hmmm: why four backslashes above? trying two in our unix virtual root code below. #echo build scripts dir after chewing: $BUILD_SCRIPTS_PATH # load in feisty meow basic scripts, if not already loaded. @@ -61,8 +62,26 @@ function prepare_binaries_dir() mkdir -p "$CLAM_BINARIES" fi if [ ! -f "$CLAM_BINARIES/paths.ini" ]; then - echo "copied paths.ini to binary dir." cp "$PRODUCTION_STORE/paths.ini" "$CLAM_BINARIES" + echo "copied paths.ini to binary dir." + fi + # set the cygwin root path if we're on cygwin. + whichable cygpath + if [ $? -eq 0 ]; then + # found cygpath, so run it now to get the dossy path of the root ('/' folder). + found_root=$(cygpath -w -m /) + if [ $? -ne 0 ]; then + echo "Failure to find virtual Unix root folder with cygpath." + exit 1322 + fi +echo "found root as '$found_root'" + # translate any backslashes to forward thinking slashes. + found_root=$(echo $found_root | tr '\\' '/') +echo "processed root is now: '$found_root'" + # edit the entry in place to correct the default path. + sed -i -e "s/VirtualUnixRoot=.*/VirtualUnixRoot=$found_root/" "$CLAM_BINARIES/paths.ini" +echo "paths file now has:" +cat "$CLAM_BINARIES/paths.ini" fi }