diff options
| author | Marius Kintel <marius@kintel.net> | 2013-05-19 15:29:22 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-05-19 15:29:22 (GMT) |
| commit | f8622005f89c52061f498ab6ec28adfbd332c344 (patch) | |
| tree | 337755460ef91fa4cabc2b133639b92792c20ce4 /scripts | |
| parent | 5a647f963a2dbe2344fe64d98ea5bd42f8f3e806 (diff) | |
| parent | e25fff81af72a31f6118f4840b65193aa0ec1d0a (diff) | |
Merge branch 'master' into issue341
Conflicts:
scripts/builder.sh
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/builder.sh | 6 | ||||
| -rwxr-xr-x | scripts/publish-macosx.sh | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/scripts/builder.sh b/scripts/builder.sh index 9850bcc..6a143e3 100755 --- a/scripts/builder.sh +++ b/scripts/builder.sh @@ -101,8 +101,9 @@ upload_win_generic() upload_win32() { - SUMMARY1="Windows x86-32 Snapshot Zipfile" - SUMMARY2="Windows x86-32 Snapshot Installer" + SUMMARY1="Windows x86-32 Snapshot Installer" + SUMMARY2="Windows x86-32 Snapshot Zipfile" + DATECODE=`date +"%Y.%m.%d"` BASEDIR=./mingw32/ WIN32_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-32-Installer.exe WIN32_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-32.zip @@ -172,6 +173,7 @@ update_win_www_download_links() cd inc echo `pwd` BASEURL='https://openscad.googlecode.com/files/' + DATECODE=`date +"%Y.%m.%d"` rm win_snapshot_links.js echo "snapinfo['WIN64_SNAPSHOT1_URL'] = '$BASEURL$WIN64_PACKAGEFILE1'" >> win_snapshot_links.js diff --git a/scripts/publish-macosx.sh b/scripts/publish-macosx.sh index 9d0423d..a3b0090 100755 --- a/scripts/publish-macosx.sh +++ b/scripts/publish-macosx.sh @@ -21,7 +21,7 @@ update_www_download_links() filesize=$(human_filesize $filesize) webdir=../openscad.github.com incfile=inc/mac_snapshot_links.js - BASEURL='https://openscad.google.com/files/' + BASEURL='https://openscad.googlecode.com/files/' DATECODE=`date +"%Y.%m.%d"` if [ -f $webdir/$incfile ]; then |