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

deployiso: ensure right path

Browse source
This commit is contained in:
udeved 2015-12-03 12:02:23 +01:00
parent d4924b7438
commit c55434ea13
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 ${edition_type}/$1 cd ${cache_dir_iso}/${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 ../.. cd ${cache_dir_iso}
} }
display_settings(){ display_settings(){
@ -67,6 +67,8 @@ load_user_info
load_config "${USER_CONFIG}/manjaro-tools.conf" load_config "${USER_CONFIG}/manjaro-tools.conf"
load_config "${SYSCONFDIR}/manjaro-tools.conf" load_config "${SYSCONFDIR}/manjaro-tools.conf"
run_dir=${cache_dir_iso}
pretend=false pretend=false
remote_create=false remote_create=false
update=false update=false

6
lib/util-publish.sh
View file

@ -30,12 +30,12 @@ prepare_transfer(){
sync_dir(){ sync_dir(){
eval_edition "$1" eval_edition "$1"
cd ${edition_type}/$1 cd ${cache_dir_iso}/${edition_type}/$1
prepare_transfer "$1" prepare_transfer "$1"
${remote_create} && create_subtree "$1" ${remote_create} && create_subtree "$1"
msg "Start upload [$1] ..." 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 ../.. cd ${cache_dir_iso}
} }