From f0705d9460fb5a8de7b1617f2daf99781e34fb1a Mon Sep 17 00:00:00 2001
From: Esteban Carnevale <alfplayer@mailoo.org>
Date: Tue, 16 Dec 2014 13:31:14 -0300
Subject: libredbdiff-standalone: Improve enabling repos

---
 libredbdiff-standalone | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/libredbdiff-standalone b/libredbdiff-standalone
index 63f17a2..eee0a65 100755
--- a/libredbdiff-standalone
+++ b/libredbdiff-standalone
@@ -36,6 +36,13 @@ else
   UPDATE=1
 fi
 
+enable_repo() {
+    repo="$1"
+    echo "Enabling repo \"$repo\" in ${conffile}"
+    sed -i "s/\#\[$repo\]/[$repo]/" "${conffile}"
+    sed -i "\/\[$repo\]/,+1 s/#Include/Include/" "${conffile}"
+}
+
 if (( $UPDATE )) ; then
   [[ $EUID != 0 ]] && { error "To initialize $progname or update $progname pacman databases, the script must be run as root. Nothing done." ; }
  
@@ -69,18 +76,10 @@ if (( $UPDATE )) ; then
   downloadfile "${conffile}" "Downloading Parabola pacman.conf" "https://projects.parabola.nu/abslibre.git/plain/libre/pacman/pacman.conf.x86_64"
   if [[ $? == 255 ]] ; then
     sed -i "s|^#DBPath .*|DBPath = ${dbpath}|" "${conffile}"
-    echo "Enabling nonprism repo in ${conffile}"
-    sed -i "s/\#\[nonprism\]/[nonprism]/" "${conffile}"
-    sed -i "\/\[nonprism\]/,+1 s/#Include/Include/" "${conffile}"
-    echo "Enabling pcr repo in ${conffile}"
-    sed -i "s/\#\[pcr\]/[pcr]/" "${conffile}"
-    sed -i "\/\[pcr\]/,+1 s/#Include/Include/" "${conffile}"
-    echo "Enabling libre-multilib repo in ${conffile}"
-    sed -i "s/\#\[libre-multilib\]/[libre-multilib]/" "${conffile}"
-    sed -i "\/\[libre-multilib\]/,+1 s/#Include/Include/" "${conffile}"
-    echo "Enabling multilib repo in ${conffile}"
-    sed -i "s/\#\[multilib\]/[multilib]/" "${conffile}"
-    sed -i "\/\[multilib\]/,+1 s/#Include/Include/" "${conffile}"
+    enable_repo nonprism "${conffile}"
+    enable_repo pcr "${conffile}"
+    enable_repo libre-multilib "${conffile}"
+    enable_repo multilib "${conffile}"
   fi
 
   downloadfile "${conffilearch}" "Downloading Arch pacman.conf" "https://projects.archlinux.org/svntogit/packages.git/plain/pacman/trunk/pacman.conf.x86_64"
@@ -88,9 +87,7 @@ if (( $UPDATE )) ; then
     sed -i "s|^#DBPath .*|DBPath = ${dbpatharch}|" "${conffilearch}"
     echo "Setting Arch mirrorlist file in ${conffilearch}"
     sed -i "s|/etc/pacman\.d/mirrorlist$|$baseconfpath/mirrorlist.archlinux|" "${conffilearch}"
-    echo "Enabling multilib repo in ${conffilearch}"
-    sed -i "s/\#\[multilib\]/[multilib]/" "${conffilearch}"
-    sed -i "\/\[multilib\]/,+1 s/#Include/Include/" "${conffilearch}"
+    enable_repo multilib "${conffilearch}"
   fi
 
   setmirror() {
-- 
cgit v1.2.3