diff --git a/.gitignore b/.gitignore index 13cc4e950..eef4079b1 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,7 @@ js/copayBundle.js config.js webapp/webapp +webapp/download chrome/copay-chrome-extension chrome/copay-chrome-extension.zip firefox/firefox-addon diff --git a/webapp/build.sh b/webapp/build.sh index 351751a15..1a2023aca 100644 --- a/webapp/build.sh +++ b/webapp/build.sh @@ -18,11 +18,11 @@ checkOK() { # Configs BUILDDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -APPDIR="$BUILDDIR/webapp" +APPDIR="$BUILDDIR/copay-webapp" ZIPFILE="copay.zip" -VERSION=`git describe --tags --abbrev=0 | cut -c 2-` +VERSION=`cut -d '"' -f2 $BUILDDIR/../version.js` -DOWNLOADDIR="$APPDIR/download" +DOWNLOADDIR="$BUILDDIR/download" CHROMEDOWNLOADDIR="$DOWNLOADDIR/chrome" FIREFOXDOWNLOADDIR="$DOWNLOADDIR/firefox" ZIPFILE="copay.zip" @@ -61,5 +61,6 @@ mkdir -p $FIREFOXDOWNLOADDIR mv $ZIPFILE $DOWNLOADDIR cp "$BUILDDIR/index-download-chrome.html" $CHROMEDOWNLOADDIR/index.html cp "$BUILDDIR/index-download-firefox.html" $FIREFOXDOWNLOADDIR/index.html +cp "$BUILDDIR/index-download.html" $DOWNLOADDIR/index.html echo "${OpenColor}${Yellow}\nAwesome! We have a brand new Webapp, enjoy it!${CloseColor}" diff --git a/webapp/index-download-chrome.html b/webapp/index-download-chrome.html index a5626065b..5c6c1c118 100644 --- a/webapp/index-download-chrome.html +++ b/webapp/index-download-chrome.html @@ -9,14 +9,14 @@