From 6345ee950338ee141e7b1c23492bde03c85f3f06 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Tue, 10 May 2016 15:06:29 -0500
Subject: [PATCH] move scripts

---
 cli/{ => scripts}/fetch-share-url.sh |  2 +-
 install.sh => cli/scripts/install.sh | 14 +++++++-------
 update.sh => cli/scripts/update.sh   |  0
 valet                                |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename cli/{ => scripts}/fetch-share-url.sh (62%)
 rename install.sh => cli/scripts/install.sh (65%)
 rename update.sh => cli/scripts/update.sh (100%)

diff --git a/cli/fetch-share-url.sh b/cli/scripts/fetch-share-url.sh
similarity index 62%
rename from cli/fetch-share-url.sh
rename to cli/scripts/fetch-share-url.sh
index ec4f5ce..ccb8ae1 100644
--- a/cli/fetch-share-url.sh
+++ b/cli/scripts/fetch-share-url.sh
@@ -2,4 +2,4 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-php $DIR/valet.php fetch-share-url | pbcopy
+php $DIR/../valet.php fetch-share-url | pbcopy
diff --git a/install.sh b/cli/scripts/install.sh
similarity index 65%
rename from install.sh
rename to cli/scripts/install.sh
index 85c8cf5..c54b688 100644
--- a/install.sh
+++ b/cli/scripts/install.sh
@@ -19,14 +19,14 @@ brew install php70
 # Install Composer to /usr/local/bin
 if [[ ! $(which composer -A) ]]
 then
-echo "Installing Composer..."
-/usr/local/bin/php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-/usr/local/bin/php -r "if (hash_file('SHA384', 'composer-setup.php') === '92102166af5abdb03f49ce52a40591073a7b859a86e8ff13338cf7db58a19f7844fbc0bb79b2773bf30791e935dbd938') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" > /dev/null 2>&1
-/usr/local/bin/php composer-setup.php > /dev/null 2>&1
-/usr/local/bin/php -r "unlink('composer-setup.php');"
+    echo "Installing Composer..."
+    /usr/local/bin/php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+    /usr/local/bin/php -r "if (hash_file('SHA384', 'composer-setup.php') === '92102166af5abdb03f49ce52a40591073a7b859a86e8ff13338cf7db58a19f7844fbc0bb79b2773bf30791e935dbd938') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" > /dev/null 2>&1
+    /usr/local/bin/php composer-setup.php > /dev/null 2>&1
+    /usr/local/bin/php -r "unlink('composer-setup.php');"
 
-mv composer.phar /usr/local/bin/composer
-chmod +x /usr/local/bin/composer
+    mv composer.phar /usr/local/bin/composer
+    chmod +x /usr/local/bin/composer
 fi
 
 COMPOSER_PATH=$(which composer)
diff --git a/update.sh b/cli/scripts/update.sh
similarity index 100%
rename from update.sh
rename to cli/scripts/update.sh
diff --git a/valet b/valet
index 358ee1c..b44b5a4 100755
--- a/valet
+++ b/valet
@@ -30,7 +30,7 @@ then
     fi
 elif [[ "$1" = "update" ]]
 then
-    bash <(curl -s https://raw.githubusercontent.com/laravel/valet/master/update.sh)
+    bash <(curl -s https://raw.githubusercontent.com/laravel/valet/master/cli/scripts/update.sh)
 elif [[ "$1" = "share" ]]
 then
     HOST="${PWD##*/}"
@@ -47,7 +47,7 @@ then
     done
 
     # Fetch Ngrok URL In Background...
-    bash "$DIR/cli/fetch-share-url.sh" &
+    bash "$DIR/cli/scripts/fetch-share-url.sh" &
 
     "$DIR/bin/ngrok" http -host-header=rewrite "$HOST.$DOMAIN:80"
 else