From afa6689dd550207d84ab4bedb4b3a877730a6aa0 Mon Sep 17 00:00:00 2001
From: -=yb4f310 <theunis.botha1@gmail.com>
Date: Thu, 11 May 2017 04:49:24 +0200
Subject: [PATCH] history

---
 bash_aliases |   2 +-
 bash_history | 266 +++++++++++++++++++++++++++++++++++++++++++++++++++
 start        |  14 +--
 3 files changed, 274 insertions(+), 8 deletions(-)

diff --git a/bash_aliases b/bash_aliases
index 20b2276..31c94c0 100644
--- a/bash_aliases
+++ b/bash_aliases
@@ -2,7 +2,7 @@ alias c='cd /usr/share/cybafelo'
 alias s='cd /usr/share/cybafelo && ./start'
 alias d='cd /usr/share/cybafelo && ./delete'
 alias st='cd /usr/share/cybafelo && ./stop'
-alias g='cd /usr/share/cybafelo'
+alias gl='cd /usr/share/cybafelo/game-lib'
 alias p='cd /usr/share/cybafelo/3d-pong'
 alias 3d='cd /usr/share/cybafelo/3d-editor'
 alias api='cd /usr/share/cybafelo && ./start_api'
diff --git a/bash_history b/bash_history
index 246d5dd..12c3af5 100644
--- a/bash_history
+++ b/bash_history
@@ -2392,3 +2392,269 @@ npm
 npm install -g gulp
 sudo vim /etc/hosts
 exit
+c
+cd 3d-editor/
+git diff
+git commit -am "single objects only - order is important"
+git push
+git pull
+cd ..
+cd api-v1/
+git diff
+git commit -am "by me"
+git push
+cd ,,
+cd ..
+cd blender-node/
+git diff
+git commit -am "only one"
+git push
+cd ..
+cd config/
+git diff
+git commit -am "config update"
+git push
+cd ..
+cd game-lib/
+git diff
+git commit -am "no graphics for something"
+git push
+cd ..
+cd app/
+git pull
+exit
+npm install -g bower
+sudo npm install -g bower
+sudo npm install -g pm2
+ls
+c
+./build_latest 
+cd blender-node/
+git diff
+git branch
+git branch -a
+git checkout v3
+npm install
+git checkout v2
+git merge v3
+git checkout v3
+lsa
+sl
+ls
+rm game-lib-editor.js 
+ls -l
+git checkout develop 
+git pull
+git diff v3
+git checkout stable 
+git diff v3
+git checkout v3
+git diff stable 
+git branch -a
+git status 
+ls
+rm game-lib-editor.js 
+cd src/
+ls
+cd ..
+ls
+vim server.js 
+npm install
+cd ..
+ls
+s
+ls
+cd config/
+ls
+cd ..
+ln -s config/start
+ln -s config/start_api
+ln -s config/start_api-v1.6 
+ln -s config/start_app
+ln -s config/start_cron 
+ln -s config/start_editor 
+ln -s config/start_gate 
+ln -s config/start_mail 
+ln -s config/start_po
+rm start_po
+ln -s config/start_pong 
+ln -s config/start_port 
+ln -s config/start_racing 
+ln -s config/start_tools 
+ln -s config/stop
+ln -s config/delete
+ln -s config/dump 
+ln -s config/logs 
+ln -s config/restart 
+ln -s config/track_all 
+ln -s config/update_all 
+ln -s config/checkout_all 
+ln -s config/build_latest 
+ls -l
+s
+d
+./start_api
+git clone git@github.com:ToywheelDev/gamewheel-service.git service
+cd service
+npm install
+git checkout develop 
+npm install
+ls -l
+cd ..
+./start_ap
+./start_api
+./start_api-v1.6 
+mv api_v1 api-v1
+./start_api-v1.6 
+ls
+./start_editor 
+vim start_editor 
+./delete 
+./start_api-v1.6 
+cd /etc/nginx/
+ls
+cd sites-enabled/
+ls
+sudo service nginx restart
+ps -A | grep ng
+cd /etc/nginx/
+ls
+vim nginx.conf 
+c
+cd config/
+ls
+cd nginx/
+ls
+cd conf.d/
+ls
+cd ..
+cd /etc/
+cd nginx/
+ls
+mv nginx.conf nginx.conf.bak
+sudo mv nginx.conf nginx.conf.bak
+sudo ln -s ~?
+ls
+rm ~/
+rm ~?
+sudo rm ~?
+ls
+sudo ln -s /usr/share/cybafelo/config/nginx/nginx.conf 
+cd conf.d/
+ls
+cd ..
+sudo rmdir conf.d/
+sudo ln -s /usr/share/cybafelo/config/nginx/conf.d/
+ls -l
+sudo service nginx restart
+ps -A | grep ng
+ping tj-3d-editor.cybafelo.com
+tail -f /var/log/nginx/*.log
+cd conf.d
+ls
+vim ports.conf 
+sudo apt-get install php-fpm
+cd /etc/php/7.0/
+ls
+cd fpm/
+ls
+vim php-fpm.conf 
+ls
+cd conf.d/
+ls
+cd ..
+cd pool.d/
+ls
+vim www.conf 
+sudo vim www.conf 
+su
+sudo service php7.0-fpm restart
+sudo service nginx restart
+tail -f /var/log/nginx/*.log
+ls
+cd /etc/nginx/
+ls
+cd conf.d
+ls
+vim ports.conf 
+c
+cd 3d-editor/
+ls
+gulp build
+ls
+npm install
+cd ..
+./build_latest 
+cd app
+l
+ls
+vim bower.json 
+ls
+re
+r
+c
+cd game-lib/
+cd src/
+grep "new.*GameLib.DomEl" * -R
+cd ..
+cd 3d-editor/src/
+grep "new.*GameLib.DomEl" * -R
+c
+cd config/
+ls
+git checkout tj-dev -- status_all
+git add status_all 
+vim status_all 
+cd ..
+ln -s config/status_all 
+./status_all 
+exit
+c
+sudo vim ./start_editor 
+vim start_editor 
+./start_editor 
+c
+npm install -g gulp
+auso npm install -g gulp
+sudo npm install -g gulp
+m
+c
+cd app
+bower install
+npm install
+gulp build
+bower install
+ls
+gulp build
+cd ..
+cd game-lib/
+gulp
+3d
+gulp
+ccsm
+c
+g
+gl
+vim config/bash_aliases 
+gl
+exit
+c
+cd 3d-editor/
+git diff
+git commit -am "single objects please"
+git push
+cd ..
+cd game-lib/
+git diff
+git commit -am "smart object creation - image factory override"
+git push
+cd ..
+cd api-v1/
+git diff
+git status 
+cd uploads/cybafelo/
+ls
+cd root/root/test/l
+cd root/root/test/
+ls
+exit
diff --git a/start b/start
index 17decb6..831c674 100755
--- a/start
+++ b/start
@@ -1,9 +1,9 @@
 #!/bin/bash
 cd /usr/share/cybafelo
-./start_editor
-./start_api
-./start_app
-./start_gate
-./start_port
-./start_mail
-./start_cron
+#./start_editor
+./start_api-v1.6
+#./start_app
+#./start_gate
+#./start_port
+#./start_mail
+#./start_cron