From 87f7062355127b14d621501c23276dfee77ed3ae Mon Sep 17 00:00:00 2001 From: SylveonBottle Date: Tue, 4 Jul 2017 10:43:09 -0500 Subject: [PATCH 1/7] Added gcc6 installation script for Arch. With this added, users won't need to "find gcc6 on your own". --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ff925d9e..39f506ba 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,9 @@ Ubuntu (and probably Debian) users can run this script: sudo apt update && sudo apt install build-essential software-properties-common -y && sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && sudo apt update && sudo apt install gcc-snapshot -y && sudo apt update && sudo apt install git libc6-dev gcc-6 g++-6 libc6-dev:i386 g++-6-multilib gdb libsdl2-dev libglew-dev libfreetype6-dev libfreetype6-dev:i386 -y && git clone --recursive https://github.com/nullifiedcat/cathook && cd cathook && make -j4 ``` -Arch install script (requires you find gcc6 on your own): +Arch install script: ```bash -sudo pacman -Syu && sudo pacman -S base-devel gcc-multilib gdb gdb-common glew1.10 lib32-glew1.10 && git clone --recursive https://github.com/nullifiedcat/cathook && cd cathook && make -j4 && bash update-menu +sudo pacman -U https://archive.archlinux.org/packages/g/gcc-multilib/gcc-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/g/gcc-libs-multilib/gcc-libs-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/l/lib32-gcc-libs/lib32-gcc-libs-6.3.1-2-x86_64.pkg.tar.xz && sudo pacman -Syu && sudo pacman -S base-devel gcc-multilib gdb gdb-common glew1.10 lib32-glew1.10 && git clone --recursive https://github.com/nullifiedcat/cathook && cd cathook && make -j4 && bash update-menu ``` **Errors while installing?** From 3972d6a5c1886e64528d2cb439577831ecea0663 Mon Sep 17 00:00:00 2001 From: SylveonBottle Date: Tue, 4 Jul 2017 10:45:19 -0500 Subject: [PATCH 2/7] Uh, might need to update and *then* downgrade to gcc6 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 39f506ba..b4aee8a1 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ sudo apt update && sudo apt install build-essential software-properties-common - Arch install script: ```bash -sudo pacman -U https://archive.archlinux.org/packages/g/gcc-multilib/gcc-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/g/gcc-libs-multilib/gcc-libs-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/l/lib32-gcc-libs/lib32-gcc-libs-6.3.1-2-x86_64.pkg.tar.xz && sudo pacman -Syu && sudo pacman -S base-devel gcc-multilib gdb gdb-common glew1.10 lib32-glew1.10 && git clone --recursive https://github.com/nullifiedcat/cathook && cd cathook && make -j4 && bash update-menu +sudo pacman -Syu && sudo pacman -U https://archive.archlinux.org/packages/g/gcc-multilib/gcc-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/g/gcc-libs-multilib/gcc-libs-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/l/lib32-gcc-libs/lib32-gcc-libs-6.3.1-2-x86_64.pkg.tar.xz && sudo pacman -S base-devel gcc-multilib gdb gdb-common glew1.10 lib32-glew1.10 && git clone --recursive https://github.com/nullifiedcat/cathook && cd cathook && make -j4 && bash update-menu ``` **Errors while installing?** From 4508e50e633838866cebb4278a98d1f0c0d8ee59 Mon Sep 17 00:00:00 2001 From: SylveonBottle Date: Tue, 4 Jul 2017 11:42:35 -0500 Subject: [PATCH 3/7] I'm not entire sure what you asked for. Is this what you wanted? --- README.md | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b4aee8a1..18c5daa6 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,25 @@ # INSTALLATION -Ubuntu (and probably Debian) users can run this script: - +Ubuntu install script (for dependencies required by cathook): ```bash -sudo apt update && sudo apt install build-essential software-properties-common -y && sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && sudo apt update && sudo apt install gcc-snapshot -y && sudo apt update && sudo apt install git libc6-dev gcc-6 g++-6 libc6-dev:i386 g++-6-multilib gdb libsdl2-dev libglew-dev libfreetype6-dev libfreetype6-dev:i386 -y && git clone --recursive https://github.com/nullifiedcat/cathook && cd cathook && make -j4 +sudo apt update && sudo apt install build-essential software-properties-common -y && sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && sudo apt update && sudo apt install gcc-snapshot -y && sudo apt update && sudo apt install git libc6-dev gcc-6 g++-6 libc6-dev:i386 g++-6-multilib gdb libsdl2-dev libglew-dev libfreetype6-dev libfreetype6-dev:i386 -y && ``` -Arch install script: +Ubuntu install script (for cathook): + ```bash -sudo pacman -Syu && sudo pacman -U https://archive.archlinux.org/packages/g/gcc-multilib/gcc-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/g/gcc-libs-multilib/gcc-libs-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/l/lib32-gcc-libs/lib32-gcc-libs-6.3.1-2-x86_64.pkg.tar.xz && sudo pacman -S base-devel gcc-multilib gdb gdb-common glew1.10 lib32-glew1.10 && git clone --recursive https://github.com/nullifiedcat/cathook && cd cathook && make -j4 && bash update-menu +git clone --recursive https://github.com/nullifiedcat/cathook && cd cathook && make -j4 +``` + +Arch install script (for dependencies required by cathook): +```bash +sudo pacman -Syu && sudo pacman -U https://archive.archlinux.org/packages/g/gcc-multilib/gcc-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/g/gcc-libs-multilib/gcc-libs-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/l/lib32-gcc-libs/lib32-gcc-libs-6.3.1-2-x86_64.pkg.tar.xz && sudo pacman -S base-devel gcc-multilib gdb gdb-common glew1.10 lib32-glew1.10 +``` + +Arch install script (for cathook): +```bash +git clone --recursive https://github.com/nullifiedcat/cathook && cd cathook && make -j4 && bash update-menu ``` **Errors while installing?** From 54e1114a0229d265126cca39758d9f7b8fe9b326 Mon Sep 17 00:00:00 2001 From: SylveonBottle Date: Tue, 4 Jul 2017 11:45:16 -0500 Subject: [PATCH 4/7] Uh, removed redundancies. This looks good. --- README.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 18c5daa6..fd36764a 100644 --- a/README.md +++ b/README.md @@ -6,23 +6,17 @@ # INSTALLATION -Ubuntu install script (for dependencies required by cathook): +Ubuntu dependancies installation: ```bash sudo apt update && sudo apt install build-essential software-properties-common -y && sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && sudo apt update && sudo apt install gcc-snapshot -y && sudo apt update && sudo apt install git libc6-dev gcc-6 g++-6 libc6-dev:i386 g++-6-multilib gdb libsdl2-dev libglew-dev libfreetype6-dev libfreetype6-dev:i386 -y && ``` -Ubuntu install script (for cathook): - -```bash -git clone --recursive https://github.com/nullifiedcat/cathook && cd cathook && make -j4 -``` - -Arch install script (for dependencies required by cathook): +Arch dependencies installation:: ```bash sudo pacman -Syu && sudo pacman -U https://archive.archlinux.org/packages/g/gcc-multilib/gcc-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/g/gcc-libs-multilib/gcc-libs-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/l/lib32-gcc-libs/lib32-gcc-libs-6.3.1-2-x86_64.pkg.tar.xz && sudo pacman -S base-devel gcc-multilib gdb gdb-common glew1.10 lib32-glew1.10 ``` -Arch install script (for cathook): +Cathook installation script: ```bash git clone --recursive https://github.com/nullifiedcat/cathook && cd cathook && make -j4 && bash update-menu ``` From 605fb95ad79868721b7ac07ff05a4c93807f8f51 Mon Sep 17 00:00:00 2001 From: SylveonBottle Date: Tue, 4 Jul 2017 11:48:31 -0500 Subject: [PATCH 5/7] Spellcheck for "dependencies." --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fd36764a..c6f683a0 100644 --- a/README.md +++ b/README.md @@ -6,16 +6,18 @@ # INSTALLATION -Ubuntu dependancies installation: +Ubuntu dependencies installation: ```bash sudo apt update && sudo apt install build-essential software-properties-common -y && sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && sudo apt update && sudo apt install gcc-snapshot -y && sudo apt update && sudo apt install git libc6-dev gcc-6 g++-6 libc6-dev:i386 g++-6-multilib gdb libsdl2-dev libglew-dev libfreetype6-dev libfreetype6-dev:i386 -y && ``` + Arch dependencies installation:: ```bash sudo pacman -Syu && sudo pacman -U https://archive.archlinux.org/packages/g/gcc-multilib/gcc-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/g/gcc-libs-multilib/gcc-libs-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/l/lib32-gcc-libs/lib32-gcc-libs-6.3.1-2-x86_64.pkg.tar.xz && sudo pacman -S base-devel gcc-multilib gdb gdb-common glew1.10 lib32-glew1.10 ``` + Cathook installation script: ```bash git clone --recursive https://github.com/nullifiedcat/cathook && cd cathook && make -j4 && bash update-menu From dd2be0ebacc21f4bd39abef45172d0cd7c6a9e2e Mon Sep 17 00:00:00 2001 From: SylveonBottle Date: Tue, 4 Jul 2017 11:55:05 -0500 Subject: [PATCH 6/7] Remove redundant installation + fix accidental update Before: gcc6 is installed, then script updates to gcc7. Now: other dependencies are installed first, then gcc6 downgrade. In no way should the script install gcc7 now. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c6f683a0..bac1db23 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ sudo apt update && sudo apt install build-essential software-properties-common - Arch dependencies installation:: ```bash -sudo pacman -Syu && sudo pacman -U https://archive.archlinux.org/packages/g/gcc-multilib/gcc-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/g/gcc-libs-multilib/gcc-libs-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/l/lib32-gcc-libs/lib32-gcc-libs-6.3.1-2-x86_64.pkg.tar.xz && sudo pacman -S base-devel gcc-multilib gdb gdb-common glew1.10 lib32-glew1.10 +sudo pacman -Syu && && sudo pacman -S base-devel gdb gdb-common glew1.10 lib32-glew1.10 && sudo pacman -U https://archive.archlinux.org/packages/g/gcc-multilib/gcc-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/g/gcc-libs-multilib/gcc-libs-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/l/lib32-gcc-libs/lib32-gcc-libs-6.3.1-2-x86_64.pkg.tar.xz ``` From 909c8589fce87654f1bbae9599177c70a719cd1e Mon Sep 17 00:00:00 2001 From: SylveonBottle Date: Tue, 4 Jul 2017 12:02:39 -0500 Subject: [PATCH 7/7] uh, whoops --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bac1db23..05b04ea2 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ sudo apt update && sudo apt install build-essential software-properties-common - Arch dependencies installation:: ```bash -sudo pacman -Syu && && sudo pacman -S base-devel gdb gdb-common glew1.10 lib32-glew1.10 && sudo pacman -U https://archive.archlinux.org/packages/g/gcc-multilib/gcc-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/g/gcc-libs-multilib/gcc-libs-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/l/lib32-gcc-libs/lib32-gcc-libs-6.3.1-2-x86_64.pkg.tar.xz +sudo pacman -Syu && sudo pacman -S base-devel gdb gdb-common glew1.10 lib32-glew1.10 && sudo pacman -U https://archive.archlinux.org/packages/g/gcc-multilib/gcc-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/g/gcc-libs-multilib/gcc-libs-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/l/lib32-gcc-libs/lib32-gcc-libs-6.3.1-2-x86_64.pkg.tar.xz ```