From: buildmaster <buildmaster@git.cephalix.eu>
Date: Wed, 19 Jun 2019 08:50:55 +0000 (+0200)
Subject: Make Makefile safer.
X-Git-Url: https://repo.cephalix.eu/gitweb/?a=commitdiff_plain;h=a1edcab2ec23bfe89949a5da1780683b1c709c4b;p=oss-pkg-tools.git

Make Makefile safer.
---

diff --git a/build_new_packages.sh b/build_new_packages.sh
index e489f7f..68e9156 100755
--- a/build_new_packages.sh
+++ b/build_new_packages.sh
@@ -1,10 +1,12 @@
-#!/bin/bash
+#!/bin/bash -x
 export LANG="en_EN"
 REPO=/srv/www/repo/salt-packages/
 PACKAGES=/root/SALT-PACKAGES
 HERE=$(pwd)
 for P in $(cat PACKAGES)
 do
+	echo "##########################################"
+	echo "Processing $P"
 	if [ ! -d ${PACKAGES}/${P} ]; then
 		git clone git@git.cephalix.eu:SALT-PACKAGES/${P}.git ${PACKAGES}/${P}
 	else
@@ -12,12 +14,17 @@ do
 		OUT=$( git pull )
 		if [ "$OUT" = "Already up-to-date." ]; then
 			cd ${HERE}
+			echo "Package up to date"
 			continue;
 		fi
 	fi
 	cd ${PACKAGES}/${P}
 	CHANGED="yes"
-	make package
+	if [ -e repo-ng/repo-ng ]; then
+		rm repo-ng/repo-ng
+	fi
+	make package REPO=$REPO
+	echo "Done"
 	cd ${HERE}
 done