From 6e14ee930f883cadccbef71d16c554d029bf11a6 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 13 Dec 2018 10:03:19 +0000 Subject: [PATCH] pkg.sh: Fix target directory layout for CentOS Signed-off-by: Jan Lindemann --- scripts/pkg.sh | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/scripts/pkg.sh b/scripts/pkg.sh index 6c3ee378..5924f04c 100644 --- a/scripts/pkg.sh +++ b/scripts/pkg.sh @@ -528,11 +528,34 @@ upload_file() [ "$upload_file_attrib" ] && upload_attrib="$upload_file_attrib" local target - if [ "$t" = tgz ]; then + case "$t" in + tgz) target=$target_base/$t/$f:$upload_attrib - else - target=$target_base/rpm/$t/$f:$upload_attrib - fi + ;; + src) + case $os_name in + centos) + target=$target_base/Source/SPackages/$f:$upload_attrib + #/srv/ftp/pub/packages/jw-foss/centos/7/Source/SPackages/tecla-1.6.3-7.1.src.rpm + ;; + *) + target=$target_base/rpm/$t/$f:$upload_attrib + #/srv/ftp/pub/packages/jw-foss/suse/tumbleweed/rpm/src/jw-build-1.0.0-74.src.rpm + ;; + esac + ;; + *) + case $os_name in + centos) + target=$target_base/$t/Packages/$f:$upload_attrib + #/srv/ftp/pub/packages/jw-foss/centos/7/x86_64/Packages/tecla-devel-1.6.3-7.1.x86_64.rpm + ;; + *) + target=$target_base/rpm/$t/$f:$upload_attrib + #/srv/ftp/pub/packages/jw-foss/suse/tumbleweed/rpm/x86_64/jw-build-run-1.0.0-74.x86_64.rpm + ;; + esac + esac echo "+ uploading $target" RSYNC_RSH=$SSH /bin/bash $MOD_SCRIPT_DIR/upload.sh $DIST_PCKG_DIR/$f $target }