Ditch fully-qualified paths.

Makes scripts more portable when they work relative to "where you are" (which should always be the project root folder.)

This allows scripts to work both inside and outside of a Vagrant VM better, and to be more compatible with wrapping in `vagrant-exec`.

Author: beporter

cache-clear

@@ -26,8 +26,6 @@ if [ "$1" = '-h' ]; then
 fi
 
 
-DIR="$( cd -P "$( dirname "$0" )"/.. >/dev/null 2>&1 && pwd )"
-
 echo "## Clearing cache folders.";
 
 cat <<-'EOPHP' | bin/cake console

codesniffer-run

@@ -27,8 +27,7 @@ EOT
 # Set up local variables.
 umask a+rw
 
-DIR="$( cd -P "$( dirname "$0" )"/.. >/dev/null 2>&1 && pwd )"
-TMP_DIR="${DIR}/tmp"
+TMP_DIR="tmp"
 REPORT_DIR="${TMP_DIR}/code-sniffs"
 FULL_REPORT_FILE="${REPORT_DIR}/report-full.txt"
 SUMMARY_REPORT_FILE="${REPORT_DIR}/report-summary.txt"

composer-install

@@ -34,10 +34,8 @@ fi
 
 
 # Set up working vars.
-DIR="$( cd -P "$( dirname "$0" )"/.. >/dev/null 2>&1 && pwd )"
-BIN_DIR="${DIR}/bin"
-COMPOSER_CONFIG_FILE="$DIR/composer.json"
-GUESSES=( "$( which composer )" "$BIN_DIR/composer" "$( which composer.phar )" "$BIN_DIR/composer.phar" )
+COMPOSER_CONFIG_FILE="composer.json"
+GUESSES=( "$( which composer )" "bin/composer" "$( which composer.phar )" "bin/composer.phar" )
 
 
 # Bail out if there's no config file present.

coverage-report

@@ -24,19 +24,17 @@ if [ "$1" = '-h' ]; then
 fi
 
 
-DIR="$( cd -P "$( dirname "$0" )"/.. >/dev/null 2>&1 && pwd )"
-COVERAGE_PATH="tmp/coverage/html/"
+COVERAGE_PATH="tmp/coverage/html"
 
 
 # Launch the coverage in a browser if requested and we're on the host.
 if command -v 'open' >/dev/null 2>&1; then
-    bin/vagrant-exec "vendor/bin/phpunit --coverage-html="$COVERAGE_PATH""
-    open "${COVERAGE_PATH}index.html"
+    bin/vagrant-exec "bin/phpunit --coverage-html="$COVERAGE_PATH""
+    open "${COVERAGE_PATH}/index.html"
 else
-    cd "$DIR"
     bin/phpunit --coverage-html="$COVERAGE_PATH"
     echo ""
-    echo "## Run 'open ${COVERAGE_PATH}index.html'"
+    echo "## Run 'open ${COVERAGE_PATH}/index.html'"
     echo "## from your host to view coverage reports in a browser."
     echo ""
 fi

db-backup

@@ -42,7 +42,7 @@ EOD;
  * @return string The converted value with the "closest" unit used.
  */
 function human_filesize($bytes, $decimals = 2) {
-	$sz = 'BKMGTP';
+	$sz = 'BKMGTPEZY';
 	$factor = floor((strlen(intval($bytes)) - 1) / 3);
 	return (sprintf("%.{$decimals}f", intval($bytes) / pow(1024, $factor)) + 0) . @$sz[$factor];
 }
@@ -56,16 +56,15 @@ if (isset($argv[1]) && $argv[1] == '-h') {
 }
 
 // Set up variables.
-$dir = getcwd();
-$backupDir = $dir . '/backups';
+$backupDir = 'backups';
 $date = date('Ymd-His');
 try {
-	$credentialsScript = "{$dir}/bin/db-credentials";
+	$credentialsScript = 'bin/db-credentials';
 	if (!is_readable($credentialsScript)) {
 		echo "!! DB credentials are not available. Aborting.";
 		exit(3);
 	}
-	
+
 	ob_start(); // Capture the shebang line from db-credentials.
 	$db = include($credentialsScript);
 	ob_get_clean(); // Flush it.

db-credentials

@@ -82,10 +82,9 @@ class DbConfig {
 	 * @return void
 	 */
 	public function __construct() {
-		$dir = getcwd();
-		$injectedCode = 'use Cake\Datasource\ConnectionManager; echo serialize(ConnectionManager::config("default")) . PHP_EOL; exit;'; // This must be on a single line to work with the REPL.
+		$injectedCode = 'echo serialize(\Cake\Datasource\ConnectionManager::config("default")) . PHP_EOL; exit;'; // This must be on a single line to work with the REPL.
 		$cmd = "echo '{$injectedCode}' | "
-			. escapeshellcmd("{$dir}/bin/cake Console -q");
+			. escapeshellcmd("bin/cake Console -q");
 		$response = [];
 		$code = 0;
 		exec($cmd, $response, $code);

db-login

@@ -32,11 +32,8 @@ if [ "$1" = '--help' ]; then
 fi
 
 
-DIR="$( cd -P "$( dirname "$0" )"/.. >/dev/null 2>&1 && pwd )"
-BIN_DIR="$DIR/bin"
-
 # Holy yuck, but nothing else works!
-eval $( ${BIN_DIR}/db-credentials )
+eval $( bin/db-credentials )
 
 # Set a custom port, if provided to us.
 if [ -n "${DB_PORT}" ]; then

db-sample-data

@@ -16,6 +16,10 @@ ${0##*/}
 Usage:
     bin/${0##*/} [table] [table2] [table3]
 
+Environment:
+    DB_SAMPLE_DATA_URL - If this environment variable is set, it will
+                         be used when displaying the download URL for
+                         the temporary zip file.
 
 EOT
 
@@ -30,21 +34,18 @@ if [ -z "$1" ]; then
 else
 	TABLES="--tables "$*""
 fi
-DIR="$( cd -P "$( dirname "$0" )"/.. >/dev/null 2>&1 && pwd )"
-APP_DIR="$DIR"
-BIN_DIR="${DIR}/bin"
 
 
 # Configuration vars. Set these appropriately for your app and environment.
-PUBLIC_URL=""
-WEBROOT_PATH="$APP_DIR/webroot/"
+PUBLIC_URL=${DB_SAMPLE_DATA_URL:-}
+WEBROOT_PATH="webroot/"
 
 
 # Internal var setup.
-eval $( ${BIN_DIR}/db-credentials ) # Yuck, but nothing else works!
+eval $( bin/db-credentials ) # Yuck, but nothing else works!
 DATE=$(date +%Y-%m-%d)
 OPTIONS="--skip-add-drop-table --no-create-info"
-TMP_PATH="$APP_DIR/tmp/"
+TMP_PATH="tmp/"
 DESTINATION_NAME="${DB_NAME}_sample_data_${DATE}"
 
 # Generate the dump, compress it and move it into place.

logs-clear

@@ -26,7 +26,5 @@ if [ "$1" = '-h' ]; then
 fi
 
 
-DIR="$( cd -P "$( dirname "$0" )"/.. >/dev/null 2>&1 && pwd )"
-
 echo "## Clearing logs.";
-rm -f $DIR/logs/*
+rm -f logs/*

migrations

@@ -6,13 +6,11 @@ usage ()
 	cat <<EOT
 
 ${0##*/}
-    Convenience wrapper to run any pending Migrations. Takes an optional
-    Migrations COMMAND (defaults to "run all") and an optional plugin
-    for which to execute migrations. Should be run from the project
-    root folder.
+    Convenience wrapper to run any pending Migrations. Should be
+    run from the project root folder.
 
 Usage:
-    bin/${0##*/} [command] [plugin]
+    bin/${0##*/}
 
 
 EOT
@@ -23,29 +21,6 @@ if [ "$1" = '-h' ]; then
 	usage
 fi
 
-
-
-DIR="$( cd -P "$( dirname "$0" )"/.. >/dev/null 2>&1 && pwd )"
-
-if [ "$1" ]; then
-	OPTION=$1;
-else
-	OPTION="run all";
-fi
-
-if [ "$2" ]; then
-	PLUGIN=$2;
-else
-	PLUGIN="app"
-fi
-
-
-if [ $PLUGIN == "app" ]; then
-	PLUGIN=""
-else
-	PLUGIN="-p $PLUGIN"
-fi
-
-$DIR/bin/cache-clear
-$DIR/bin/cake Migrations.migration $OPTION $PLUGIN
-$DIR/bin/cache-clear
+bin/cache-clear
+bin/cake Migrations.migration migrate
+bin/cache-clear