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

Pulling greps into a common function

Browse Source 
This will help eliminate problems and make searching consistent
This commit is contained in:
Tyler Akins
2015-06-15 12:29:44 -05:00
parent 6e04e42f4a
commit 287b97ccd6
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
bin/_blackbox_common.sh
View File

@@ -68,8 +68,7 @@ SECRING="${KEYRINGDIR}/secring.gpg"
# Return error if not on cryptlist. # Return error if not on cryptlist.
function is_on_cryptlist() { function is_on_cryptlist() {
# Assumes $1 does NOT have the .gpg extension # Assumes $1 does NOT have the .gpg extension
local rname=$(vcs_relative_path "$1") file_contains_line "$(vcs_relative_path "$1")" "$BB_FILES"
grep -F -x -s -q "$rname" "$BB_FILES"
} }
# Exit with error if a file exists. # Exit with error if a file exists.
@@ -155,10 +154,10 @@ function add_filename_to_cryptlist() {
# However no matter what the datestamp is updated. # However no matter what the datestamp is updated.
local name=$(vcs_relative_path "$1") local name=$(vcs_relative_path "$1")
if grep -s -q "$name" "$BB_FILES" ; then if file_contains_line "$BB_FILES" "$name" ; then
echo ========== File is registered. No need to add to list. echo "========== File is registered. No need to add to list."
else else
echo ========== Adding file to list. echo "========== Adding file to list."
touch "$BB_FILES" touch "$BB_FILES"
sort -u -o "$BB_FILES" <(echo "$name") "$BB_FILES" sort -u -o "$BB_FILES" <(echo "$name") "$BB_FILES"
fi fi
@@ -169,7 +168,7 @@ function remove_filename_from_cryptlist() {
# If the name is not already on the list, this is a no-op. # If the name is not already on the list, this is a no-op.
local name=$(vcs_relative_path "$1") local name=$(vcs_relative_path "$1")
if ! grep -s -q "$name" "$BB_FILES" ; then if ! file_contains_line "$BB_FILES" "$name" ; then
echo ========== File is not registered. No need to remove from list. echo ========== File is not registered. No need to remove from list.
else else
echo ========== Removing file from list. echo ========== Removing file from list.
@@ -309,6 +308,11 @@ function remove_line() {
rm "$tempfile" rm "$tempfile"
} }
# Determine if a file contains a given line
function file_contains_line() {
grep -Fxsq "$2" "$1"
}
# #
# Portability Section: # Portability Section:
# #
@@ -515,7 +519,7 @@ function vcs_ignore_generic_file() {
file="$(vcs_relative_path "$2")" file="$(vcs_relative_path "$2")"
file="${file/\$\//}" file="${file/\$\//}"
file="$(echo "/$file" | sed 's/\([\*\?]\)/\\\1/g')" file="$(echo "/$file" | sed 's/\([\*\?]\)/\\\1/g')"
if ! grep -Fsx "$file" "$1" > /dev/null; then if ! file_contains_line "$1" "$file" ; then
echo "$file" >> "$1" echo "$file" >> "$1"
vcs_add "$1" vcs_add "$1"
fi fi
@@ -556,11 +560,11 @@ function vcs_notice_generic_file() {
file="$(vcs_relative_path "$2")" file="$(vcs_relative_path "$2")"
file="${file/\$\//}" file="${file/\$\//}"
file="$(echo "/$file" | sed 's/\([\*\?]\)/\\\1/g')" file="$(echo "/$file" | sed 's/\([\*\?]\)/\\\1/g')"
if grep -Fsx "$file" "$1" > /dev/null; then if file_contains_line "$1" "$file" ; then
remove_line "$1" "$file" remove_line "$1" "$file"
vcs_add "$1" vcs_add "$1"
fi fi
if grep -Fsx "${file:1}" "$1" > /dev/null; then if file_contains_line "$1" "${file:1}" ; then
echo "WARNING: Found a non-absolute ignore match in $1" echo "WARNING: Found a non-absolute ignore match in $1"
echo "WARNING: Confirm the pattern is intended to only exclude $file" echo "WARNING: Confirm the pattern is intended to only exclude $file"
echo "WARNING: If so, manually update the ignore file" echo "WARNING: If so, manually update the ignore file"