separate scripts into those meant to be run outside

ddollar · Jul 15, 2012 · c0b36a2 · c0b36a2
1 parent d2028fb
commit c0b36a2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/bin/build → script/build b/bin/build → script/build
diff --git a/bin/copy → script/copy b/bin/copy → script/copy
@@ -51,7 +51,7 @@ if [ "$to" == "" ]; then
   echo "Must speicyf the 'to' environment."
 fi
 
-slug_url="https://anvil-datastore.s3.amazonaws.com/software/$from/anvil.img"
+slug_url="https://anvil-datastore.s3.amazonaws.com/software/anvil-$from.img"
 
-bin/release $to $slug_url
-bin/upload $slug_url $to
+script/release $to $slug_url
+script/upload $slug_url $to
diff --git a/bin/deploy → script/deploy b/bin/deploy → script/deploy
@@ -35,9 +35,9 @@ usage() {
 
 build() {
   if [ "$git" == "1" ]; then
-    $root/bin/build -g $1
+    $root/script/build -g $1
   else
-    $root/bin/build $1
+    $root/script/build $1
   fi
 }
 
@@ -73,14 +73,14 @@ if [ "$release_environment" == "" ]; then
 fi
 
 slug_url=$(build $build_environment)
-bin/release $release_environment $slug_url
+script/release $release_environment $slug_url
 
 if [ "$testrun" == "1" ]; then
   slug_url=$(build $release_environment)
-  bin/release $release_environment $slug_url
+  script/release $release_environment $slug_url
 
   slug_url=$(build $release_environment)
-  bin/release $release_environment $slug_url
+  script/release $release_environment $slug_url
 fi
 
-bin/upload $slug_url $release_environment
+script/upload $slug_url $release_environment
diff --git a/bin/release → script/release b/bin/release → script/release
diff --git a/bin/s3 → script/s3 b/bin/s3 → script/s3
diff --git a/bin/upload → script/upload b/bin/upload → script/upload
@@ -53,5 +53,5 @@ fi
 echo -n "Uploading ${slug_url} to S3 as ${environment}... "
 downloaded=$(mktemp -t build_XXXXX)
 curl -s $slug_url -o $downloaded
-$root/bin/s3 put $downloaded /software/anvil-$environment.img >/dev/null 2>&1
+$root/script/s3 put $downloaded /software/anvil-$environment.img >/dev/null 2>&1
 echo "done"