From 47ee86bd9b625367f2246540f4c56e1b60b621d1 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Mon, 17 Jul 2017 14:49:26 -0400 Subject: Properly escape and quote regular expressions --- libs/project | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libs') diff --git a/libs/project b/libs/project index 0f30ace3..0e5e8690 100755 --- a/libs/project +++ b/libs/project @@ -23,7 +23,7 @@ PROJECT_ACTIONS_FUNCTIONS=( "${PROJECT_ACTIONS_HELPERS[@]}" ) -INSTALL_REGEX="\([^:]*\):\(.*\)" +INSTALL_REGEX='\([^:]*\):\(.*\)' project_include() { local project=$1 @@ -776,7 +776,7 @@ project_build_check() { while read rule do - source=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\1/g" ) + source=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\1/g" ) source_path="$build_path/$source" # Source may contain a wildcard. @@ -858,10 +858,10 @@ project_install() { while read rule do - source=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\1/g" ) + source=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\1/g" ) source_path="$build_path/$source" - destination=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\2/g" ) + destination=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\2/g" ) destination_path="$install_path/$destination" destination_directory_path=$( dirname "$destination_path" ) @@ -899,10 +899,10 @@ project_install() { while read rule do - source=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\1/g" ) + source=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\1/g" ) source_path="$project_path/$INSTALL/$path/$source" - destination=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\2/g" ) + destination=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\2/g" ) destination_path="$install_path/$destination" destination_directory_path=$( dirname "$destination_path" ) @@ -952,7 +952,7 @@ project_install_check() { while read rule do - destination=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\2/g" ) + destination=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\2/g" ) destination_path="$install_path/$destination" if ! [ -f "$destination_path" ] && ! [ -d "$destination_path" ] @@ -986,7 +986,7 @@ project_install_check() { while read rule do - destination=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\2/g" ) + destination=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\2/g" ) destination_path="$install_path/$destination" if ! [ -f "$destination_path" ] && ! [ -d "$destination_path" ] -- cgit v1.2.3-70-g09d2 From 81b33ca0168641aa5c50e79c7bf9f3fe2d96c40c Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Mon, 17 Jul 2017 14:55:38 -0400 Subject: Prevent 'read' from interpreting backslash escapes --- libs/project | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'libs') diff --git a/libs/project b/libs/project index 0e5e8690..da05e9f9 100755 --- a/libs/project +++ b/libs/project @@ -237,7 +237,7 @@ project_action_projects() { fi # Multiple arguments can be read from the file. - while read arguments; do + while read -r arguments; do eval "project_action_arguments ${action} ${arguments}" done < "${path}" } @@ -774,13 +774,13 @@ project_build_check() { continue fi - while read rule + while read -r rule do source=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\1/g" ) source_path="$build_path/$source" # Source may contain a wildcard. - path_wildcard_expand "$source_path" | while read source_file_path + path_wildcard_expand "$source_path" | while read -r source_file_path do if ! [ -f "$source_file_path" ] && ! [ -d "$source_file_path" ] then @@ -856,7 +856,7 @@ project_install() { project_build_directory_missing_empty_error "$project" "$@" - while read rule + while read -r rule do source=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\1/g" ) source_path="$build_path/$source" @@ -868,7 +868,7 @@ project_install() { mkdir -p "$destination_directory_path" # Source may contain a wildcard. - path_wildcard_expand "$source_path" | while read source_file_path + path_wildcard_expand "$source_path" | while read -r source_file_path do cp -rT "$source_file_path" "$destination_path" done @@ -897,7 +897,7 @@ project_install() { continue fi - while read rule + while read -r rule do source=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\1/g" ) source_path="$project_path/$INSTALL/$path/$source" @@ -909,7 +909,7 @@ project_install() { mkdir -p "$destination_directory_path" # Source may contain a wildcard. - path_wildcard_expand "$source_path" | while read source_file_path + path_wildcard_expand "$source_path" | while read -r source_file_path do cp -rT "$source_file_path" "$destination_path" done @@ -950,7 +950,7 @@ project_install_check() { project_build_directory_missing_empty_error "$project" "$@" - while read rule + while read -r rule do destination=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\2/g" ) destination_path="$install_path/$destination" @@ -984,7 +984,7 @@ project_install_check() { continue fi - while read rule + while read -r rule do destination=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\2/g" ) destination_path="$install_path/$destination" @@ -1206,7 +1206,7 @@ project_release_install() { local files=$( cd "$install_path" && find -type f || true ) local file - printf '%s\n' "$files" | while read file + printf '%s\n' "$files" | while read -r file do path="$release_path/$file" directory_path=$( dirname "$path" ) @@ -1233,7 +1233,7 @@ project_release_install_check() { local files=$( cd "$install_path" && find -type f || true ) local file - printf '%s\n' "$files" | while read file + printf '%s\n' "$files" | while read -r file do path="$release_path/$file" -- cgit v1.2.3-70-g09d2 From 9bc79485d333ab84ce4ccf3269df11001de82eaf Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Mon, 17 Jul 2017 15:02:58 -0400 Subject: Make explicit which directory 'find' should search --- libs/project | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs') diff --git a/libs/project b/libs/project index da05e9f9..a7ed8b87 100755 --- a/libs/project +++ b/libs/project @@ -1203,7 +1203,7 @@ project_release_install() { project_install_directory_missing_empty_error "$project" "$@" - local files=$( cd "$install_path" && find -type f || true ) + local files=$( find "$install_path" -type f || true ) local file printf '%s\n' "$files" | while read -r file @@ -1230,7 +1230,7 @@ project_release_install_check() { project_install_directory_missing_empty_error "$project" "$@" - local files=$( cd "$install_path" && find -type f || true ) + local files=$( find "$install_path" -type f || true ) local file printf '%s\n' "$files" | while read -r file -- cgit v1.2.3-70-g09d2 From c2d613cdb887f64856540837a61d69d7c68119cc Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Mon, 17 Jul 2017 15:05:59 -0400 Subject: Word-split PROJECTS_FORCE expansion (remove quotes) --- libs/project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs') diff --git a/libs/project b/libs/project index a7ed8b87..d5c6dd1a 100755 --- a/libs/project +++ b/libs/project @@ -111,7 +111,7 @@ project_action_check() { return 1 fi - for project_force in "${PROJECTS_FORCE}"; do + for project_force in ${PROJECTS_FORCE}; do if [[ "${project_force}" == "${project}" ]]; then return 1 fi -- cgit v1.2.3-70-g09d2 From 3adb05d41dd7346c452359a694b629ce37c17272 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Mon, 17 Jul 2017 15:24:21 -0400 Subject: Avoid checking previous exit codes indirectly --- libs/project | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'libs') diff --git a/libs/project b/libs/project index d5c6dd1a..f18157de 100755 --- a/libs/project +++ b/libs/project @@ -87,13 +87,11 @@ project_action() { printf '%s\n' "Project ${project} ${action} (with ${arguments:-no argument})" >&2 - "${action}" "$@" - - if [[ "$?" -ne 0 ]]; then + if "${action}" "$@"; then + printf '\n%s\n' "Project ${project} ${action} (with ${arguments:-no argument}) completed" >&2 + else printf '\n%s\n' "Project ${project} ${action} (with ${arguments:-no argument}) failed" >&2 return 1 - else - printf '\n%s\n' "Project ${project} ${action} (with ${arguments:-no argument}) completed" >&2 fi ) } @@ -195,9 +193,9 @@ project_action_arguments_recursive() { local argument local ifs_save - action_helper_arguments="$(project_action_helper 'arguments' "${project}" "$@")" + action_helper_arguments="$(project_action_helper 'arguments' "${project}" "$@" || true)" - if [[ "$?" -ne 0 ]] || [[ -z "${action_helper_arguments}" ]]; then + if [[ -z "${action_helper_arguments}" ]]; then project_action "${action}" "${project}" "$@" else # This it to allow space characters in arguments. -- cgit v1.2.3-70-g09d2 From b6a666bf6e4c81660a0862b0db4dc9a13b75d49e Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Mon, 17 Jul 2017 15:41:59 -0400 Subject: Use "$*" instead of $@ when assigning as a string The local variable 'arguments' always stores the positional parameters passed to it as a string, not an array of strings, so usage of "$*" makes more sense here instead of $@. --- libs/project | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'libs') diff --git a/libs/project b/libs/project index f18157de..a9461b28 100755 --- a/libs/project +++ b/libs/project @@ -78,7 +78,7 @@ project_action() { shift local project="$1" shift - local arguments="$@" + local arguments="$*" ( set +e @@ -156,7 +156,7 @@ project_action_arguments_verify_recursive() { local action_helper_arguments # Store final argument. - local argument="${@:$#}" + local argument="${*:$#}" local test @@ -328,7 +328,7 @@ project_sources_directory_filled_check() { project_sources_directory_filled_error() { local project=$1 shift - local arguments=$@ + local arguments="$*" local sources_path=$( project_sources_path "$project" "$@" ) @@ -344,7 +344,7 @@ project_sources_directory_filled_error() { project_sources_directory_missing_empty_error() { local project=$1 shift - local arguments=$@ + local arguments="$*" local sources_path=$( project_sources_path "$project" "$@" ) @@ -391,7 +391,7 @@ project_sources_archive() { project_sources_archive_extract() { local project=$1 shift - local arguments=$@ + local arguments="$*" local archive=$( project_sources_archive "$project" "$@" ) local destination=$( dirname "$archive" ) @@ -405,7 +405,7 @@ project_sources_archive_extract() { project_sources_archive_update() { local project=$1 shift - local arguments=$@ + local arguments="$*" local repository=$project local sources_path=$( project_sources_path "$project" "$repository" "$@" ) @@ -426,7 +426,7 @@ project_sources_archive_update() { project_sources_archive_missing_error() { local project=$1 shift - local arguments=$@ + local arguments="$*" local archive=$( project_sources_archive "$project" "$@" ) if [ -z "$archive" ] || ! [ -f "$archive" ] @@ -807,7 +807,7 @@ project_build_path() { project_build_directory_missing_empty_error() { local project=$1 shift - local arguments=$@ + local arguments="$*" local build_path=$( project_build_path "$project" "$@" ) @@ -1013,7 +1013,7 @@ project_install_path() { project_install_directory_missing_empty_error() { local project=$1 shift - local arguments=$@ + local arguments="$*" local install_path=$( project_install_path "$project" "$@" ) @@ -1123,7 +1123,7 @@ project_release_sources_archive_path() { project_release_sources_archive_create() { local project=$1 shift - local arguments=$@ + local arguments="$*" local repository=$project local archive_path=$( project_release_sources_archive_path "$project" "$@" ) @@ -1262,7 +1262,7 @@ project_release_install_archive_create() { shift local prefix=$1 shift - local arguments=$@ + local arguments="$*" local install_path=$( project_install_path "$project" "$@" ) local archive_path=$( project_release_archive_path "$project" "$prefix" "$@" ) @@ -1310,7 +1310,7 @@ project_release_install_rootfs_create() { shift local prefix=$1 shift - local arguments=$@ + local arguments="$*" local install_path=$( project_install_path "$project" "$@" ) local rootfs_path=$( project_release_rootfs_path "$project" "$prefix" "$@" ) -- cgit v1.2.3-70-g09d2 From a57da0e3e8619525afdb338cc03ea6887306c6fb Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Mon, 17 Jul 2017 16:29:47 -0400 Subject: Change '.' to the more readable 'source' command --- libs/project | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs') diff --git a/libs/project b/libs/project index a9461b28..bcb73f16 100755 --- a/libs/project +++ b/libs/project @@ -32,7 +32,7 @@ project_include() { unset -f "${PROJECT_ACTIONS_FUNCTIONS[@]}" - . "$project_path/$project" + source "$project_path/$project" project_helper_include "$project" } @@ -45,7 +45,7 @@ project_helper_include() { if [ -f "$include" ] then - . "$include" + source "$include" fi } -- cgit v1.2.3-70-g09d2