X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fproduce_feisty_meow.sh;h=7466031b3cf0664d7776626805f417051e4ab89e;hb=0f0df8de389914b66cf70759575eef0b8261c797;hp=efdb78ac585eb2bd927159a30570860330e2408e;hpb=2d2b1d669337dd8843f785c2f3d9c6048f730252;p=feisty_meow.git diff --git a/scripts/generator/produce_feisty_meow.sh b/scripts/generator/produce_feisty_meow.sh index efdb78ac..7466031b 100644 --- a/scripts/generator/produce_feisty_meow.sh +++ b/scripts/generator/produce_feisty_meow.sh @@ -69,7 +69,7 @@ function prepare_binaries_dir() 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 /) + found_root="$(cygpath -w -m /)" if [ $? -ne 0 ]; then echo "Failure to find virtual Unix root folder with cygpath." exit 1322 @@ -79,7 +79,7 @@ echo "found root as '$found_root'" 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" + sed -i -e "s%VirtualUnixRoot=.*%VirtualUnixRoot=$found_root%" "$CLAM_BINARIES/paths.ini" echo "paths file now has:" cat "$CLAM_BINARIES/paths.ini" fi @@ -198,14 +198,6 @@ if [ -z "$SAVE_BINARIES" ]; then done fi -# make the clam shell scripts executable. -#hmmm: why? this should no longer be needed. -# and even if it's needed, the perms should be stored in the repo. -#chmod 755 "$CLAM_SCRIPTS"/*.sh -#chmod 755 "$CLAM_SCRIPTS"/cpp/*.sh -#chmod 755 "$CLAM_SCRIPTS"/csharp/*.sh -#chmod 755 "$FEISTY_MEOW_SCRIPTS/generator/wrapdoze.sh" - # rebuild the dependency tool. needed by everything, pretty much, but # since it's from the xfree project, it doesn't need any of our libraries. if [ ! -f "$CLAM_BINARIES/makedep$EXE_ENDING" ]; then