deployiso: clean up code

This commit is contained in:
udeved 2017-02-16 10:22:42 +01:00
parent e61c6dbf10
commit c642392ceb
2 changed files with 1 additions and 22 deletions

View file

@ -31,7 +31,6 @@ display_settings(){
show_config
msg "PROFILE:"
msg2 "list_dir_iso: %s" "${list_dir_iso}"
msg2 "build_lists: %s" "$(show_build_lists ${list_dir_iso})"
msg2 "build_list_iso: %s" "${build_list_iso}"
msg2 "is_build_list: %s" "${is_build_list}"
@ -44,7 +43,6 @@ display_settings(){
msg2 "update: %s" "${update}"
msg2 "release: %s" "${release}"
msg2 "verbose: %s" "${verbose}"
# msg2 "rsync_args: %s" "${rsync_args[*]}"
msg2 "torrent: %s" "${torrent}"
if ${torrent};then

View file

@ -9,18 +9,6 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# get_project(){
# local project
# case "$1" in
# 'community') project='manjarolinux-community' ;;
# 'manjaro') project='manjarolinux' ;;
# 'sonar') project='sonargnulinux' ;;
# # manjarotest
# # manjarotest-community
# esac
# echo ${project}
# }
create_release(){
msg "Create release (%s) ..." "${target_dir}"
rsync ${rsync_args[*]} /dev/null ${url}/${profile}/
@ -29,13 +17,6 @@ create_release(){
msg "Done (%s)" "${target_dir}"
}
get_edition(){
local result=$(find ${run_dir} -maxdepth 2 -name "${profile}") path
[[ -z $result ]] && die "%s is not a valid profile or build list!" "${profile}"
path=${result%/*}
echo ${path##*/}
}
connect(){
local home="/home/frs/project"
echo "${account},${project}@frs.${host}:${home}/${project}"
@ -65,7 +46,7 @@ make_torrent(){
prepare_transfer(){
profile="$1"
edition=$(get_edition)
edition=$(get_edition "${profile}")
url=$(connect)
target_dir="${profile}/${dist_release}"