From eb34db18a4a1a0b19c5d558682425410d70dcfae Mon Sep 17 00:00:00 2001
From: TotallyNotElite <38938720+TotallyNotElite@users.noreply.github.com>
Date: Fri, 8 Jun 2018 17:04:13 +0200
Subject: [PATCH 01/10] Delete .gitlab-ci.yml

---
 .gitlab-ci.yml | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 0d499a24..00000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-image: registry.gitlab.com/nullworks/cathook-ci/ubuntu-cat-dependencies:build
-variables:
-  DOCKER_DRIVER: overlay2
-build:
-    stage: build
-    before_script:
-        - "git submodule update --init --recursive"
-    script:
-        - "mkdir build; cd build; cmake ..; make; cd .."

From 6964d1331d912c60b5ba84cde23583eb093d840b Mon Sep 17 00:00:00 2001
From: TotallyNotElite <38938720+TotallyNotElite@users.noreply.github.com>
Date: Fri, 8 Jun 2018 17:12:06 +0200
Subject: [PATCH 02/10] CircleCI CI

---
 .circleci/config.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 00000000..6ababfea
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,10 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: registry.gitlab.com/nullworks/cathook-ci-docker/ubuntu-cat-dependencies:build
+    steps:
+      - checkout
+      - run:
+          name: compile-cathook
+          script: "git submodule update --init --recursive; mkdir build; cd build; cmake ..; make; cd .."

From 0048c8458e98719d8d577f3eb1f927d6a67dc7f7 Mon Sep 17 00:00:00 2001
From: TotallyNotElite <38938720+TotallyNotElite@users.noreply.github.com>
Date: Fri, 8 Jun 2018 17:23:34 +0200
Subject: [PATCH 03/10] Update config.yml

---
 .circleci/config.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6ababfea..d8ae66c6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,10 +1,10 @@
 version: 2
 jobs:
-  build:
-    docker:
-      - image: registry.gitlab.com/nullworks/cathook-ci-docker/ubuntu-cat-dependencies:build
-    steps:
-      - checkout
-      - run:
-          name: compile-cathook
-          script: "git submodule update --init --recursive; mkdir build; cd build; cmake ..; make; cd .."
+    compile_cathook:
+      docker:
+        - image: registry.gitlab.com/nullworks/cathook-ci-docker/ubuntu-cat-dependencies:build
+      steps:
+        - checkout
+        - run: 
+            name: "Compiling cathook"
+            command: git submodule update --init --recursive; mkdir build; cd build; cmake ..; make; cd ..

From f617f1353e97925688bd5198ffadd958933c309d Mon Sep 17 00:00:00 2001
From: TotallyNotElite <38938720+TotallyNotElite@users.noreply.github.com>
Date: Fri, 8 Jun 2018 17:25:18 +0200
Subject: [PATCH 04/10] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d8ae66c6..f44289ff 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,6 @@
 version: 2
 jobs:
-    compile_cathook:
+    build:
       docker:
         - image: registry.gitlab.com/nullworks/cathook-ci-docker/ubuntu-cat-dependencies:build
       steps:

From d3a1317297c8eb5294aa8ae5f7757191f2400f13 Mon Sep 17 00:00:00 2001
From: TotallyNotElite <1yourexperiment@protonmail.com>
Date: Fri, 8 Jun 2018 17:50:50 +0200
Subject: [PATCH 05/10] Fix install-all and update

---
 install-all | 20 ++------------------
 update      |  6 +-----
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/install-all b/install-all
index 12f79f6e..33e5f37b 100755
--- a/install-all
+++ b/install-all
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 rm ../install-all
 
 #
@@ -12,24 +14,6 @@ sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && sudo apt update && sud
 
 git fetch;git pull origin;git submodule update --remote --recursive
 
-#
-# Install libglez
-#
-
-cd libglez;mkdir build;cd build;cmake ..;make;sudo make install;cd ..;cd ..
-
-#
-# Install libxoverlay
-#
-
-cd libxoverlay;mkdir build;cd build;cmake ..;make;sudo make install;cd ..;cd ..
-
-#
-# Install Simple-ipc
-#
-
-cd simple-ipc;mkdir build;cd build;cmake ..;make;sudo make install;cd ..;cd ..
-
 #
 # Build cathook
 #
diff --git a/update b/update
index b366214b..fc778c78 100755
--- a/update
+++ b/update
@@ -2,10 +2,6 @@
 sudo echo Elevated
 #Get updated source code
 git fetch;git pull origin;git submodule update --remote --recursive
-#Update dependencies
-cd ./libglez/build; cmake ..; make;sudo make install;cd ..; cd ..
-cd ./libxoverlay/build; cmake ..; make;sudo make install;cd ..; cd ..
-cd ./simple-ipc/build; cmake ..; make;sudo make install;cd ..; cd ..
 #Update cathook
 cd build; cmake ..; make; cd ..; cd ..
-printf "\n\n";printf '\e[1;34m%-6s\e' "Cathook update complete!";printf "\n\n"
\ No newline at end of file
+printf "\n\n";printf '\e[1;34m%-6s\e' "Cathook update complete!";printf "\n\n"

From 64c584fea1c6d14891a7e601ecd6414ff0e67c52 Mon Sep 17 00:00:00 2001
From: TotallyNotElite <38938720+TotallyNotElite@users.noreply.github.com>
Date: Fri, 8 Jun 2018 19:53:44 +0200
Subject: [PATCH 06/10] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8422af00..0ab85e47 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Cathook Training Software
 ![banner](http://i.imgur.com/w96wdtE.png)
-[![pipeline status](https://gitlab.com/nullworks/cathook-ci/badges/master/pipeline.svg)](https://gitlab.com/nullworks/cathook-ci/commits/master)
+[![CircleCI](https://circleci.com/gh/nullworks/cathook.svg?style=svg)](https://circleci.com/gh/nullworks/cathook)
 
 
 [cathook announcements channel in telegram](https://t.me/cathook_cheat)

From 8e7596d799283a88c237de11d77fd242d96e906c Mon Sep 17 00:00:00 2001
From: TotallyNotElite <38938720+TotallyNotElite@users.noreply.github.com>
Date: Fri, 8 Jun 2018 21:34:38 +0200
Subject: [PATCH 07/10] Update update

---
 update | 1 -
 1 file changed, 1 deletion(-)

diff --git a/update b/update
index fc778c78..3ee7adde 100755
--- a/update
+++ b/update
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-sudo echo Elevated
 #Get updated source code
 git fetch;git pull origin;git submodule update --remote --recursive
 #Update cathook

From e239e70a1993c4f2717c47627eaaa9e8e4c978db Mon Sep 17 00:00:00 2001
From: LightCat <BenCat07@gmail.com>
Date: Fri, 8 Jun 2018 21:49:33 +0200
Subject: [PATCH 08/10] Update install-all

---
 install-all | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/install-all b/install-all
index 33e5f37b..ab5e0912 100755
--- a/install-all
+++ b/install-all
@@ -6,7 +6,9 @@ rm ../install-all
 # Install base Dependencies
 #
 
-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
+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
 
 #
 # Update cathook

From 8d33475af9694aa4ac1e24bc6161e1b2d86de8f9 Mon Sep 17 00:00:00 2001
From: TotallyNotElite <38938720+TotallyNotElite@users.noreply.github.com>
Date: Sat, 9 Jun 2018 15:36:22 +0200
Subject: [PATCH 09/10] Comments and readability.

---
 install-all | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/install-all b/install-all
index ab5e0912..bd8fe531 100755
--- a/install-all
+++ b/install-all
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-rm ../install-all
+rm ../install-all # remove install file
 
 #
 # Install base Dependencies
@@ -14,10 +14,15 @@ sudo apt install build-essential git gcc-multilib g++-multilib software-properti
 # Update cathook
 #
 
-git fetch;git pull origin;git submodule update --remote --recursive
+git fetch # fetch github repo for udpates
+git pull origin # pull changes from github
+git submodule update --remote --recursive # update submodules
 
 #
 # Build cathook
 #
 
-mkdir build;cd build;cmake ..;make -j$(grep -c '^processor' /proc/cpuinfo); sudo make data; cd ..; cd ..
+mkdir build;cd build #create a directory for building cathook
+cmake ..;make -j$(grep -c '^processor' /proc/cpuinfo) # create makefile and build using all available threads
+sudo make data # create /opt/cathook/data
+cd ..; cd ..

From f85da89ff3fa26c58d421ed63834694b13e24bea Mon Sep 17 00:00:00 2001
From: TotallyNotElite <38938720+TotallyNotElite@users.noreply.github.com>
Date: Sat, 9 Jun 2018 15:40:40 +0200
Subject: [PATCH 10/10] Use all cores provided by circleci

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f44289ff..57019c63 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,4 +7,4 @@ jobs:
         - checkout
         - run: 
             name: "Compiling cathook"
-            command: git submodule update --init --recursive; mkdir build; cd build; cmake ..; make; cd ..
+            command: git submodule update --init --recursive; mkdir build; cd build; cmake ..; make -j$(grep -c '^processor' /proc/cpuinfo); cd ..