Move non-user facing files to scripts/

.gitignore

@@ -1,5 +1,6 @@
-ec2gaming.ovpn
-ec2gaming.rdp
 ec2gaming.auth
 ec2gaming.bat
-ec2gaming-permissionpolicy.json
+scripts/ec2gaming-permissionpolicy.json
+scripts/ec2gaming.ovpn
+scripts/ec2gaming.rdp
+

ec2gaming

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-source "$(dirname "$0")/ec2gaming.header"
+set -e
+cd "$(dirname "$0")/scripts" || exit
 
 COMMANDS=($(find . -name 'ec2gaming-*.sh' | sed 's/.*ec2gaming-//;s/\.sh//'))
 

ec2gaming-start.sh → scripts/ec2gaming-start.sh

@@ -3,10 +3,6 @@ source "$(dirname "$0")/ec2gaming.header"
 
 BOOTSTRAP=0
 
-if [ ! -f ec2gaming.auth ]; then
-    echo "ec2gaming.auth file not found!"
-fi
-
 echo -n "Getting lowest $INSTANCE_TYPE bid... "
 PRICE_AND_ZONE=($(./ec2gaming-price.sh))
 PRICE=${PRICE_AND_ZONE[0]}
@@ -50,9 +46,7 @@ if ! aws s3api head-bucket --bucket "$BUCKET" &> /dev/null; then
   REGION=$(aws configure get region)
   aws s3api create-bucket --bucket "$BUCKET" --region "$REGION" --create-bucket-configuration LocationConstraint="$REGION" > /dev/null
 fi
-USERNAME=$(head -1 ec2gaming.auth)
-PASSWORD=$(tail -1 ec2gaming.auth)
-sed "s/BUCKET/$BUCKET/g;s/USERNAME/$USERNAME/g;s/PASSWORD/$PASSWORD/g" ec2gaming.bat.template > ec2gaming.bat
+sed "s/BUCKET/$BUCKET/g;s/USERNAME/$USERNAME/g;s/PASSWORD/$PASSWORD/g" ec2gaming.bat.template > ../ec2gaming.bat
 echo "$BUCKET"
 
 PROFILE_NAME="ec2gaming"

ec2gaming-vnc.sh → scripts/ec2gaming-vnc.sh

@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
 source "$(dirname "$0")/ec2gaming.header"
 
-USERNAME=$(head -1 ec2gaming.auth)
-PASSWORD=$(tail -1 ec2gaming.auth)
 open "vnc://$USERNAME:$PASSWORD@10.8.0.1"

ec2gaming-vpnup.sh → scripts/ec2gaming-vpnup.sh

@@ -3,15 +3,16 @@ source "$(dirname "$0")/ec2gaming.header"
 
 echo -n "Connecting VPN (you may see an authentication prompt)... "
 IP=$(./ec2gaming-ip.sh)
+AUTH=$(realpath "$(pwd)/../ec2gaming.auth")
 BACKING_CONFIG=~/Library/Application\ Support/Tunnelblick/Configurations/ec2gaming.tblk/Contents/Resources/config.ovpn
 if [ ! -f "$BACKING_CONFIG" ]; then
-  sed "s#IP#$IP#g;s#AUTH#$(pwd)/ec2gaming.auth#g" ec2gaming.ovpn.template > ec2gaming.ovpn
+  sed "s#IP#$IP#g;s#AUTH#$AUTH#g" ec2gaming.ovpn.template > ec2gaming.ovpn
   open ec2gaming.ovpn
   echo "Waiting 10 seconds for import..."
   sleep 10
 else
     # the authentication prompt on copy will block, avoids the messy sleep
-    sed "s#IP#$IP#g;s#AUTH#$(pwd)/ec2gaming.auth#g" ec2gaming.ovpn.template > "$BACKING_CONFIG"
+    sed "s#IP#$IP#g;s#AUTH#$AUTH#g" ec2gaming.ovpn.template > "$BACKING_CONFIG"
 fi
 
 osascript ec2gaming-vpnup.scpt

ec2gaming.header → scripts/ec2gaming.header

@@ -1,7 +1,10 @@
 #!/bin/bash
 set -e
 cd "$(dirname "$0")" || exit
-source ec2gaming.cfg
+source ../ec2gaming.cfg
+
+USERNAME=$(head -1 ../ec2gaming.auth)
+PASSWORD=$(tail -1 ../ec2gaming.auth)
 
 describe_gaming_image() {
   aws ec2 describe-images --owner "$1" --filters Name=name,Values=ec2gaming