Read the statement by Michael Teeuw here.
Cannot find module "moment"
-
@sdetweil said in Cannot find module "moment":
@uok825 yes, and with apply as parm
pi@raspberrypi:~/MagicMirror $ bash upgrade-script.sh apply
No LSB modules are available.
doing test run = false
update log will be in /home/pi/MagicMirror/installers/upgrade.logsaving custom.css
reverting to master branch from develop, saving changed files
saving file package.json as package.json.save before switch back to master branch
restoring file package.json before switch back to master branch
error: you need to resolve your current index first
unable to change back to master branch, stopping execution -
@uok825 said in Cannot find module "moment":
you need to resolve your current index first
looks like some attempt to merge failed
run this in the MagicMirror folder
git diff --name-only --diff-filter=U -
@sdetweil
pi@raspberrypi:~/MagicMirror $ git diff --name-only --diff-filter=U
package-lock.json
-
@uok825 that’s weird. that file is rebuilt every install
rm package-lock.json
then
git status
and git branchalso, connect via ssh, then everything will be in text so you can just copy/paste
-
@sdetweil rm: ‘package-lock.json’ cant deleted: No such a file or folder.
-
@uok825 ok, still weird
do git checkout master
-
-
@uok825 ok try these two commands
<file> is package-lock.jsonthis restores the file status in the index
git reset – <file>
then check out a copy from the index
git checkout – <file>
notice that is two dashes
-
@sdetweil I’ll do ’ git reset - package-lock-json ’ right?
-
@uok825 and then git checkout …
and then git status
-
@sdetweil Sorry. I dont understand Sam. Can you help a little. What exactly will I write?
-
@uok825 there are two commands
git reset -- package-lock.jsonand
git checkout -- package-lock.jsonthen git status
-
@sdetweil Alright, Thanks!
-
@uok825 ok, now,
git checkout master
-
-
@uok825 ok, the upgrade script will handle that
run upgrade with apply
-
@sdetweil Nothing Happened.
My Log again:Upgrade started - Paz Tem 12 22:41:23 +03 2020 system is Linux raspberrypi 4.19.118+ #1311 Mon Apr 27 14:16:15 BST 2020 armv6l GNU/Linux the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster user requested to apply changes doing test run = false saving custom.css remote name = origin upgrading from version 2.11.0 to 2.12.0 fetching latest revisions git fetch rc=0 current branch = master On branch master Your branch is up to date with 'origin/master'. Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: installers/mm.sh modified: modules/default/newsfeed/newsfeed.js modified: package-lock.json modified: package.json Untracked files: (use "git add <file>..." to include in what will be committed) 0 core css/icons/ css/save_custom.css fonts/LemonMilk.otf installers/pm2_MagicMirror.json run-start.sh no changes added to commit (use "git add" and/or "git commit -a") there are 4 local files that are different than the master repo installers/mm.sh modules/default/newsfeed/newsfeed.js package-lock.json package.json save/restore files selection = n restoring installers/mm.sh from repo restoring modules/default/newsfeed/newsfeed.js from repo restoring package-lock.json from repo restoring package.json from repo test merge result rc='' , if empty, no conflicts executing merge, apply specified merge result rc= 0 Already up to date. processor architecture is armv6l updating MagicMirror runtime, please wait > magicmirror@2.12.0 install /home/pi/MagicMirror > echo "Installing vendor files ... " && cd vendor && npm install --loglevel=error Installing vendor files ... audited 150 packages in 44.188s found 8 vulnerabilities (7 low, 1 high) run `npm audit fix` to fix them, or `npm audit` for details > magicmirror@2.12.0 postinstall /home/pi/MagicMirror > npm run install-fonts && echo "MagicMirror installation finished successfully! " > magicmirror@2.12.0 install-fonts /home/pi/MagicMirror > echo "Installing fonts ... " && cd fonts && npm install --loglevel=error Installing fonts ... updated 1 package and audited 1 package in 19.099s found 0 vulnerabilities MagicMirror installation finished successfully! audited 1050 packages in 275.039s 74 packages are looking for funding run `npm fund` for details found 62 vulnerabilities (61 low, 1 moderate) run `npm audit fix` to fix them, or `npm audit` for details npm install completed - Paz Tem 12 22:46:48 +03 2020 on base package.json update for armv6l completed ok downloading dumpactivemodules script processing dependency changes for active modules with package.json files processing for module MMM-MyPrayerTimes please wait ---------------------------------- npm notice created a lockfile as package-lock.json. You should commit this file. added 2 packages from 6 contributors and audited 2 packages in 12.29s found 0 vulnerabilities processing complete for module MMM-MyPrayerTimes processing for module MMM-PIR please wait ---------------------------------- > epoll@2.0.10 install /home/pi/MagicMirror/modules/MMM-PIR/node_modules/epoll > node-gyp rebuild make: Entering directory '/home/pi/MagicMirror/modules/MMM-PIR/node_modules/epoll/build' CXX(target) Release/obj.target/epoll/src/epoll.o SOLINK_MODULE(target) Release/obj.target/epoll.node COPY Release/epoll.node make: Leaving directory '/home/pi/MagicMirror/modules/MMM-PIR/node_modules/epoll/build' npm notice created a lockfile as package-lock.json. You should commit this file. added 6 packages from 9 contributors and audited 6 packages in 57.611s found 0 vulnerabilities processing complete for module MMM-PIR restoring custom.css removing git alias Upgrade ended - Paz Tem 12 22:48:25 +03 2020 Upgrade started - Sal Tem 14 17:31:45 +03 2020 system is Linux raspberrypi 4.19.118+ #1311 Mon Apr 27 14:16:15 BST 2020 armv6l GNU/Linux the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster user requested to apply changes doing test run = false saving custom.css remote name = origin local version 2.12.0 already same as master 2.12.0 restoring custom.css removing git alias Upgrade ended - Sal Tem 14 17:31:48 +03 2020 Upgrade started - Cum Eki 30 11:24:00 +03 2020 system is Linux raspberrypi 4.19.118+ #1311 Mon Apr 27 14:16:15 BST 2020 armv6l GNU/Linux the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster user requested to apply changes doing test run = false saving custom.css restoring file package.json before switch back to master branch package-lock.json: needs merge remote name = origin local version 2.13.0 already same as master 2.13.0 restoring custom.css removing git alias Upgrade ended - Cum Eki 30 11:24:05 +03 2020 Upgrade started - Paz Tem 18 13:21:20 +03 2021 system is Linux raspberrypi 4.19.118+ #1311 Mon Apr 27 14:16:15 BST 2020 armv6l GNU/Linux the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster doing test run = true, NO updates will be applied! saving custom.css reverting to master branch from develop, saving changed files would restore file package.json before switch back to master branch package-lock.json: needs merge Upgrade ended - Paz Tem 18 13:21:23 +03 2021 Upgrade started - Paz Tem 18 13:44:35 +03 2021 system is Linux raspberrypi 4.19.118+ #1311 Mon Apr 27 14:16:15 BST 2020 armv6l GNU/Linux the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster doing test run = true, NO updates will be applied! saving custom.css reverting to master branch from develop, saving changed files would restore file package.json before switch back to master branch package-lock.json: needs merge Upgrade ended - Paz Tem 18 13:44:37 +03 2021 Upgrade started - Paz Tem 18 13:44:39 +03 2021 system is Linux raspberrypi 4.19.118+ #1311 Mon Apr 27 14:16:15 BST 2020 armv6l GNU/Linux the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster user requested to apply changes doing test run = false saving custom.css reverting to master branch from develop, saving changed files saving file package.json as package.json.save before switch back to master branch restoring file package.json before switch back to master branch package-lock.json: needs merge Upgrade ended - Paz Tem 18 13:44:41 +03 2021Raspberry’s date is wrong
-
@uok825 ok, I don’t get it.
git status
again -
-
Hello! It looks like you're interested in this conversation, but you don't have an account yet.
Getting fed up of having to scroll through the same posts each visit? When you register for an account, you'll always come back to exactly where you were before, and choose to be notified of new replies (either via email, or push notification). You'll also be able to save bookmarks and upvote posts to show your appreciation to other community members.
With your input, this post could be even better 💗
Register Login