build system fixes

build.sh

@@ -1,9 +1,17 @@
 #!/bin/bash
 set -e
-wasm-pack build --target web --release --no-typescript
-wasm-opt -Os -o pkg/integral_site_bg_2.wasm pkg/integral_site_bg.wasm
-mv pkg/integral_site_bg_2.wasm pkg/integral_site_bg.wasm
-llvm-strip --strip-all pkg/integral_site_bg.wasm
+
+if test "$1" == "" || test "$1" == "release"; then
+    wasm-pack build --target web --release --no-typescript
+    wasm-opt -Os -o pkg/integral_site_bg_2.wasm pkg/integral_site_bg.wasm
+    mv pkg/integral_site_bg_2.wasm pkg/integral_site_bg.wasm
+    llvm-strip --strip-all pkg/integral_site_bg.wasm
+elif test "$1" == "debug"; then
+    wasm-pack build --target web --debug --no-typescript
+else
+    echo "ERROR: build.sh, argument invalid"
+    exit 1
+fi
 
 rm -fr tmp | true #delete tmp folder if exists
 mkdir tmp tmp/pkg

start-server.sh

@@ -1,17 +1,6 @@
 #!/bin/bash
 set -e
 
-if test "$1" == "" || test "$1" == "release"; then
-    bash build.sh
-elif test "$1" == "debug"; then
-    wasm-pack build --target web --debug --no-typescript
-
-    rm -fr tmp | true #delete tmp folder if exists
-    mkdir tmp tmp/pkg
-    cp -r pkg/integral_site_bg.wasm pkg/integral_site.js tmp/pkg/
-    cp www/index.html www/style.css tmp/
-
-    sed -i 's/\.\.\/pkg/\.\/pkg/g' tmp/index.html
-fi
+bash build.sh "$1"
 
 basic-http-server tmp/