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

Fix _determine_vcs_base_and_type and fail_if_not_on_cryptlist

Browse Source
This commit is contained in:
tlimoncelli@stackexchange.com
2014-09-08 20:09:04 +00:00
parent 10dec2222e
commit 3460633506
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bin/_blackbox_common.sh
View File

@@ -16,14 +16,17 @@ set -e
# By side-effect, sets the variable VCS_TYPE to either 'git', 'hg', # By side-effect, sets the variable VCS_TYPE to either 'git', 'hg',
# or 'unknown'. # or 'unknown'.
function _determine_vcs_base_and_type() { function _determine_vcs_base_and_type() {
if hg root 2>/dev/null ; then if git rev-parse --show-toplevel 2>/dev/null ; then
VCS_TYPE=hg
elif git rev-parse --show-toplevel 2>/dev/null ; then
VCS_TYPE=git VCS_TYPE=git
elif hg root 2>/dev/null ; then
# NOTE: hg has to be tested last because it always "succeeds".
VCS_TYPE=hg
else else
echo /dev/null echo /dev/null
VCS_TYPE=unknown VCS_TYPE=unknown
fi fi
# FIXME: Verify this function by checking for .hg or .git
# after determining what we believe to be the answer.
} }
REPOBASE=$(_determine_vcs_base_and_type) REPOBASE=$(_determine_vcs_base_and_type)
@@ -65,7 +68,15 @@ function fail_if_not_in_repo() {
# Exit with error if filename is not registered on blackbox list. # Exit with error if filename is not registered on blackbox list.
function fail_if_not_on_cryptlist() { function fail_if_not_on_cryptlist() {
if ! grep -s -q "$name" "$BB_FILES" ; then # Assumes $1 does NOT have the .gpg extension
local name
name="$1"
#echo name=$name
#echo BB_FILES=$BB_FILES
#echo fgrep -s -q "$name" "$BB_FILES" \; echo '$?'
if ! grep -x -s -q "$name" "$BB_FILES" ; then
echo 'ERROR: Please run this script from the base directory.' echo 'ERROR: Please run this script from the base directory.'
echo 'Exiting...' echo 'Exiting...'
exit 1 exit 1