[deployiso] fix shell_url
This commit is contained in:
parent
6085296299
commit
baea1fcd72
1 changed files with 2 additions and 21 deletions
|
@ -17,6 +17,7 @@ SYSCONFDIR='@sysconfdir@'
|
||||||
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
||||||
|
|
||||||
import ${LIBDIR}/util.sh
|
import ${LIBDIR}/util.sh
|
||||||
|
import ${LIBDIR}/util-publish.sh
|
||||||
|
|
||||||
display_settings(){
|
display_settings(){
|
||||||
show_version
|
show_version
|
||||||
|
@ -40,26 +41,6 @@ display_settings(){
|
||||||
${is_sf} && msg2 "shell_url: ${shell_url}"
|
${is_sf} && msg2 "shell_url: ${shell_url}"
|
||||||
}
|
}
|
||||||
|
|
||||||
remote_login(){
|
|
||||||
ssh -t ${shell_url} create
|
|
||||||
# need a input param here for profile
|
|
||||||
mkdir -pv ${dist_release}/$isotype
|
|
||||||
exit
|
|
||||||
}
|
|
||||||
|
|
||||||
upload(){
|
|
||||||
msg "Start upload ..."
|
|
||||||
if ${is_sf};then
|
|
||||||
#sshpass -f ${remote_pwd} remote_login
|
|
||||||
local files=$(ls ${cache_dir_iso})
|
|
||||||
sshpass -f ${remote_pwd} rsync -vP --progress -e ssh $files ${sf_url}
|
|
||||||
else
|
|
||||||
msg3 "Do something here if not sf"
|
|
||||||
fi
|
|
||||||
msg "Done upload"
|
|
||||||
msg3 "Time ${FUNCNAME}: $(elapsed_time ${timer_start}) minutes"
|
|
||||||
}
|
|
||||||
|
|
||||||
load_user_info
|
load_user_info
|
||||||
|
|
||||||
load_config "${USER_CONFIG}/manjaro-tools.conf"
|
load_config "${USER_CONFIG}/manjaro-tools.conf"
|
||||||
|
@ -102,7 +83,7 @@ cache_dir_iso="${cache_dir}/iso"
|
||||||
|
|
||||||
if ${is_sf};then
|
if ${is_sf};then
|
||||||
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}:${remote_target}/${remote_project}
|
shell_url=${remote_user},${remote_project}@shell.${remote_url}
|
||||||
else
|
else
|
||||||
msg3 "Do something here if not sf"
|
msg3 "Do something here if not sf"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue