A New Chapter for MagicMirror: The Community Takes the Lead
Read the statement by Michael Teeuw here.
Read the statement by Michael Teeuw here.
I can't update my MM version
-
upgrade.log
Upgrade started - qua jan 15 22:57:36 -03 2020 system is Linux raspberrypi 4.19.75-v7+ #1270 SMP Tue Sep 24 18:45:11 BST 2019 armv7l GNU/Linux the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster doing test run = true saving custom.css not english or locale not set, set git alias remote name = origin upgrading from version 2.10.0 to 2.10.1 fetching latest revisions git fetch rc=0 current branch = master On branch master Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) deleted: config/config.js.sample modified: installers/pm2_MagicMirror.json modified: package-lock.json Untracked files: (use "git add <file>..." to include in what will be committed) mm.sh pm2-MagicMirror.json no changes added to commit (use "git add" and/or "git commit -a") there are 2 local files that are different than the master repo installers/pm2_MagicMirror.json package-lock.json save/restore files selection = y test merge result rc='' , if empty, no conflicts skipping merge, only test run processing dependency changes for active modules with package.json files processing for module MMM-DarkSkyForecast please wait ---------------------------------- skipped processing for MMM-DarkSkyForecast, doing test run processing complete for module MMM-DarkSkyForecast restoring custom.css removing git alias test run, restoring files stashed Upgrade ended - qua jan 15 22:57:48 -03 2020 Upgrade started - qua jan 15 23:05:57 -03 2020 system is Linux raspberrypi 4.19.75-v7+ #1270 SMP Tue Sep 24 18:45:11 BST 2019 armv7l GNU/Linux the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster doing test run = true saving custom.css not english or locale not set, set git alias remote name = origin upgrading from version 2.10.0 to 2.10.1 fetching latest revisions git fetch rc=0 current branch = master On branch master Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) deleted: config/config.js.sample modified: installers/pm2_MagicMirror.json modified: package-lock.json Untracked files: (use "git add <file>..." to include in what will be committed) mm.sh pm2-MagicMirror.json no changes added to commit (use "git add" and/or "git commit -a") there are 2 local files that are different than the master repo installers/pm2_MagicMirror.json package-lock.json save/restore files selection = restoring installers/pm2_MagicMirror.json from repo skipping restore for installers/pm2_MagicMirror.json, doing test run restoring package-lock.json from repo skipping restore for package-lock.json, doing test run test merge result rc='' , if empty, no conflicts skipping merge, only test run processing dependency changes for active modules with package.json files processing for module MMM-DarkSkyForecast please wait ---------------------------------- skipped processing for MMM-DarkSkyForecast, doing test run processing complete for module MMM-DarkSkyForecast restoring custom.css removing git alias Upgrade ended - qua jan 15 23:06:01 -03 2020 Upgrade started - qua jan 15 23:10:13 -03 2020 system is Linux raspberrypi 4.19.75-v7+ #1270 SMP Tue Sep 24 18:45:11 BST 2019 armv7l GNU/Linux the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster doing test run = true saving custom.css not english or locale not set, set git alias remote name = origin upgrading from version 2.10.0 to 2.10.1 fetching latest revisions git fetch rc=0 current branch = master On branch master Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) deleted: config/config.js.sample modified: installers/pm2_MagicMirror.json modified: package-lock.json Untracked files: (use "git add <file>..." to include in what will be committed) mm.sh pm2-MagicMirror.json no changes added to commit (use "git add" and/or "git commit -a") there are 2 local files that are different than the master repo installers/pm2_MagicMirror.json package-lock.json save/restore files selection = y test merge result rc='' , if empty, no conflicts skipping merge, only test run processing dependency changes for active modules with package.json files processing for module MMM-DarkSkyForecast please wait ---------------------------------- skipped processing for MMM-DarkSkyForecast, doing test run processing complete for module MMM-DarkSkyForecast restoring custom.css removing git alias test run, restoring files stashed Upgrade ended - qua jan 15 23:10:25 -03 2020 Upgrade started - qua jan 15 23:11:13 -03 2020 system is Linux raspberrypi 4.19.75-v7+ #1270 SMP Tue Sep 24 18:45:11 BST 2019 armv7l GNU/Linux the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster doing test run = true saving custom.css not english or locale not set, set git alias remote name = origin upgrading from version 2.10.0 to 2.10.1 fetching latest revisions git fetch rc=0 current branch = master On branch master Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) deleted: config/config.js.sample modified: installers/pm2_MagicMirror.json modified: package-lock.json Untracked files: (use "git add <file>..." to include in what will be committed) installers/save_custom.css mm.sh pm2-MagicMirror.json no changes added to commit (use "git add" and/or "git commit -a") there are 2 local files that are different than the master repo installers/pm2_MagicMirror.json package-lock.json save/restore files selection = y test merge result rc='' , if empty, no conflicts skipping merge, only test run processing dependency changes for active modules with package.json files processing for module MMM-DarkSkyForecast please wait ---------------------------------- skipped processing for MMM-DarkSkyForecast, doing test run processing complete for module MMM-DarkSkyForecast restoring custom.css removing git alias test run, restoring files stashed Upgrade ended - qua jan 15 23:11:20 -03 2020 Upgrade started - qua jan 15 23:11:50 -03 2020 system is Linux raspberrypi 4.19.75-v7+ #1270 SMP Tue Sep 24 18:45:11 BST 2019 armv7l GNU/Linux the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster doing test run = true saving custom.css not english or locale not set, set git alias remote name = origin upgrading from version 2.10.0 to 2.10.1 fetching latest revisions git fetch rc=0 current branch = master On branch master Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) deleted: config/config.js.sample modified: installers/pm2_MagicMirror.json modified: package-lock.json Untracked files: (use "git add <file>..." to include in what will be committed) mm.sh pm2-MagicMirror.json no changes added to commit (use "git add" and/or "git commit -a") there are 2 local files that are different than the master repo installers/pm2_MagicMirror.json package-lock.json save/restore files selection = y test merge result rc='' , if empty, no conflicts skipping merge, only test run processing dependency changes for active modules with package.json files processing for module MMM-DarkSkyForecast please wait ---------------------------------- skipped processing for MMM-DarkSkyForecast, doing test run processing complete for module MMM-DarkSkyForecast restoring custom.css removing git alias test run, restoring files stashed Upgrade ended - qua jan 15 23:12:07 -03 2020 Upgrade started - qua jan 15 23:13:09 -03 2020 system is Linux raspberrypi 4.19.75-v7+ #1270 SMP Tue Sep 24 18:45:11 BST 2019 armv7l GNU/Linux the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster doing test run = true saving custom.css not english or locale not set, set git alias remote name = origin upgrading from version 2.10.0 to 2.10.1 fetching latest revisions git fetch rc=0 current branch = master On branch master Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) deleted: config/config.js.sample modified: installers/pm2_MagicMirror.json modified: package-lock.json Untracked files: (use "git add <file>..." to include in what will be committed) custom.css mm.sh pm2-MagicMirror.json no changes added to commit (use "git add" and/or "git commit -a") there are 2 local files that are different than the master repo installers/pm2_MagicMirror.json package-lock.json save/restore files selection = y test merge result rc='' , if empty, no conflicts skipping merge, only test run processing dependency changes for active modules with package.json files processing for module MMM-DarkSkyForecast please wait ---------------------------------- skipped processing for MMM-DarkSkyForecast, doing test run processing complete for module MMM-DarkSkyForecast restoring custom.css removing git alias test run, restoring files stashed Upgrade ended - qua jan 15 23:13:17 -03 2020 Upgrade started - qui jan 16 00:05:31 -03 2020 system is Linux raspberrypi 4.19.75-v7+ #1270 SMP Tue Sep 24 18:45:11 BST 2019 armv7l GNU/Linux the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster doing test run = true saving custom.css not english or locale not set, set git alias remote name = origin upgrading from version 2.10.0 to 2.10.1 fetching latest revisions git fetch rc=0 current branch = master On branch master Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) deleted: config/config.js.sample modified: installers/pm2_MagicMirror.json modified: package-lock.json Untracked files: (use "git add <file>..." to include in what will be committed) mm.sh pm2-MagicMirror.json no changes added to commit (use "git add" and/or "git commit -a") there are 2 local files that are different than the master repo installers/pm2_MagicMirror.json package-lock.json save/restore files selection = y test merge result rc='' , if empty, no conflicts skipping merge, only test run processing dependency changes for active modules with package.json files processing for module MMM-Screencast please wait ---------------------------------- skipped processing for MMM-Screencast, doing test run processing complete for module MMM-Screencast processing for module MMM-DarkSkyForecast please wait ---------------------------------- skipped processing for MMM-DarkSkyForecast, doing test run processing complete for module MMM-DarkSkyForecast restoring custom.css removing git alias test run, restoring files stashed Upgrade ended - qui jan 16 00:05:43 -03 2020 Upgrade started - qui jan 16 01:08:13 -03 2020 system is Linux raspberrypi 4.19.75-v7+ #1270 SMP Tue Sep 24 18:45:11 BST 2019 armv7l GNU/Linux the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster doing test run = true remote name = origin upgrading from version 2.10.0 to 2.10.1 fetching latest revisions git fetch rc=0 current branch = master On branch master Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) deleted: config/config.js.sample modified: installers/pm2_MagicMirror.json modified: package-lock.json Untracked files: (use "git add <file>..." to include in what will be committed) mm.sh pm2-MagicMirror.json no changes added to commit (use "git add" and/or "git commit -a") there are 2 local files that are different than the master repo installers/pm2_MagicMirror.json package-lock.json save/restore files selection = y test merge result rc='' , if empty, no conflicts skipping merge, only test run processing dependency changes for active modules with package.json files processing for module MMM-DarkSkyForecast please wait ---------------------------------- skipped processing for MMM-DarkSkyForecast, doing test run processing complete for module MMM-DarkSkyForecast processing for module MMM-NowPlayingOnSpotify please wait ---------------------------------- skipped processing for MMM-NowPlayingOnSpotify, doing test run processing complete for module MMM-NowPlayingOnSpotify removing git alias test run, restoring files stashed Upgrade ended - qui jan 16 01:08:19 -03 2020 Upgrade started - qui jan 16 01:09:30 -03 2020 system is Linux raspberrypi 4.19.75-v7+ #1270 SMP Tue Sep 24 18:45:11 BST 2019 armv7l GNU/Linux the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster doing test run = true remote name = origin upgrading from version 2.10.0 to 2.10.1 fetching latest revisions git fetch rc=0 current branch = master On branch master Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) deleted: config/config.js.sample modified: installers/pm2_MagicMirror.json modified: package-lock.json Untracked files: (use "git add <file>..." to include in what will be committed) mm.sh pm2-MagicMirror.json no changes added to commit (use "git add" and/or "git commit -a") there are 2 local files that are different than the master repo installers/pm2_MagicMirror.json package-lock.json save/restore files selection = Y test merge result rc='' , if empty, no conflicts skipping merge, only test run processing dependency changes for active modules with package.json files processing for module MMM-DarkSkyForecast please wait ---------------------------------- skipped processing for MMM-DarkSkyForecast, doing test run processing complete for module MMM-DarkSkyForecast processing for module MMM-NowPlayingOnSpotify please wait ---------------------------------- skipped processing for MMM-NowPlayingOnSpotify, doing test run processing complete for module MMM-NowPlayingOnSpotify removing git alias test run, restoring files stashed Upgrade ended - qui jan 16 01:09:37 -03 2020 -
@iorifly ok, those are test runs. U need to add ‘apply’ at the end to DO the update.
Or ‘force’ if you have already got part way thru
Neither parm with the quotes
-
Still in error
-
@iorifly thanks… can u run the update again like this
bash -c "$(curl -sL https://raw.githubusercontent.com/sdetweil/MagicMirror_scripts/master/upgrade-script.sh)" forceI will want to see the log file… thanks…
also, can u run this command from the MagicMirror folder
git config --global --get user.emailmy guess is that it should return nothing
-
nothing returned.
pi@raspberrypi:~/MagicMirror $ git config --global --get user.email pi@raspberrypi:~/MagicMirror $ -
@iorifly thanks… fixed already
