From f55182d79c87e6da2231625b9cab3d3baacb6c3e Mon Sep 17 00:00:00 2001
From: Romain Bazile <gromain.baz@gmail.com>
Date: Tue, 8 Dec 2020 17:31:23 +0100
Subject: [PATCH] raspimjpeg: remove unnecessary scripts

---
 scripts/raspimjpeg/macros/error_hard.sh |  6 +++-
 scripts/raspimjpeg/macros/startstopX.sh | 40 -------------------------
 scripts/raspimjpeg/macros/test.sh       |  2 --
 3 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 100644 scripts/raspimjpeg/macros/startstopX.sh
 delete mode 100644 scripts/raspimjpeg/macros/test.sh

diff --git a/scripts/raspimjpeg/macros/error_hard.sh b/scripts/raspimjpeg/macros/error_hard.sh
index 83ffe8d..1be0bf4 100644
--- a/scripts/raspimjpeg/macros/error_hard.sh
+++ b/scripts/raspimjpeg/macros/error_hard.sh
@@ -1,2 +1,6 @@
 #!/bin/bash
-sudo shutdown -r now
+sudo killall -15 python3
+sudo killall -15 raspimjpeg
+sleep 5
+sudo killall -9 python3
+sudo killall -9 raspimjpeg
\ No newline at end of file
diff --git a/scripts/raspimjpeg/macros/startstopX.sh b/scripts/raspimjpeg/macros/startstopX.sh
deleted file mode 100644
index 25454b7..0000000
--- a/scripts/raspimjpeg/macros/startstopX.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-# example start up script which converts any existing .h264 files into MP4
-
-MACRODIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-BASEDIR="$( cd "$( dirname "${MACRODIR}" )" >/dev/null 2>&1 && pwd )"
-mypidfile=${MACRODIR}/startstop.sh.pid
-mylogfile=${BASEDIR}/scheduleLog.txt
-
-#Check if script already running
-NOW=`date +"-%Y/%m/%d %H:%M:%S-"`
-if [ -f $mypidfile ]; then
-        echo "${NOW} Script already running..." >> ${mylogfile}
-        exit
-fi
-#Remove PID file when exiting
-trap "rm -f -- '$mypidfile'" EXIT
-
-echo $$ > "$mypidfile"
-
-#Do conversion
-if [ "$1" == "start" ]; then
-  cd ${MACRODIR}
-  cd ../media
-  shopt -s nullglob
-  for f in *.h264
-    do
-      f1=${f%.*}.mp4
-        NOW=`date +"-%Y/%m/%d %H:%M:%S-"`
-        echo "${NOW} Converting $f" >> ${mylogfile}
-        #set -e;MP4Box -fps 25 -add $f $f1 > /dev/null 2>&1;rm $f;
-        if MP4Box -fps 25 -add $f $f1; then
-                NOW=`date +"-%Y/%m/%d %H:%M:%S-"`
-                echo "${NOW} Conversion complete, removing $f" >> ${mylogfile}
-                rm $f
-        else
-                NOW=`date +"-%Y/%m/%d %H:%M:%S-"`
-                echo "${NOW} Error with $f" >> ${mylogfile}
-        fi
-    done
-fi
diff --git a/scripts/raspimjpeg/macros/test.sh b/scripts/raspimjpeg/macros/test.sh
deleted file mode 100644
index 5c3012d..0000000
--- a/scripts/raspimjpeg/macros/test.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-date >/var/www/testmacro.txt