From dff8532739029289bfa7799d212406baa89b5de3 Mon Sep 17 00:00:00 2001 From: Moe Date: Wed, 5 May 2021 13:43:03 -0700 Subject: [PATCH] disable `npm audit fix --force` --- Dockerfile.arm32v7 | 3 +-- INSTALL/CentOS - Quick Install.sh | 2 +- INSTALL/centos.sh | 2 +- INSTALL/freebsd.sh | 2 +- INSTALL/freenas.csh | 2 +- INSTALL/macos-part2.sh | 2 +- INSTALL/macos.sh | 2 +- INSTALL/openbsd.sh | 19 +++++++++---------- INSTALL/opensuse.sh | 2 +- INSTALL/shinobi | 2 +- INSTALL/ubuntu-easyinstall.sh | 2 +- INSTALL/ubuntu-touchless-iso.sh | 2 +- INSTALL/ubuntu-touchless.sh | 2 +- INSTALL/ubuntu.sh | 2 +- UPDATE.sh | 2 +- plugins/openalpr/INSTALL.sh | 2 +- plugins/tensorflow/INSTALL-1-7-3.sh | 2 +- plugins/tensorflow/INSTALL-2-3-0.sh | 2 +- plugins/tensorflow/INSTALL-jetson.sh | 2 +- plugins/tensorflow/INSTALL.sh | 2 +- plugins/yolo/INSTALL.sh | 2 +- 21 files changed, 29 insertions(+), 31 deletions(-) diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index 76f60143..1b7881f1 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 @@ -87,8 +87,7 @@ COPY ./plugins /home/Shinobi/plugins RUN chmod -R 777 /home/Shinobi/plugins RUN npm i npm@latest -g && \ npm install pm2 -g && \ - npm install --unsafe-perm && \ - npm audit fix --force + npm install --unsafe-perm COPY ./Docker/pm2.yml ./ # Copy default configuration files diff --git a/INSTALL/CentOS - Quick Install.sh b/INSTALL/CentOS - Quick Install.sh index 56d13fb0..b45014a5 100644 --- a/INSTALL/CentOS - Quick Install.sh +++ b/INSTALL/CentOS - Quick Install.sh @@ -250,7 +250,7 @@ echo "Installing NPM libraries..." sudo npm i npm -g sudo npm install --unsafe-perm sudo npm install ffbinaries mp4frag@latest cws@latest -sudo npm audit fix --force +# sudo npm audit fix --force echo "=========================================================" echo "Installing PM2..." diff --git a/INSTALL/centos.sh b/INSTALL/centos.sh index cf14bf8f..4c8d7a77 100644 --- a/INSTALL/centos.sh +++ b/INSTALL/centos.sh @@ -95,7 +95,7 @@ echo "Shinobi - Install NPM Libraries" sudo npm i npm -g sudo npm install --unsafe-perm sudo npm install mp4frag@latest cws@latest -sudo npm audit fix --force +# sudo npm audit fix --force echo "=============" echo "Shinobi - Install PM2" sudo npm install pm2@latest -g diff --git a/INSTALL/freebsd.sh b/INSTALL/freebsd.sh index 17784879..6dc30438 100644 --- a/INSTALL/freebsd.sh +++ b/INSTALL/freebsd.sh @@ -43,7 +43,7 @@ echo "=============" echo "Shinobi - Install NPM Libraries" npm i npm -g npm install --unsafe-perm -sudo npm audit fix --force +# sudo npm audit fix --force echo "=============" echo "Shinobi - Install PM2" npm install pm2@3.0.0 -g diff --git a/INSTALL/freenas.csh b/INSTALL/freenas.csh index 5d66a34c..69b168b0 100644 --- a/INSTALL/freenas.csh +++ b/INSTALL/freenas.csh @@ -17,7 +17,7 @@ echo "Securing mysql..." npm i npm -g #There are some errors in here that I don't want you to see. Redirecting to dev null :D npm install --unsafe-perm > & /dev/null -npm audit fix --force > & /dev/null +# npm audit fix --force > & /dev/null npm install pm2@3.0.0 -g cp conf.sample.json conf.json cp super.sample.json super.json diff --git a/INSTALL/macos-part2.sh b/INSTALL/macos-part2.sh index d159b1ca..e7a62602 100644 --- a/INSTALL/macos-part2.sh +++ b/INSTALL/macos-part2.sh @@ -15,7 +15,7 @@ echo "=============" echo "Shinobi - Install NPM Libraries" sudo npm i npm -g sudo npm install --unsafe-perm -sudo npm audit fix --unsafe-perm +# sudo npm audit fix --unsafe-perm echo "=============" echo "Shinobi - Install PM2" sudo npm install pm2@3.0.0 -g diff --git a/INSTALL/macos.sh b/INSTALL/macos.sh index ee62ebb4..a6163381 100644 --- a/INSTALL/macos.sh +++ b/INSTALL/macos.sh @@ -42,7 +42,7 @@ fi echo "Shinobi - Install NPM Libraries" sudo npm i npm -g sudo npm install --unsafe-perm -sudo npm audit fix --unsafe-perm +# sudo npm audit fix --unsafe-perm echo "=============" echo "Shinobi - Install PM2" sudo npm install pm2@3.0.0 -g diff --git a/INSTALL/openbsd.sh b/INSTALL/openbsd.sh index ba137fa8..e63365ab 100644 --- a/INSTALL/openbsd.sh +++ b/INSTALL/openbsd.sh @@ -2,16 +2,16 @@ # Copyright (c) 2020 Jordan Geoghegan -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above # copyright notice and this permission notice appear in all copies. -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH # REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY # AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, -# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # Functions @@ -97,7 +97,7 @@ schema_install () { pro_download () { echo "\n### Grabbing Shinobi Pro from master branch\n" - doas -u _shinobi ftp -o /home/_shinobi/shinobi.tar.gz https://gitlab.com/Shinobi-Systems/Shinobi/-/archive/master/Shinobi-master.tar.gz + doas -u _shinobi ftp -o /home/_shinobi/shinobi.tar.gz https://gitlab.com/Shinobi-Systems/Shinobi/-/archive/master/Shinobi-master.tar.gz } gpl_download () { @@ -187,7 +187,6 @@ done echo "\n### Installing required Node modules\n" cd /home/_shinobi/shinobi || npm_abort doas -u _shinobi npm install --unsafe-perm -doas npm audit fix --force doas -u _shinobi cp /home/_shinobi/shinobi/conf.sample.json /home/_shinobi/shinobi/conf.json doas -u _shinobi cp /home/_shinobi/shinobi/super.sample.json /home/_shinobi/shinobi/super.json doas npm install -g pm2 @@ -198,7 +197,7 @@ echo "\nCongratulations, Shinobi is now installed!\n" echo 'To start Shinobi at boot, add a crontab entry for the user "_shinobi" with something like this:\n' echo '$ doas crontab -u _shinobi -e - + @reboot /bin/sh -c "cd /home/_shinobi/Shinobi && pm2 start camera.js cron.js" echo "\nYou can access Shinobi at http://$(ifconfig | grep 'inet ' | awk '!/127.0.0.1/ {print $2}'):8080" @@ -209,4 +208,4 @@ echo "\nThe default login credentials are: username: admin@shinobi.video password: admin" -echo "\nThe official Shinobi Documentation can be found at: https://shinobi.video/docs/" \ No newline at end of file +echo "\nThe official Shinobi Documentation can be found at: https://shinobi.video/docs/" diff --git a/INSTALL/opensuse.sh b/INSTALL/opensuse.sh index 19dae61d..e39e480a 100644 --- a/INSTALL/opensuse.sh +++ b/INSTALL/opensuse.sh @@ -86,7 +86,7 @@ echo "=============" echo "Shinobi - Install NPM Libraries" npm i npm -g npm install --unsafe-perm -sudo npm audit fix --force +# sudo npm audit fix --force echo "=============" echo "Shinobi - Install PM2" sudo npm install pm2@3.0.0 -g diff --git a/INSTALL/shinobi b/INSTALL/shinobi index 6416dc15..e8fca4c6 100644 --- a/INSTALL/shinobi +++ b/INSTALL/shinobi @@ -146,7 +146,7 @@ if [[ $@ == *'update'* ]]; then pm2 stop "$installationDirectory"/camera.js pm2 stop "$installationDirectory"/cron.js npm install --unsafe-perm - npm audit fix --force + # npm audit fix --force git reset --hard git pull pm2 start "$installationDirectory"/camera.js diff --git a/INSTALL/ubuntu-easyinstall.sh b/INSTALL/ubuntu-easyinstall.sh index fe740287..8ac4fa44 100644 --- a/INSTALL/ubuntu-easyinstall.sh +++ b/INSTALL/ubuntu-easyinstall.sh @@ -149,7 +149,7 @@ echo "=============" echo "Shinobi - Install NPM Libraries" sudo npm i npm -g sudo npm install --unsafe-perm -sudo npm audit fix --unsafe-perm +# sudo npm audit fix --unsafe-perm echo "=============" #Install PM2 diff --git a/INSTALL/ubuntu-touchless-iso.sh b/INSTALL/ubuntu-touchless-iso.sh index d6dd909d..5309b99f 100644 --- a/INSTALL/ubuntu-touchless-iso.sh +++ b/INSTALL/ubuntu-touchless-iso.sh @@ -97,7 +97,7 @@ echo "=============" echo "Shinobi - Install NPM Libraries" sudo npm i npm -g sudo npm install --unsafe-perm -sudo npm audit fix --force +# sudo npm audit fix --force echo "=============" echo "Shinobi - Install PM2" sudo npm install pm2@3.0.0 -g diff --git a/INSTALL/ubuntu-touchless.sh b/INSTALL/ubuntu-touchless.sh index 166ad3f9..33217272 100644 --- a/INSTALL/ubuntu-touchless.sh +++ b/INSTALL/ubuntu-touchless.sh @@ -102,7 +102,7 @@ echo "=============" echo "Shinobi - Install NPM Libraries" sudo npm i npm -g sudo npm install --unsafe-perm -sudo npm audit fix --force +# sudo npm audit fix --force echo "=============" echo "Shinobi - Install PM2" sudo npm install pm2@3.0.0 -g diff --git a/INSTALL/ubuntu.sh b/INSTALL/ubuntu.sh index a4cbd5d2..397035f4 100644 --- a/INSTALL/ubuntu.sh +++ b/INSTALL/ubuntu.sh @@ -109,7 +109,7 @@ echo "=============" echo "Shinobi - Install NPM Libraries" sudo npm i npm -g sudo npm install --unsafe-perm -sudo npm audit fix --force +# sudo npm audit fix --force echo "=============" echo "Shinobi - Install PM2" sudo npm install pm2@3.0.0 -g diff --git a/UPDATE.sh b/UPDATE.sh index 170c21a7..d8983f15 100644 --- a/UPDATE.sh +++ b/UPDATE.sh @@ -1,6 +1,6 @@ git reset --hard git pull npm install --unsafe-perm -npm audit fix --force +# npm audit fix --force # pm2 restart camera # pm2 restart cron diff --git a/plugins/openalpr/INSTALL.sh b/plugins/openalpr/INSTALL.sh index 720bd8e8..e7c08c1f 100644 --- a/plugins/openalpr/INSTALL.sh +++ b/plugins/openalpr/INSTALL.sh @@ -42,7 +42,7 @@ npm install nopt npmlog rimraf semver -g npm install npm uninstall nopt npmlog rimraf semver -g echo "Finding and Fixing Module Vulnerabilities.." -npm audit fix --force +# npm audit fix --force echo "Shinobi - Do you want to start the plugin?" echo "(Y)es or (n)o?" echo "Press [ENTER] for default (Yes)" diff --git a/plugins/tensorflow/INSTALL-1-7-3.sh b/plugins/tensorflow/INSTALL-1-7-3.sh index f0edf0c3..0b713af6 100644 --- a/plugins/tensorflow/INSTALL-1-7-3.sh +++ b/plugins/tensorflow/INSTALL-1-7-3.sh @@ -41,7 +41,7 @@ else fi npm install --unsafe-perm npm install @tensorflow-models/coco-ssd@2.0.3 @tensorflow/tfjs-converter@1.7.3 @tensorflow/tfjs-core@1.7.3 @tensorflow/tfjs-layers@1.7.3 @tensorflow/tfjs-node@1.7.3 --unsafe-perm -npm audit fix --force +# npm audit fix --force if [ ! -e "./conf.json" ]; then echo "Creating conf.json" sudo cp conf.sample.json conf.json diff --git a/plugins/tensorflow/INSTALL-2-3-0.sh b/plugins/tensorflow/INSTALL-2-3-0.sh index bc24dc12..4b3f7ac3 100644 --- a/plugins/tensorflow/INSTALL-2-3-0.sh +++ b/plugins/tensorflow/INSTALL-2-3-0.sh @@ -148,7 +148,7 @@ else installNonGpuRoute fi fi -# npm audit fix --force +# # npm audit fix --force if [ ! -e "$DIR/conf.json" ]; then dontCreateKeyFlag=false echo "Creating conf.json" diff --git a/plugins/tensorflow/INSTALL-jetson.sh b/plugins/tensorflow/INSTALL-jetson.sh index aaaad5bd..54e1e849 100644 --- a/plugins/tensorflow/INSTALL-jetson.sh +++ b/plugins/tensorflow/INSTALL-jetson.sh @@ -148,7 +148,7 @@ else installNonGpuRoute fi fi -# npm audit fix --force +# # npm audit fix --force if [ ! -e "$DIR/conf.json" ]; then dontCreateKeyFlag=false echo "Creating conf.json" diff --git a/plugins/tensorflow/INSTALL.sh b/plugins/tensorflow/INSTALL.sh index 18f07a53..cbd1b112 100644 --- a/plugins/tensorflow/INSTALL.sh +++ b/plugins/tensorflow/INSTALL.sh @@ -132,7 +132,7 @@ fi # npm install @tensorflow/tfjs-node-gpu@2.7.0 -npm audit fix --force +# npm audit fix --force if [ "$installGpuFlag" = true ]; then runRebuildGpu else diff --git a/plugins/yolo/INSTALL.sh b/plugins/yolo/INSTALL.sh index 6772b4cf..ca613ea0 100644 --- a/plugins/yolo/INSTALL.sh +++ b/plugins/yolo/INSTALL.sh @@ -86,7 +86,7 @@ echo "Getting C++ module : node-yolo-shinobi" echo "https://www.npmjs.com/package/node-yolo-shinobi is a fork of https://github.com/rcaceiro/node-yolo" npm install --unsafe-perm npm install node-yolo-shinobi --unsafe-perm -npm audit fix --force +# npm audit fix --force echo "-----------------------------------" echo "Start the plugin with pm2 like so :" echo "pm2 start shinobi-yolo.js"