Merge pull request #491 from TotallyNotElite/master

CircleCI: Merge when prompted

.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: "Compiling cathook"
+            command: git submodule update --init --recursive; mkdir build; cd build; cmake ..; make -j$(grep -c '^processor' /proc/cpuinfo); cd ..

.gitlab-ci.yml

@@ -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 .."

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)

install-all

@@ -1,37 +1,28 @@
-rm ../install-all
+#!/usr/bin/env bash
+
+rm ../install-all # remove install file
 
 #
 # 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
 #
 
-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
-# 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
 #
 
-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 ..

update

@@ -1,11 +1,6 @@
 #!/usr/bin/env bash
-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"
+printf "\n\n";printf '\e[1;34m%-6s\e' "Cathook update complete!";printf "\n\n"