@sdetweil so just to be clear its,
git checkout package-lock.json
git reset
git pull
npm install
within the calendar ext3 module folder?
@sdetweil so just to be clear its,
git checkout package-lock.json
git reset
git pull
npm install
within the calendar ext3 module folder?
@sdetweil used both of those then tried to up date the rest of the module and still get the same issue when running git pull in the module folder, this is what it says;
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace “git config” with “git config --global” to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
Updating 3ca76d9…dfe2425
error: Your local changes to the following files would be overwritten by merge:
package-lock.json
Please commit your changes or stash them before you merge.
Aborting
I’ve had the notification that this module needs an update, the guidance says go into the module folder and run “git pull” when I run this I get an error of,
your local changes to the following files would be overwritten by the merge: package-lock.json
please commit them or stash them before you merge.
Aborting.
How do I mitigate for this issue without causing fundamental problems with my MM setup, It’s working perfectly at the moment and I don’t want to a knock down the first domino in chain of potential issues.
Cheers.
> magicmirror@2.29.0 start
> DISPLAY="${DISPLAY:=:0}" ./node_modules/.bin/electron js/electron.js
[2024-10-08 19:41:58.640] [LOG] Starting MagicMirror: v2.29.0
[2024-10-08 19:41:58.693] [LOG] Loading config ...
[2024-10-08 19:41:58.698] [LOG] config template file not exists, no envsubst
[2024-10-08 19:41:59.497] [INFO] Checking config file /home/MagicMirror/MagicMirror/config/config.js ...
[2024-10-08 19:41:59.584] [ERROR] Your configuration file contains syntax errors :(
Line 94 column 5: Parsing error: Unexpected token weatherEndpoint
That parsing error is for the new line added in for weatherEndpoint
@sdetweil I have it exactly as you have it above.
can you share a config for this module as an example?
I can’t even check if this is working with pm2 not launching the MM
@sdetweil so my config was identical to above, so I’ve added you new line “weatherEndpoint…”
I’m using Putty to access the MM and used pm2 to stop the MM.
which it did.
However now, pm2 via Putty is no longer having any effect on the MM.
MM isn’t launching.
run pm2 logs mm and get a parsing error over adding the new line
unexpected token weatherEndpoint your configuration file contains syntax errors.
all I’ve added is weatherEndpoint: “/onecall”, to a final line under the apiKey line above.
any thoughts?
edit to add, pm2 status and logs show that pm2 exists still it’s just not launching. can pm2 be “updated” or should I follow the process for a first install?
for completeness I don’t want it to launch MM on boot I just want to be able to start and stop the MM using pm2.
@sdetweil So I’ve upgraded to my account on OpenWeather (and added payment details.
Generated a new APIkey and added this to the config of the weather module but it is still stuck on loading.
So I’ve run your update, and the weather still doesn’t load.
Seems odd that the API issue would only arise following the update.
Is this likely?
@butchkemper Is this the default weather module or an additional one?
@karsten13 how do I update this specifically.
Everything was working fine prior to the latest MM update.