starlingx/docs
Code Issues Proposed changes

Scope vars

Browse Source 
Minor cleanup on var scopes in functions.
Add support for prot selection.

Signed-off-by: Ron Stone <ronald.stone@windriver.com>
Change-Id: I9763a6d50631d357f7de11668b1f02d5cab898b1
This commit is contained in:
Ron Stone 2022-11-25 12:59:19 -05:00
parent c66d66783b
commit 0a562be887
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
get-remote-files.sh
View File

@ -3,6 +3,8 @@
# Fetch arbitrary files from a remote location for processing/ # Fetch arbitrary files from a remote location for processing/
# inclusion in local build. # inclusion in local build.
declare -A stx_repo
message () { echo -e "$@" 1>&2; } message () { echo -e "$@" 1>&2; }
usage_error () { usage_error () {
@ -42,28 +44,42 @@ get_remote () {
if [[ $no_branch = "t" ]]; then message "Branch ignored"; return; fi if [[ $no_branch = "t" ]]; then message "Branch ignored"; return; fi
local regex_br="^defaultbranch\=(.*)\s*$" local _regex_br="^defaultbranch\=(.*)\s*$"
local _remote=$(grep defaultbranch $branch_file) local _remote=$(grep defaultbranch $branch_file)
if [[ "${_remote}" =~ $regex_br ]] if [[ "${_remote}" =~ $_regex_br ]]
then then
remote="${BASH_REMATCH[1]}/" remote="${BASH_REMATCH[1]}"
else else
message "Can't find remote branch"; exit 1 message "Can't find remote branch"; exit 1
fi fi
for b in "${!stx_repo[@]}"
do
if [[ ${remote} == ${b} ]]
then
remote="${stx_repo[$b]}"
break
fi
done
remote="$remote/"
message "Remote is: $remote" message "Remote is: $remote"
} }
fetch_files () { fetch_files () {
for f in "${!remote_files[@]}"; do
local _f
for _f in "${!remote_files[@]}"; do
local _outfile local _outfile
case $out_method in case $out_method in
"file") "file")
_outfile="$common_target${remote_files[$f]}" _outfile="$common_target${remote_files[$_f]}"
if [ ! -d $(dirname $_outfile) ]; then mkdir -p `dirname $_outfile`; fi if [ ! -d $(dirname $_outfile) ]; then mkdir -p `dirname $_outfile`; fi
;; ;;
"stdout") "stdout")
@ -81,11 +97,11 @@ fetch_files () {
exit 1 exit 1
fi fi
wget -q -O $_outfile http://$remote_repo/$remote$f wget $addtional_flags -q -O $_outfile $prot://$remote_repo/$remote$_f
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
if [ ! -s $_outfile ]; then rm -f $_outfile; fi if [ ! -s $_outfile ]; then rm -f $_outfile; fi
message "Could not download ${remote_files[$f]}. Quiting" message "Could not download ${remote_files[$_f]}. Quiting"
exit 1 exit 1
fi fi

1
templates/events.sh
View File

@ -1,5 +1,6 @@
# If set, will be prepended to output paths # If set, will be prepended to output paths
common_target="tmp/" common_target="tmp/"
prot="http"
# The repo to download from # The repo to download from
remote_repo="opendev.org/starlingx/fault/raw/branch" remote_repo="opendev.org/starlingx/fault/raw/branch"