Refactor website with new design & structure

scripts/deploy

@@ -1,51 +1,22 @@
 #!/bin/bash
 
-USAGE=<<END
+function die {
+    echo $*
+    exit 1
+}
 
-END
-
-if [[ -e "./aws.config" ]]; then
-    export AWS_CONFIG_FILE="./aws.config"
-else
-    export AWS_CONFIG_FILE="$HOME/.aws/config"
-fi
-
-SOURCE_DIR="./dist/"
-SITE="crafting-guide.com"
-TARGET=""
+ENVIRONMENT=""
 while [[ "$1" != "" ]]; do
     case "$1" in
-        "--staging") TARGET="staging";;
-        "--production") TARGET="production";;
+        "--staging") ENVIRONMENT="staging";;
+        "--prod") ENVIRONMENT="prod";;
+        *) die "Please specify environment: --staging or --prod";;
     esac
-    shift
 done
 
-if [[ "$TARGET" == "" ]]; then
-    echo "Please choose either --staging or --production for the target."
-    exit 1
-fi
-
-if [[ "$TARGET" == "staging" ]]; then
-    TARGET_DIR="s3://new.$SITE/"
-    BUILD_CMD="build"
-elif [[ "$TARGET" == "production" ]]; then
-    TARGET_DIR="s3://$SITE/"
-    BUILD_CMD="dist"
-fi
-
-S3CMD_CFG="$HOME/.s3cfg"
-if [[ ! -e "$S3CMD_CFG" ]]; then
-    echo "[default]" > "$S3CMD_CFG"
-    cat $AWS_CONFIG_FILE | grep "aws_access_key_id" | sed "s/aws_access_key_id/access_key/" >> "$S3CMD_CFG"
-    cat $AWS_CONFIG_FILE | grep "aws_secret_access_key" | sed "s/aws_secret_access_key/secret_key/" >> "$S3CMD_CFG"
-fi
-
-if grunt clean $BUILD_CMD; then
-    echo "Preparing to upload to S3..."
-    s3cmd sync -r -P --add-header="cache-control:max-age=1800" $SOURCE_DIR $TARGET_DIR
-    echo "S3 Upload Complete"
-else
-    echo "ERROR: Building distribution failed. Aborting deployment!"
-    exit 1
-fi
+git push \
+    && git checkout $ENVIRONMENT \
+    && git rebase master \
+    && git push \
+    && git checkout master \
+    || die "Could not publish changes"