@explorable-viz/fluid 0.7.103 → 0.7.105

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorable-viz/fluid",
-  "version": "0.7.103",
+  "version": "0.7.105",
   "description": "Fluid is an experimental programming language which integrates a bidirectional dynamic analysis to connect outputs to data sources in a fine-grained way. Fluid is implemented in PureScript and runs in the browser.",
   "main": "index.js",
   "repository": {

package/script/bundle-website.sh

@@ -16,16 +16,12 @@ fi
 
 if [[ "${BASH_SOURCE[0]}" == *"/node_modules/"* ]]; then
    PREFIX="node_modules/@explorable-viz/fluid/"
+else
+   PREFIX=""
 fi
 
-PREFIX_=${PREFIX:+$PREFIX/}
 echo "Cleaning dist/$WEBSITE"
-. "${PREFIX_}script/util/clean.sh" $WEBSITE
-
-for DIR in css font shared; do
-  echo "Processing $DIR files:"
-  cp -rL "website/$WEBSITE/$DIR" "dist/$WEBSITE/$DIR"
-done
+. "${PREFIX}script/util/clean.sh" $WEBSITE
 
 shopt -s nullglob
 
@@ -33,7 +29,7 @@ echo "Processing other static files:"
 set +xu  # try to remove +u
 TO_COPY=()
 shopt -s dotglob extglob
-for CHILD in ${PREFIX_}website/$WEBSITE/!(.|..); do
+for CHILD in ${PREFIX}website/$WEBSITE/!(.|..); do
    BASENAME="$(basename "$CHILD")"
    if [[ "$BASENAME" =~ ^[a-z.] ]]; then
       TO_COPY+=("$CHILD")
@@ -43,14 +39,15 @@ shopt -u extglob dotglob
 set -xu
 
 for CHILD in "${TO_COPY[@]}"; do
-   cp -rL "$CHILD" dist/$WEBSITE
+   BASENAME="$(basename "$CHILD")"
+   cp -rL "$CHILD" "dist/$WEBSITE/$BASENAME"
 done
 
 echo "Processing Fluid source files:"
-cp -r "${PREFIX_}dist/fluid/fluid" dist/$WEBSITE
+cp -r "${PREFIX}dist/fluid/fluid" dist/$WEBSITE
 [ -d "website/$WEBSITE/fluid" ] && cp -r "website/$WEBSITE/fluid" dist/$WEBSITE
 
 echo "Processing shared JavaScript files:"
-cp -r "${PREFIX_}dist/fluid/shared" dist/$WEBSITE
+cp -r "${PREFIX}dist/fluid/shared" dist/$WEBSITE
 
 echo "Bundled website $WEBSITE"