curious.bio/planktoscope
curious.bio/planktoscope
8
0
Fork 0
Code Issues 10 Pull requests Packages Projects 7 Releases Wiki Activity

update the updater

Browse source
This commit is contained in:
Romain Bazile 2020-11-30 02:46:40 +01:00
parent 24c6c1fbc6
commit ff59c0cac6
1 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
scripts/bash/update.sh
View file

@ -1,14 +1,34 @@
#!/bin/bash #!/bin/bash
log="logger -t update.sh -s " log="logger -t update.sh -s "
${log} "Updating the main repository" function update(){
cd /home/pi/PlanktonScope sudo killall -15 raspimjpeg
sudo killall -15 python3
git stash
git merge
git checkout stash@'{0}' -- config.json hardware.json
# TODO we need to change this to drop stash@{1} if changes made to the flow are to be restored by the user
git stash drop
sudo systemctl restart nodered.service
}
sudo killall -15 raspimjpeg ${log} "Updating the main repository"
sudo killall -15 python3 cd /home/pi/PlanktonScope || { echo "/home/pi/PlanktonScope does not exist"; exit 1; }
git stash
git pull # TODO We need to add here a way to load the latest version of this script and execute it again
git checkout stash@{0} -- config.json hardware.json remote=$(git ls-remote -h origin master | awk '{print $1}')
git stash drop local=$(git rev-parse HEAD)
sudo systemctl restart nodered.service ${log} "Local : $local - Remote: $remote"
${log} "Done!" if [[ "$local" == "$remote" ]]; then
${log} "nothing to do!"
else
git fetch
UPDATE=$(git diff --numstat origin/master scripts/bash/update.sh | awk '/update.sh/ {print $NF}')
if [[ -n "${UPDATE}" ]]; then
# Update the file and restart the script
git checkout origin/master scripts/bash/update.sh
exec scripts/bash/update.sh
fi
update
${log} "Done!"
fi