buildiso: tweak iso file name

deployiso: create release only once

bin/deployiso.in

@@ -42,7 +42,7 @@ display_settings(){
 
 	msg "ARGS:"
 	msg2 "update: %s" "${update}"
-	msg2 "release_create: %s" "${release_create}"
+	msg2 "release: %s" "${release}"
 	msg2 "verbose: %s" "${verbose}"
 	msg2 "rsync_args: %s" "${rsync_args[*]}"
 
@@ -63,7 +63,7 @@ load_config "${USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/ma
 run_dir=${cache_dir_iso}
 
 pretend=false
-release_create=false
+release=false
 update=false
 verbose=false
 
@@ -89,7 +89,7 @@ while getopts "${opts}" arg; do
 	case "${arg}" in
                 p) build_list_iso="$OPTARG" ;;
                 l) limit="$OPTARG" ;;
-                c) release_create=true ;;
+                c) release=true ;;
                 u) update=true; rsync_args+=(-u) ;;
                 v) verbose=true; rsync_args+=(-v --stats) ;;
 		q) pretend=true; rsync_args+=(-n) ;;
@@ -108,4 +108,6 @@ rsync_args+=(--bwlimit=${limit})
 
 ${pretend} && display_settings && exit 1
 
+${release} && create_release
+
 run sync_dir "${build_list_iso}"

lib/util-iso.sh

@@ -183,9 +183,10 @@ gen_iso_fn(){
 	local vars=() name
 	vars+=("${iso_name}")
 	[[ -n ${profile} ]] && vars+=("${profile}")
-	[[ ${edition} == 'community' ]] && vars+=("${edition}")
+# 	[[ ${edition} == 'community' ]] && vars+=("${edition}")
 	[[ ${initsys} == 'openrc' ]] && vars+=("${initsys}")
 	vars+=("${dist_release}")
+	vars+=("${target_branch}")
 	vars+=("${target_arch}")
 	for n in ${vars[@]};do
 		name=${name:-}${name:+-}${n}

lib/util-publish.sh

@@ -10,9 +10,10 @@
 # GNU General Public License for more details.
 
 create_release(){
-	msg2 "Create release (%s) ..." "${dist_release}"
+	msg "Create release (%s) ..." "${dist_release}"
 	rsync ${rsync_args[*]} /dev/null ${sf_url}/${dist_release}/
 	show_elapsed_time "${FUNCNAME}" "${timer_start}"
+	msg "Done (%s)" "${dist_release}"
 }
 
 get_edition(){
@@ -34,7 +35,6 @@ prepare_transfer(){
 
 sync_dir(){
 	prepare_transfer "$1"
-	${release_create} && create_release "$1"
 	msg "Start upload [%s] ..." "$1"
 	rsync ${rsync_args[*]} ${src_dir}/ ${sf_url}/${remote_dir}/
 	msg "Done upload [%s]" "$1"

lib/util.sh

@@ -142,10 +142,13 @@ show_elapsed_time(){
 }
 
 set_remote_project(){
-	case "$1" in
-		'community'|'minimal') remote_project='manjaro-community' ;;
-		'official') remote_project='manjaro' ;;
-	esac
+# 	case "$1" in
+# 		'community') remote_project='manjarolinux-community' ;;
+# 		'minimal') remote_project='manjarolinux-minimal' ;;
+# 		'official') remote_project='manjarolinux' ;;
+# 		'sonar') remote_project='sonargnulinux' ;;
+# 	esac
+	remote_project='manjaro-testing'
 }
 
 lock() {