From 19fd928f8da2679af1d002071897725551349200 Mon Sep 17 00:00:00 2001
From: "ron.record" <ron.record@hornblower.com>
Date: Wed, 19 Jun 2024 07:29:40 -0700
Subject: [PATCH] Remove MagicMirror npm package lockfile before installing

---
 install_magicmirror.sh     | 1 +
 pkg/debian/preinst         | 1 +
 pkg/rpm/MirrorCommand.spec | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/install_magicmirror.sh b/install_magicmirror.sh
index 8e5bb44..9ffcd9c 100755
--- a/install_magicmirror.sh
+++ b/install_magicmirror.sh
@@ -66,6 +66,7 @@ curl -sL https://deb.nodesource.com/setup_10.x 2> /dev/null | sudo -E bash - > /
 sudo apt install -y nodejs > /dev/null 2>&1
 git clone https://github.com/MagicMirrorOrg/MagicMirror > /dev/null 2>&1
 cd MagicMirror
+rm -f package-lock.json
 npm run install-mm > /dev/null 2>&1
 printf "\t\tDone\n"
 
diff --git a/pkg/debian/preinst b/pkg/debian/preinst
index 4fb690d..85978ab 100755
--- a/pkg/debian/preinst
+++ b/pkg/debian/preinst
@@ -96,6 +96,7 @@ case "$1" in
                       if [ "${inst_npm}" ]
                       then
                           echo "Installing MagicMirror in /usr/local/MagicMirror"
+                          rm -f package-lock.json
                           sudo -u ${USER} npm run install-mm > /dev/null 2>&1
                       else
                           echo "Unable to locate npm in the execution path."
diff --git a/pkg/rpm/MirrorCommand.spec b/pkg/rpm/MirrorCommand.spec
index 6440492..8028106 100755
--- a/pkg/rpm/MirrorCommand.spec
+++ b/pkg/rpm/MirrorCommand.spec
@@ -85,6 +85,7 @@ GROUP=
     if [ "${inst_npm}" ]
     then
         echo "Installing MagicMirror in /usr/local/MagicMirror"
+        rm -f package-lock.json
         sudo -u ${USER} npm run install-mm > /dev/null 2>&1
     else
         echo "Unable to locate npm in the execution path."
@@ -93,6 +94,7 @@ GROUP=
         echo ""
         echo "cd /usr/local/MagicMirror"
         echo "sudo -u ${USER} npm run install-mm"
+        echo "sudo -u ${USER} npm install electron@29.1.6"
         echo ""
     fi
 }