make_repo_torrents: Fixparabola/20180925

1 files changed, 5 insertions, 3 deletions

diff --git a/cron-jobs/make_repo_torrents b/cron-jobs/make_repo_torrents
index 3da4556..5182b8f 100755
--- a/cron-jobs/make_repo_torrents
+++ b/cron-jobs/make_repo_torrents
@@ -22,12 +22,12 @@
 # so it's OK to just stuff all the torrents into a single directory.
 
 set -eE
+shopt -s extglob globstar nullglob
 . "$(dirname "$(readlink -e "$0")")/../config"
 . "$(dirname "$(readlink -e "$0")")/../torrent.conf"
-. "$(dirname "$(readlink -e "$0")")/../db-functions"
+. "$(librelib messages)"
 
 mkdir -p -- "${FTP_BASE}/${TORRENTPOOL}"
-cd "${FTP_BASE}/${TORRENTPOOL}"
 
 IFS=, # for ${TRACKERS[*]} and ${WEBSEEDS[*]}
 
@@ -44,7 +44,7 @@ make_torrent() {
 
 	if [[ -L "$pkgfile" ]]; then
 		target=$(readlink -- "$pkgfile")
-		make_torrent "$target"
+		make_torrent "${pkgfile%/*}/${target}"
 		ln -sT -- "${target}.torrent" "${pkgfile}.torrent"
 	else
 		# Create the .torrent
@@ -64,6 +64,8 @@ make_torrent() {
 	fi
 }
 
+msg 'Creating .torrent files...'
 for pkgfile in "$FTP_BASE"/*/os/*/*${PKGEXTS}; do
 	make_torrent "$pkgfile"
 done
+msg 'Done'