import changes from repo

6 files changed, 71 insertions, 10 deletions

diff --git a/README-WORKING-ON b/README-WORKING-ON
new file mode 100644
index 0000000..fdc0978
--- /dev/null
+++ b/README-WORKING-ON
@@ -0,0 +1,10 @@
+Message from aurelien.
+
+Working on #bug 5 https://labs.parabola.nu/issues/5
+
+db-update~old is the untouched file
+
+db-update is the testing file
+
+
+db-update-mailer is another (testing) one for the moment. in cron/
diff --git a/abslibre b/abslibre
index 6b21d24..72171f1 100755
--- a/abslibre
+++ b/abslibre
@@ -52,13 +52,8 @@ function get_blacklist() {
 function sync_abs_libre() {
 
 	# Clone ABSLibre git repo
-	if [ -d /tmp/abslibre/.git ]; then
-		pushd /tmp/abslibre >/dev/null 2>&1
-		git pull
-		popd  >/dev/null 2>&1
-	else
-		git clone "$ABSGIT" /tmp/abslibre
-	fi
+	rm -rf /tmp/abslibre
+	git clone "$ABSGIT" /tmp/abslibre
 
 	# Sync from ABS and then sync from ABSLibre
 	printf ":: Syncing ABSLibre...\t"
diff --git a/cron-jobs/db-update-mailer b/cron-jobs/db-update-mailer
new file mode 100644
index 0000000..35ff204
--- /dev/null
+++ b/cron-jobs/db-update-mailer
@@ -0,0 +1,26 @@
+#!/bin/bash
+# Dummy helper to send email to parabola-dev
+# It does nothing if no output
+# Aurélien DESBRIERES <aurelien@xload.io>
+# GPL v3 or later.
+# testing version !!!
+
+LIST="maintenance@lists.parabolagnulinux.org"
+FROM="maintenance@lists.parabolagnulinux.org"
+
+SUBJECT="Database Updated $(date +"%d-%m-%Y")"
+if [ $db-update  1 ]; then
+    SUBJECT="$1 $(date +"%d-%m-%Y")"
+fi
+
+stdin="$(cat)"
+#echo used to strip whitespace for checking for actual data
+if [ -n "$(echo $stdin)" ]; then
+
+echo "Subject: $SUBJECT
+To: $LIST
+From: $FROM
+
+$stdin" | /usr/sbin/sendmail -F$FROM "$LIST"
+
+fi
diff --git a/cron-jobs/db-update-mailer~ b/cron-jobs/db-update-mailer~
new file mode 100644
index 0000000..ca2e46b
--- /dev/null
+++ b/cron-jobs/db-update-mailer~
@@ -0,0 +1,28 @@
+#!/bin/bash
+#Dummy helper to send email to arch-dev
+# It does nothing if no output
+
+LIST="arch-dev-public@archlinux.org"
+#LIST="aaronmgriffin@gmail.com"
+FROM="repomaint@archlinux.org"
+
+SUBJECT="Repository Maintenance $(date +"%d-%m-%Y")"
+if [ $# -ge 1 ]; then
+    SUBJECT="$1 $(date +"%d-%m-%Y")"
+fi
+
+if [ $# -ge 2 ]; then
+    LIST="$2"
+fi
+
+stdin="$(cat)"
+#echo used to strip whitespace for checking for actual data
+if [ -n "$(echo $stdin)" ]; then
+
+echo "Subject: $SUBJECT
+To: $LIST
+From: $FROM
+
+$stdin" | /usr/sbin/sendmail -F$FROM "$LIST"
+
+fi
diff --git a/db-sync b/db-sync
index 2194fe6..facfae9 100755
--- a/db-sync
+++ b/db-sync
@@ -14,6 +14,8 @@
 # TODO
 # * make a tarball of files used for forensics
 
+set -e
+
 # Run as `V=true db-sync` to get verbose output
 VERBOSE=${V}
 extra=()
@@ -71,7 +73,7 @@ init() {
 	# Traverse all repo-arch pairs
 	for _repo in "${ARCHREPOS[@]}"; do
 		for _arch in "${ARCHARCHES[@]}"; do
-			msg "Processing %s-%s" "${_repo}-${_arch}"
+			msg "Processing %s-%s" "${_repo}" "${_arch}"
 
 			db_file=$(get_repo_file "${_repo}" "${_arch}")${DBEXT}
 			files_file=$(get_repo_file "${_repo}" "${_arch}")${FILESEXT}
diff --git a/db-sync.conf b/db-sync.conf
index f7748c3..24fc44d 100644
--- a/db-sync.conf
+++ b/db-sync.conf
@@ -1,7 +1,7 @@
-#mirror="mirrors.kernel.org"
-mirror="mirrors.niyawe.de"
+mirror="mirrors.kernel.org"
 
 ## mirrors without sources folder
+#mirror="mirrors.niyawe.de"
 #mirror="mirror.nl.leaseweb.net"
 #mirror="mirror.one.com"
 #mirror="mirror.us.leaseweb.net"