george/blackbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing the multiple calls to determine VCS type.

Browse Source 
* Credit goes to fidian@rumkin.com
This commit is contained in:
tlimoncelli@stackexchange.com
2015-06-20 19:10:17 +00:00
parent 64e019c8e6
commit efe7bbc8cd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/_blackbox_common.sh
View File

@@ -25,7 +25,7 @@ source "${0%/*}"/_stack_lib.sh
# Set REPOBASE to the top of the repository
# Set VCS_TYPE to 'git', 'hg', 'svn' or 'unknown'
if git rev-parse --show-toplevel >/dev/null 2>&1 ; then
if which >/dev/null 2>/dev/null git && git rev-parse --show-toplevel >/dev/null 2>&1 ; then
VCS_TYPE=git
REPOBASE=$(git rev-parse --show-toplevel)
elif [ -d ".svn" ] ; then
@@ -39,7 +39,7 @@ elif [ -d ".svn" ] ; then
REPOBASE=$(cd "$parent" ; pwd)
VCS_TYPE=svn
elif hg root >/dev/null 2>&1 ; then
elif which >/dev/null 2>/dev/null hg && hg root >/dev/null 2>&1 ; then
# NOTE: hg has to be tested last because it always "succeeds".
VCS_TYPE=hg
REPOBASE=$(hg root 2>/dev/null)
@@ -240,10 +240,10 @@ function shred_file() {
local OPT
name="$1"
if which shred >/dev/null ; then
if which shred >/dev/null 2>/dev/null ; then
CMD=shred
OPT=-u
elif which srm >/dev/null ; then
elif which srm >/dev/null 2>/dev/null ; then
#NOTE: srm by default uses 35-pass Gutmann algorithm
CMD=srm
OPT=-f