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

is_on_cryptlist reversed arguments to file_contains_line()

Browse Source
This commit is contained in:
tlimoncelli@stackexchange.com
2015-06-15 20:32:35 +00:00
parent 12943b3021
commit c129d06ea0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/_blackbox_common.sh
View File

@@ -68,7 +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
file_contains_line "$(vcs_relative_path "$1")" "$BB_FILES" file_contains_line "$BB_FILES" "$(vcs_relative_path "$1")"
} }
# Exit with error if a file exists. # Exit with error if a file exists.
@@ -309,7 +309,9 @@ function remove_line() {
# Determine if a file contains a given line # Determine if a file contains a given line
function file_contains_line() { function file_contains_line() {
grep -Fxsq "$2" "$1" # $1: the file
# $2: the line
grep -xsqF "$2" "$1"
} }
# #