From 8d9ae5321704e3f0da9df947d6b84ae1ec6114af Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Fri, 7 Feb 2014 11:01:50 -0500 Subject: [PATCH] quoting/stdization/full-paths --- developer/bin/develop_brew_cask | 2 +- developer/bin/generate_man_pages | 38 ++++++++++++++++++++++++------ developer/bin/get_release_tag | 2 +- developer/bin/list_apps_in_pkg | 2 +- developer/bin/list_ids_in_app | 2 +- developer/bin/production_brew_cask | 2 +- developer/bin/project_stats | 2 +- 7 files changed, 37 insertions(+), 13 deletions(-) diff --git a/developer/bin/develop_brew_cask b/developer/bin/develop_brew_cask index cb046970b6..797da49615 100755 --- a/developer/bin/develop_brew_cask +++ b/developer/bin/develop_brew_cask @@ -35,7 +35,7 @@ die () { } cd_to_project_root () { - local script_dir="$(/usr/bin/dirname $0)" + local script_dir="$(/usr/bin/dirname "$0")" cd "$script_dir" local git_root="$(git rev-parse --show-toplevel)" if [[ -z "$git_root" ]]; then diff --git a/developer/bin/generate_man_pages b/developer/bin/generate_man_pages index 0efbf0fc7b..8e1258b8e9 100755 --- a/developer/bin/generate_man_pages +++ b/developer/bin/generate_man_pages @@ -5,22 +5,46 @@ # This is temporary, should be replaced with a Rakefile target # -set -e; # exit on uncaught error -set +o histexpand; # don't expand history expressions -shopt -s nocasematch; # case-insensitive regular expressions +### +### settings +### + +set -e # exit on uncaught error +set +o histexpand # don't expand history expressions +shopt -s nocasematch # case-insensitive regular expressions + +### +### functions +### + +warn () { + local message="$@" + if ! [[ $message =~ "\n"$ ]]; then + message="${message}\n" + fi + printf "$message" 1>&2 +} + +die () { + warn "$@" + exit 1 +} cd_to_project_root () { - local script_dir="$(/usr/bin/dirname $0)" + local script_dir="$(/usr/bin/dirname "$0")" cd "$script_dir" local git_root="$(git rev-parse --show-toplevel)" if [[ -z "$git_root" ]]; then - printf "Could not find git project root" - exit 1; + die "ERROR: Could not find git project root" fi cd "$git_root" } -cd_to_project_root; +### +### main +### + +cd_to_project_root ronn --roff --pipe --organization='Homebrew-cask' --manual='brew-cask' doc/src/brew-cask.1.md > doc/man/brew-cask.1 diff --git a/developer/bin/get_release_tag b/developer/bin/get_release_tag index d7932f78cc..80d9cf3e0c 100755 --- a/developer/bin/get_release_tag +++ b/developer/bin/get_release_tag @@ -37,7 +37,7 @@ die () { } cd_to_project_root () { - local script_dir="$(/usr/bin/dirname $0)" + local script_dir="$(/usr/bin/dirname "$0")" cd "$script_dir" local git_root="$(git rev-parse --show-toplevel)" if [[ -z "$git_root" ]]; then diff --git a/developer/bin/list_apps_in_pkg b/developer/bin/list_apps_in_pkg index 1ae8e8c2a9..5ebfe123a3 100755 --- a/developer/bin/list_apps_in_pkg +++ b/developer/bin/list_apps_in_pkg @@ -61,7 +61,7 @@ app_source_4 () { app_source_5 () { /usr/bin/find "$pkgdir" -name Archive.pax.gz -print0 | \ - /usr/bin/xargs -0 -n1 -I{} sh -c \ + /usr/bin/xargs -0 -n1 -I{} /bin/bash -c \ "/usr/bin/gunzip -c '{}' | /bin/pax | /usr/bin/egrep '\.app'" | \ /usr/bin/perl -pe 's{\A.*/([^/]+\.app).*\Z}{$1}'; } diff --git a/developer/bin/list_ids_in_app b/developer/bin/list_ids_in_app index 1501e6cc4d..a99f0a5086 100755 --- a/developer/bin/list_ids_in_app +++ b/developer/bin/list_ids_in_app @@ -16,7 +16,7 @@ shopt -s nocasematch # case-insensitive regular expressions ### appdir='' -scriptdir="$(dirname '$0')" +scriptdir="$(dirname "$0")" ### ### functions diff --git a/developer/bin/production_brew_cask b/developer/bin/production_brew_cask index 15fbb76bac..130e62e645 100755 --- a/developer/bin/production_brew_cask +++ b/developer/bin/production_brew_cask @@ -35,7 +35,7 @@ die () { } cd_to_project_root () { - local script_dir="$(/usr/bin/dirname $0)" + local script_dir="$(/usr/bin/dirname "$0")" cd "$script_dir" local git_root="$(git rev-parse --show-toplevel)" if [[ -z "$git_root" ]]; then diff --git a/developer/bin/project_stats b/developer/bin/project_stats index 1c50c39d71..3d76db285a 100755 --- a/developer/bin/project_stats +++ b/developer/bin/project_stats @@ -47,7 +47,7 @@ die () { } cd_to_project_root () { - local script_dir="$(/usr/bin/dirname $0)" + local script_dir="$(/usr/bin/dirname "$0")" cd "$script_dir" local git_root="$(git rev-parse --show-toplevel)" if [[ -z "$git_root" ]]; then