root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[deployiso] make it run anywhere in the filesystem

Browse source
This commit is contained in:
udeved 2015-12-03 16:05:21 +01:00
parent c55434ea13
commit 4564d5bb10
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/deployiso.in
View file

@ -21,12 +21,12 @@ import ${LIBDIR}/util-publish.sh
show_profile(){ show_profile(){
eval_edition "$1" eval_edition "$1"
cd ${cache_dir_iso}/${edition_type}/$1 cd ${run_dir}/${edition_type}/$1
msg3 "Iso: [$1]" msg3 "Iso: [$1]"
prepare_transfer "$1" prepare_transfer "$1"
msg2 "src_dir: ${src_dir}" msg2 "src_dir: ${src_dir}"
msg2 "remote_dir: ${remote_dir}" msg2 "remote_dir: ${remote_dir}"
cd ${cache_dir_iso} cd ${run_dir}
} }
display_settings(){ display_settings(){
@ -118,6 +118,8 @@ rsync_args+=(--bwlimit=${limit})
sf_url=${remote_user},${remote_project}@frs.${remote_url}:${remote_target}/${remote_project} sf_url=${remote_user},${remote_project}@frs.${remote_url}:${remote_target}/${remote_project}
shell_url=${remote_user},${remote_project}@shell.${remote_url} shell_url=${remote_user},${remote_project}@shell.${remote_url}
cd ${run_dir}
${pretend} && display_settings && exit 1 ${pretend} && display_settings && exit 1
run sync_dir "${buildset_iso}" run sync_dir "${buildset_iso}"

6
lib/util-publish.sh
View file

@ -25,17 +25,17 @@ create_subtree(){
prepare_transfer(){ prepare_transfer(){
remote_dir="${edition_type}/$1/${dist_release}/${arch}" remote_dir="${edition_type}/$1/${dist_release}/${arch}"
src_dir="${cache_dir_iso}/${remote_dir}" src_dir="${run_dir}/${remote_dir}"
} }
sync_dir(){ sync_dir(){
eval_edition "$1" eval_edition "$1"
cd ${cache_dir_iso}/${edition_type}/$1 cd ${run_dir}/${edition_type}/$1
prepare_transfer "$1" prepare_transfer "$1"
${remote_create} && create_subtree "$1" ${remote_create} && create_subtree "$1"
msg "Start upload [$1] (${arch}) ..." msg "Start upload [$1] (${arch}) ..."
rsync ${rsync_args[*]} ${src_dir}/ ${sf_url}/${remote_dir}/ rsync ${rsync_args[*]} ${src_dir}/ ${sf_url}/${remote_dir}/
msg "Done upload [$1]" msg "Done upload [$1]"
msg3 "Time ${FUNCNAME}: $(elapsed_time ${timer_start}) minutes" msg3 "Time ${FUNCNAME}: $(elapsed_time ${timer_start}) minutes"
cd ${cache_dir_iso} cd ${run_dir}
} }