mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 12:03:31 +01:00
pkg.sh: Fix target directory layout for CentOS
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
75fb193ad7
commit
6e14ee930f
1 changed files with 27 additions and 4 deletions
|
|
@ -528,11 +528,34 @@ upload_file()
|
||||||
[ "$upload_file_attrib" ] && upload_attrib="$upload_file_attrib"
|
[ "$upload_file_attrib" ] && upload_attrib="$upload_file_attrib"
|
||||||
|
|
||||||
local target
|
local target
|
||||||
if [ "$t" = tgz ]; then
|
case "$t" in
|
||||||
|
tgz)
|
||||||
target=$target_base/$t/$f:$upload_attrib
|
target=$target_base/$t/$f:$upload_attrib
|
||||||
else
|
;;
|
||||||
target=$target_base/rpm/$t/$f:$upload_attrib
|
src)
|
||||||
fi
|
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"
|
echo "+ uploading $target"
|
||||||
RSYNC_RSH=$SSH /bin/bash $MOD_SCRIPT_DIR/upload.sh $DIST_PCKG_DIR/$f $target
|
RSYNC_RSH=$SSH /bin/bash $MOD_SCRIPT_DIR/upload.sh $DIST_PCKG_DIR/$f $target
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue