Merge pull request #452 from TotallyNotElite/testingbranch01

Streamline cathook update process

install-all

@@ -8,6 +8,8 @@ sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && sudo apt update && sud
 # Install libglez
 #
 
+mkdir cathook; cd cathook
+
 git clone --recursive https://github.com/nullworks/libglez.git;cd libglez;mkdir build;cd build;cmake ..;make;sudo make install;cd ..;cd ..
 
 #
@@ -26,4 +28,12 @@ git clone --recursive https://github.com/nullworks/simple-ipc.git;cd simple-ipc;
 # Build cathook
 #
 
-git clone --recursive https://github.com/nullworks/cathook.git;cd cathook;mkdir build;cd build;cmake ..;make -j$(grep -c '^processor' /proc/cpuinfo); sudo make data
+git clone --recursive https://github.com/nullworks/cathook.git;cd cathook;mkdir build;cd build;cmake ..;make -j$(grep -c '^processor' /proc/cpuinfo); sudo make data; cd ..; cd ..
+
+#
+# Do post installation stuff
+#
+
+cp -a -u ./cathook/tools/. ./
+rm ./README
+cd ..; rm install-all

tools/README

@@ -0,0 +1 @@
+These files are not intended to be run from this folder.

tools/attach

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+cd cathook
+sudo bash attach

tools/update

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+rm ./updater.sh
+wget https://raw.githubusercontent.com/nullworks/cathook/master/tools/updater.sh
+updater() {
+  source updater.sh
+}
+updater

tools/updater.sh

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+sudo echo Elevated
+
+cd libglez
+git fetch >update.log
+if ! git pull origin $(git rev-parse --abbrev-ref HEAD) >>update.log; then
+    $DIALOG --title "Error" --backtitle "Updating"  --msgbox "An error occured while updating cathook, check update.log for details. It might have been caused by changes in local files - in that case try resetting local repo." 8 78
+    exit
+fi
+if ! git submodule update --remote --recursive >>update.log; then
+    $DIALOG --title "Error" --backtitle "Updating"  --msgbox "An error occured while updating cathook, check update.log for details. It might have been caused by changes in local files - in that case try resetting local repo." 8 78
+    exit
+fi
+cd build; cmake ..; make;sudo make install;cd ..; cd ..
+
+cd libxoverlay
+git fetch >update.log
+if ! git pull origin $(git rev-parse --abbrev-ref HEAD) >>update.log; then
+    $DIALOG --title "Error" --backtitle "Updating"  --msgbox "An error occured while updating cathook, check update.log for details. It might have been caused by changes in local files - in that case try resetting local repo." 8 78
+    exit
+fi
+if ! git submodule update --remote --recursive >>update.log; then
+    $DIALOG --title "Error" --backtitle "Updating"  --msgbox "An error occured while updating cathook, check update.log for details. It might have been caused by changes in local files - in that case try resetting local repo." 8 78
+    exit
+fi
+cd build; cmake ..; make;sudo make install;cd ..; cd ..
+
+cd simple-ipc
+git fetch >update.log
+if ! git pull origin $(git rev-parse --abbrev-ref HEAD) >>update.log; then
+    $DIALOG --title "Error" --backtitle "Updating"  --msgbox "An error occured while updating cathook, check update.log for details. It might have been caused by changes in local files - in that case try resetting local repo." 8 78
+    exit
+fi
+if ! git submodule update --remote --recursive >>update.log; then
+    $DIALOG --title "Error" --backtitle "Updating"  --msgbox "An error occured while updating cathook, check update.log for details. It might have been caused by changes in local files - in that case try resetting local repo." 8 78
+    exit
+fi
+cd build; cmake ..; make;sudo make install;cd ..; cd ..
+
+cd cathook
+git fetch >update.log
+if ! git pull origin $(git rev-parse --abbrev-ref HEAD) >>update.log; then
+    $DIALOG --title "Error" --backtitle "Updating"  --msgbox "An error occured while updating cathook, check update.log for details. It might have been caused by changes in local files - in that case try resetting local repo." 8 78
+    exit
+fi
+if ! git submodule update --remote --recursive >>update.log; then
+    $DIALOG --title "Error" --backtitle "Updating"  --msgbox "An error occured while updating cathook, check update.log for details. It might have been caused by changes in local files - in that case try resetting local repo." 8 78
+    exit
+fi
+cd build; cmake ..; make; cd ..; cd ..
+
+
+cp -a -u ./cathook/tools/. ./; rm ./README; rm ./updater.sh