diff options
author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-04-16 14:05:43 -0500 |
---|---|---|
committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-04-16 14:05:43 -0500 |
commit | 0bb0476a6cff7b5ad79c518bcb95c6ee170b0ac9 (patch) | |
tree | c327ff49f49200ddc184a4e1a2f1aee7144c4c87 /db-move | |
parent | 375f87c696cb7838c17922a83e956adbec8ef414 (diff) | |
parent | 1ce0c6368d0908e25f9bd1bb8183b5f29053fac8 (diff) |
Merge branch 'master' of git://projects.archlinux.org/dbscripts
Conflicts:
db-functions
Diffstat (limited to 'db-move')
-rwxr-xr-x | db-move | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -36,7 +36,7 @@ for pkgbase in ${args[@]:2}; do die "Could not read pkgname" fi - pkgver=$(. "${svnrepo_from}/PKGBUILD"; echo "${pkgver}-${pkgrel}") + pkgver=$(. "${svnrepo_from}/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel})) if [ -z "${pkgver}" ]; then die "Could not read pkgver" fi @@ -75,7 +75,7 @@ for pkgbase in ${args[@]:2}; do fi msg2 "${pkgbase} ($(echo ${tarches[@]}))" pkgnames=($(. "${svnrepo_from}/PKGBUILD"; echo ${pkgname[@]})) - pkgver=$(. "${svnrepo_from}/PKGBUILD"; echo "${pkgver}-${pkgrel}") + pkgver=$(. "${svnrepo_from}/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel})) if [ -d "${svnrepo_to}" ]; then /usr/bin/svn rm --force -q "${svnrepo_to}" @@ -96,6 +96,9 @@ for pkgbase in ${args[@]:2}; do cp ${pkgpath} ${FTP_BASE}/${PKGPOOL} fi ln -s "../../../${PKGPOOL}/${pkgfile}" ${ftppath_to}/${tarch}/ + if [ -f ${FTP_BASE}/${PKGPOOL}/${pkgfile}.sig ]; then + ln -s "../../../${PKGPOOL}/${pkgfile}.sig" ${ftppath_to}/${tarch}/ + fi add_pkgs[${tarch}]+="${FTP_BASE}/${PKGPOOL}/${pkgfile} " remove_pkgs[${tarch}]+="${pkgname} " done |