From f60ae4b99ff0ffec3c5cfc971d1d129e5222924c Mon Sep 17 00:00:00 2001 From: BennyQBD Date: Sat, 31 May 2014 17:54:51 -0400 Subject: [PATCH] Updated Build Tools --- Unix-GitPull.sh | 6 ++++++ Unix-GitPush.sh | 10 ++++++++++ _PushToGithub.sh | 10 ---------- build/.gitignore | 4 ++++ build/.gitkeep | 0 5 files changed, 20 insertions(+), 10 deletions(-) create mode 100755 Unix-GitPull.sh create mode 100755 Unix-GitPush.sh delete mode 100755 _PushToGithub.sh create mode 100644 build/.gitignore delete mode 100644 build/.gitkeep diff --git a/Unix-GitPull.sh b/Unix-GitPull.sh new file mode 100755 index 0000000..3edbf75 --- /dev/null +++ b/Unix-GitPull.sh @@ -0,0 +1,6 @@ +#Clean up any files that aren't part of the repository +#because they will need to be regenerated after a pull. +./Unix-Clean.sh + +#Pull any commits from the remote branch +git pull origin master diff --git a/Unix-GitPush.sh b/Unix-GitPush.sh new file mode 100755 index 0000000..3487a96 --- /dev/null +++ b/Unix-GitPush.sh @@ -0,0 +1,10 @@ +#Move the res directory back to it's inital position +mv ./build/res/ ./ + +#Add everything to a new commit and push it to github +git add -A +git commit +git push origin master + +#Move the res directory back to the working "build" directory +mv ./res/ ./build/ diff --git a/_PushToGithub.sh b/_PushToGithub.sh deleted file mode 100755 index 8b52e2c..0000000 --- a/_PushToGithub.sh +++ /dev/null @@ -1,10 +0,0 @@ -#Clean up files that aren't wanted in the commit -./Unix-Clean.sh - -#Add .gitkeep so github includes build directory -touch ./build/.gitkeep - -#Add everything to a new commit and push it to github -git add -A -git commit -git push origin master diff --git a/build/.gitignore b/build/.gitignore new file mode 100644 index 0000000..5e7d273 --- /dev/null +++ b/build/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore diff --git a/build/.gitkeep b/build/.gitkeep deleted file mode 100644 index e69de29..0000000