Merge pull request #3 from connyay/setup

Add setup to script

Author: X1011

deploy.sh

@@ -11,9 +11,18 @@ default_email=
 #repository to deploy to. must be readable and writable.
 repo=origin
 
+# Parse arg flags
+while : ; do
 if [[ $1 = "-v" || $1 = "--verbose" ]]; then
-	verbose=true
+    verbose=true
+    shift
+elif [[ $1 = "-s" || $1 = "--setup" ]]; then
+    setup=true
+    shift
+else
+    break
 fi
+done
 
 #echo expanded commands as they are executed (for debugging)
 function enable_expanded_output {
@@ -31,8 +40,23 @@ function disable_expanded_output {
 	fi
 }
 
+function setup_repo {
+	mkdir -p $deploy_directory
+	git --work-tree $deploy_directory checkout --orphan $deploy_branch
+	git --work-tree $deploy_directory rm -r "*"
+	git --work-tree $deploy_directory add --all
+	git --work-tree $deploy_directory commit -m "initial publish"
+	git push origin $deploy_branch
+	git symbolic-ref HEAD refs/heads/master && git reset --mixed
+}
+
 enable_expanded_output
 
+if [ $setup ]; then
+	setup_repo
+	exit
+fi
+
 commit_title=`git log -n 1 --format="%s" HEAD`
 commit_hash=`git log -n 1 --format="%H" HEAD`
 
@@ -59,7 +83,7 @@ enable_expanded_output
 #make deploy_branch the current branch
 git symbolic-ref HEAD refs/heads/$deploy_branch
 
-#put the previously committed contents of deploy_branch branch into the index 
+#put the previously committed contents of deploy_branch branch into the index
 git --work-tree "$deploy_directory" reset --mixed --quiet
 
 git --work-tree "$deploy_directory" add --all
@@ -73,7 +97,7 @@ case $diff in
 		set_user_id
 		git --work-tree "$deploy_directory" commit -m \
 			"publish: $commit_title"$'\n\n'"generated from commit $commit_hash"
-		
+
 		disable_expanded_output
 		#--quiet is important here to avoid outputting the repo URL, which may contain a secret token
 		git push --quiet $repo $deploy_branch

readme.md

@@ -11,19 +11,7 @@ Download the script (`wget https://github.com/X1011/git-directory-deploy/raw/mas
 - **repo**: repository to deploy to. Must be readable and writable. The default of "origin" will not work on Travis CI, since it uses the read-only git protocol. In that case, it is recommended to store a [GitHub token](https://help.github.com/articles/creating-an-access-token-for-command-line-use) in a [secure environment variable](http://about.travis-ci.org/docs/user/build-configuration/#Secure-environment-variables) and use it in an HTTPS URL like this: <code>repo=https://$GITHUB_TOKEN@github.com/<i>user</i>/<i>repo</i>.git</code>
 
 ## setup
-Do this once to set up a deploy branch if you don't already have one. This could be implemented in the script, but I don’t feel like doing it. Replace "dist" with your deploy_directory and "gh-pages" with your deploy_branch.
-
-1. `git --work-tree dist checkout --orphan gh-pages`
-	- this will disconnect the gh-pages branch’s history from the current commit
-	- in my app, the project root and dist had no files in common. If yours do, be careful if you don’t want to overwrite any existing files in dist
-2. `git --work-tree dist rm -r "*"`
-	- remove the source files we just checked out; these aren’t the files we’re looking for
-	- the quotes are required to prevent the shell from globbing in the current directory; we want git to glob in dist
-3. `git --work-tree dist add --all`
-4. `git --work-tree dist commit -m "initial publish"`
-5. `git push origin gh-pages`
-6. `git symbolic-ref HEAD refs/heads/master && git reset --mixed`
-	- switch back to master branch
+Ensure configuration variables are correct in `deploy.sh` and run `./deploy.sh -s`
 
 ## run
 Do this every time you want to deploy, or have your CI server do it.