From 856d8dd0f5314913ffa54f97c24611980bb6ac71 Mon Sep 17 00:00:00 2001 From: TotallyNotElite <38938720+TotallyNotElite@users.noreply.github.com> Date: Sat, 19 May 2018 18:06:47 +0200 Subject: [PATCH 1/7] Changes to the install script 1. Inform user that it only works for Ubuntu. 2. Use wget to download the file from the main cathook repo. We don't need to maintain a secondary repo if we can avoid it. 3. The file is however not executable. We need to use bash to execute it. 4. The command is all-in-one --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8e869478..7c88af58 100755 --- a/README.md +++ b/README.md @@ -35,14 +35,13 @@ and a lot of useful features, including # INSTALLATION -## Automatic: +## Automatic: (Ubuntu based only) If you already downloaded the repo, simply run * `install-all` Else simply run: -* `git clone --recursive https://github.com/nullworks/One-in-all-cathook-install/blob/master/install-all.git` -and run it's install-all script. +* `wget https://raw.githubusercontent.com/nullworks/cathook/master/install-all && bash install-all` ## Manual: You need CMake to build cathook, CMake should take care of dependencies From a008321aa68e1b04295e0da21fb94fb7493b434e Mon Sep 17 00:00:00 2001 From: TotallyNotElite <38938720+TotallyNotElite@users.noreply.github.com> Date: Sat, 19 May 2018 18:15:11 +0200 Subject: [PATCH 2/7] Improvements to install script Whats the point of running apt-update 3 times if you could just run it once? --- install-all | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-all b/install-all index 5b9fb851..fedd7839 100755 --- a/install-all +++ b/install-all @@ -2,7 +2,7 @@ # Install base Dependencies # -sudo apt update && sudo apt install build-essential gcc-multilib g++-multilib software-properties-common -y && sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && sudo apt update && sudo apt install gcc-snapshot g++-6-multilib gcc-6 g++-6 -y && sudo apt update && sudo apt install git libssl-dev:i386 libboost-all-dev libc6-dev:i386 gdb libsdl2-dev libglew-dev:i386 libglew-dev libfreetype6-dev libfreetype6-dev:i386 cmake libpng-dev libssl-dev cmake gcc-multilib g++-multilib -y +sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && sudo apt update && sudo apt install build-essential gcc-multilib g++-multilib software-properties-common gcc-snapshot g++-6-multilib gcc-6 g++-6 libssl-dev:i386 libboost-all-dev libc6-dev:i386 gdb libsdl2-dev libglew-dev:i386 libglew-dev libfreetype6-dev libfreetype6-dev:i386 cmake libpng-dev libssl-dev cmake gcc-multilib g++-multilib -y # # Install libglez From 736f72b0934ac3bd00fc256065661dbd27e3c438 Mon Sep 17 00:00:00 2001 From: TotallyNotElite <38938720+TotallyNotElite@users.noreply.github.com> Date: Sat, 19 May 2018 18:18:06 +0200 Subject: [PATCH 3/7] Don't forget to clone cathook as well --- install-all | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install-all b/install-all index fedd7839..562d1e48 100755 --- a/install-all +++ b/install-all @@ -25,5 +25,4 @@ git clone --recursive https://github.com/nullworks/simple-ipc.git;cd simple-ipc; # # Build cathook # - -mkdir build;cd build;cmake ..;make -j$(grep -c '^processor' /proc/cpuinfo);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);make data From 4e3b4ec23c1b9c8570a7ddbf6dcb7ff775d14836 Mon Sep 17 00:00:00 2001 From: TotallyNotElite <38938720+TotallyNotElite@users.noreply.github.com> Date: Sat, 19 May 2018 18:43:55 +0200 Subject: [PATCH 4/7] Remove "already cloned repo" method It's no longer compatible with the updated script. --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 7c88af58..fe3cd416 100755 --- a/README.md +++ b/README.md @@ -36,10 +36,7 @@ and a lot of useful features, including # INSTALLATION ## Automatic: (Ubuntu based only) -If you already downloaded the repo, simply run -* `install-all` - -Else simply run: +Run in terminal: * `wget https://raw.githubusercontent.com/nullworks/cathook/master/install-all && bash install-all` From 572dd0fcf132961b5ae238bf08cfe18390d2d3a2 Mon Sep 17 00:00:00 2001 From: TotallyNotElite <38938720+TotallyNotElite@users.noreply.github.com> Date: Sun, 20 May 2018 12:05:08 +0200 Subject: [PATCH 5/7] Add git to dependencies and run make data with su --- install-all | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-all b/install-all index 562d1e48..53adb580 100755 --- a/install-all +++ b/install-all @@ -2,7 +2,7 @@ # Install base Dependencies # -sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && sudo apt update && sudo apt install build-essential gcc-multilib g++-multilib software-properties-common gcc-snapshot g++-6-multilib gcc-6 g++-6 libssl-dev:i386 libboost-all-dev libc6-dev:i386 gdb libsdl2-dev libglew-dev:i386 libglew-dev libfreetype6-dev libfreetype6-dev:i386 cmake libpng-dev libssl-dev cmake gcc-multilib g++-multilib -y +sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && sudo apt update && sudo apt install build-essential git gcc-multilib g++-multilib software-properties-common gcc-snapshot g++-6-multilib gcc-6 g++-6 libssl-dev:i386 libboost-all-dev libc6-dev:i386 gdb libsdl2-dev libglew-dev:i386 libglew-dev libfreetype6-dev libfreetype6-dev:i386 cmake libpng-dev libssl-dev cmake gcc-multilib g++-multilib -y # # Install libglez @@ -25,4 +25,4 @@ 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);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 From ab16b1f24860edd0e1f432f26072e47826199eb9 Mon Sep 17 00:00:00 2001 From: TotallyNotElite <38938720+TotallyNotElite@users.noreply.github.com> Date: Sun, 20 May 2018 12:08:54 +0200 Subject: [PATCH 6/7] Run install-data as root instead --- install-all | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/install-all b/install-all index 53adb580..6e5fd763 100755 --- a/install-all +++ b/install-all @@ -25,4 +25,11 @@ 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); cd .. + +# +# Install +# + +sudo bash install-data From f86c9785ca835083d0d5c98689a01e24a3925690 Mon Sep 17 00:00:00 2001 From: TotallyNotElite <38938720+TotallyNotElite@users.noreply.github.com> Date: Sun, 20 May 2018 12:11:26 +0200 Subject: [PATCH 7/7] Run make data with su instead Wow I'm actually an idiot. --- install-all | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/install-all b/install-all index 6e5fd763..b40437b8 100755 --- a/install-all +++ b/install-all @@ -26,10 +26,4 @@ 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); cd .. - -# -# Install -# - -sudo bash install-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