remove redmatic-canbus (for now), ignore rpi specific nodes in i686 b…

…uild, catch error on pkg bundling
rdmtc · Jul 9, 2020 · f4a200a · f4a200a
1 parent 05785b1
commit f4a200a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/addon_files/redmatic/lib/package.json b/addon_files/redmatic/lib/package.json
@@ -17,7 +17,6 @@
     "redmatic-homekit": "3.2.0",
     "@node-red-contrib-themes/midnight-red": "1.4.0",
     "node-red-contrib-doorbird": "0.2.6",
-    "redmatic-canbus": "1.0.1",
     "node-red-contrib-comfoair": "0.0.5",
     "node-red-contrib-nukible": "1.0.3",
     "node-red-node-discovery": "0.0.22",

diff --git a/build_addon.sh b/build_addon.sh
@@ -39,9 +39,16 @@ cp $BUILD_DIR/assets/favicon/apple-icon-180x180.png $ADDON_TMP/redmatic/www/
 cp $BUILD_DIR/assets/favicon/favicon-96x96.png $ADDON_TMP/redmatic/www/
 
 echo "installing node modules..."
+if [ "$ARCH" == "i686" ]; then
+    echo "removing raspberrypi specific modules..."
+    mv $ADDON_TMP/redmatic/lib/package.json $ADDON_TMP/redmatic/lib/package.json.tmp
+    cat $ADDON_TMP/redmatic/lib/package.json.tmp | jq 'del(.dependencies."node-red-contrib-johnny-five",.dependencies."node-red-contrib-rcswitch2")' >  $ADDON_TMP/redmatic/lib/package.json
+    rm $ADDON_TMP/redmatic/lib/package.json.tmp
+fi
+
 cd $ADDON_TMP/redmatic/lib
-npm install --silent --no-package-lock --production --no-optional --global-style
-npm install --slient --no-package-lock --production --global-style ain2
+npm install --no-package-lock --production --no-optional --global-style
+npm install --no-package-lock --production --global-style ain2
 rm $ADDON_TMP/redmatic/lib/package.json
 
 echo "installing additional Node-RED nodes..."

diff --git a/build_packages.js b/build_packages.js
@@ -85,10 +85,14 @@ fs.writeFileSync(__dirname + '/addon_tmp/redmatic/lib/pkg-repo.json', JSON.strin
 
 remove.forEach(path => {
     console.log('remove', path);
-    if (fs.statSync(path).isDirectory()) {
-        cp.execSync('rm -r ' + path);
+    if (fs.existsSync(path)) {
+        if (fs.statSync(path).isDirectory()) {
+            cp.execSync('rm -r ' + path);
+        } else {
+            fs.unlinkSync(path);
+        }
     } else {
-        fs.unlinkSync(path);
+        console.log(path, 'does not exist');
     }
 });
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redmatic",
-  "version": "5.6.0-beta.0",
+  "version": "5.6.0-beta.1",
   "description": "Node-RED packaged as Homematic CCU addon",
   "repository": "github:rdmtc/redmatic",
   "private": true,
@@ -53,4 +53,4 @@
     "request": "^2.88.0",
     "sync-request": "^6.1.0"
   }
-}
+}
diff --git a/prebuild_i686.sh b/prebuild_i686.sh
@@ -4,7 +4,7 @@ DEST="prebuilt/i686"
 REMOTE="root@debian-32"
 REMOTE_PATH="/root/redmatic-prebuild"
 
-cat addon_files/redmatic/lib/package.json | jq 'del(.dependencies.npm,.dependencies."node-red",.dependencies."@node-red-contrib-themes/midnight-red",.dependencies.node-red-contrib-johnny-five,.dependencies.node-red-contrib-rcswitch2)' > $DEST/package.json
+cat addon_files/redmatic/lib/package.json | jq 'del(.dependencies.npm,.dependencies."node-red",.dependencies."@node-red-contrib-themes/midnight-red",.dependencies."node-red-contrib-johnny-five",.dependencies."node-red-contrib-rcswitch2")' > $DEST/package.json
 
 scp $DEST/package.json $REMOTE:$REMOTE_PATH