[deployiso] clean up code

This commit is contained in:
udeved 2015-11-20 22:23:02 +01:00
parent 733ae26070
commit ed5b947cd0

View file

@ -29,10 +29,11 @@ show_upload_queue(){
msg2 "src_dir: ${src_dir}"
done
else
msg3 "Iso: ${buildset_iso}"
msg3 "Upload: ${buildset_iso}"
eval_edition "${buildset_iso}"
set_src_dir ${buildset_iso}
msg2 "src_dir: ${src_dir}"
msg2 "iso_edition: ${iso_edition}"
fi
}
@ -46,12 +47,8 @@ display_settings(){
msg2 "buildset_iso: ${buildset_iso}"
msg2 "is_buildset: ${is_buildset}"
# msg "OPTIONS:"
# msg2 "buildset_iso: ${buildset_iso}"
msg "HOST:"
msg2 "dist_release: ${dist_release}"
# msg2 "src_dir: ${src_dir}"
msg "REMOTE:"
msg2 "remote_url: ${remote_url}"
@ -70,8 +67,6 @@ load_config "${SYSCONFDIR}/manjaro-tools.conf"
pretend=false
#src_dir=${cache_dir}/iso
usage() {
echo "Usage: ${0##*/} [options]"
echo " -p Source folder to upload [default:${buildset_iso}]"
@ -97,18 +92,10 @@ shift $(($OPTIND - 1))
timer_start=$(get_timer)
if [[ -z ${buildset_iso} ]];then
up_dirs=$(ls ${src_dir})
fi
eval_buildset "${buildset_iso}" "${sets_dir_iso}"
# eval_edition "${buildset_iso}"
sf_url=${remote_user},${remote_project}@frs.${remote_url}:${remote_target}/${remote_project}
#shell_url=${remote_user},${remote_project}@shell.${remote_url}
# src_dir=${src_dir}/${iso_edition}/${dist_release}/${buildset_iso}
shell_url=${remote_user},${remote_project}@shell.${remote_url}
${pretend} && display_settings && exit 1