Skip to content

Commit

Permalink
try to prevent unwanted module deletion on npm calls through palette …
Browse files Browse the repository at this point in the history
…manager (#56)
  • Loading branch information
hobbyquaker committed Aug 19, 2018
1 parent e4c3e22 commit f66b83e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
4 changes: 4 additions & 0 deletions addon_files/update_script
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ if [ -f $RED_DIR/var/package.json.old ]; then
rm $RED_DIR/var/package.json.old $RED_DIR/var/package.json.new
fi

if [ -f $RED_DIR/var/package-lock.json ]; then
rm $RED_DIR/var/package-lock.json
fi

#
# Create Links
#
Expand Down
7 changes: 3 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,10 @@ npm install --silent --no-package-lock --production --no-optional

echo "adapt Node-RED..."
rm -r $ADDON_TMP/redmatic/lib/node_modules/node-red/nodes/core/hardware
#mv $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/nodes/registry/installer.js $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/nodes/registry/installer.js.orig
#sed "s/var npmCommand =.*/var npmCommand = '\/usr\/local\/addons\/node-red\/bin\/npm';/" $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/nodes/registry/installer.js.orig > $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/nodes/registry/installer.js
#mv $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/log.js $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/log.js.orig
#sed "s/util\.log/console.log/g" $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/log.js.orig > $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/log.js

INSTALLER=$ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/nodes/registry/installer.js
sed "s/var args = \['install','--save'/var args = ['install','--save','--no-package-lock','--global-style'/" $INSTALLER > $INSTALLER.tmp && mv $INSTALLER.tmp $INSTALLER
sed "s/var args = \['remove','--save'/var args = ['remove','--save','--no-package-lock'/" $INSTALLER > $INSTALLER.tmp && mv $INSTALLER.tmp $INSTALLER

cd $BUILD_DIR

Expand Down

0 comments on commit f66b83e

Please sign in to comment.