From f1f7b1a665a9636704946d898e50b7f6a2a33941 Mon Sep 17 00:00:00 2001 From: Don Bright Date: Thu, 3 Apr 2014 17:08:28 -0500 Subject: [PATCH 1/3] fix bash bug when using awk to convert lf to crlf --- scripts/release-common.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/release-common.sh b/scripts/release-common.sh index 7d322003..87de5634 100755 --- a/scripts/release-common.sh +++ b/scripts/release-common.sh @@ -34,7 +34,8 @@ lf2crlf() unix2dos $fname return fi - if [ "`command -v awk`"]; then + if [ "`command -v awk`" ]; then + echo using awk to convert end of line markers in $fname awk 'sub("$", "\r")' $fname > $fname".temp" mv $fname".temp" $fname fi From 57668f0e03aee6e37f046553a5ad133cbe1107e8 Mon Sep 17 00:00:00 2001 From: Don Bright Date: Thu, 3 Apr 2014 22:38:08 -0500 Subject: [PATCH 2/3] fix: \" was being replaced with /" ,messing up tests pretty print --- tests/mingw_convert_ctest.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/mingw_convert_ctest.py b/tests/mingw_convert_ctest.py index 2f6b0419..229a37eb 100644 --- a/tests/mingw_convert_ctest.py +++ b/tests/mingw_convert_ctest.py @@ -153,11 +153,11 @@ def processfile(infilename): line=line.replace(linexamples,winexamples) line=line.replace(linbase,winbase) - line=line.replace('\\','/') - # Fixme - how do we escape spaces in cmake? - #line=line.replace('Program Files','Progra~1') - + line=line.replace('\\"','__ESCAPE_WIN_QUOTE_MECHANISM__') + line=line.replace('\\','/') + line=line.replace('__ESCAPE_WIN_QUOTE_MECHANISM__','\\"') + debug('output:',line) fout.write(line) From b25f744b255d1249a571907107fa8b89852521d2 Mon Sep 17 00:00:00 2001 From: Don Bright Date: Fri, 4 Apr 2014 20:10:08 -0500 Subject: [PATCH 3/3] bugfix - cd out of website path before rebuilding on loop --- scripts/builder.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/builder.sh b/scripts/builder.sh index f2f55828..073f57bc 100755 --- a/scripts/builder.sh +++ b/scripts/builder.sh @@ -50,7 +50,6 @@ init_variables() BRANCH_TO_BUILD=unstable #BRANCH_TO_BUILD=master STARTPATH=$PWD - export STARTPATH # kilobit (not kilobyte!) per second for scp upload RATELIMIT=420 DOBUILD=1 @@ -84,6 +83,7 @@ init_variables() if [ "`echo $* | grep dry`" ]; then DRYRUN=1 fi + export STARTPATH export BRANCH_TO_BUILD export DOBUILD export DOUPLOAD @@ -97,6 +97,7 @@ init_variables() check_starting_path() { + cd $STARTPATH if [ -e openscad.pro ]; then echo 'please start from a clean directory outside of openscad' exit @@ -385,6 +386,7 @@ update_win_www_download_links() else echo dry run, not updating www links fi + cd $STARTPATH } # FIXME: We might be running this locally and not need an ssh agent.