From e9bc885c355babf7851de31db8e1920dde752993 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 7 Nov 2012 00:17:08 -0500
Subject: organize the files

---
 src/librediff | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100755 src/librediff

(limited to 'src/librediff')

diff --git a/src/librediff b/src/librediff
new file mode 100755
index 0000000..1f39eb9
--- /dev/null
+++ b/src/librediff
@@ -0,0 +1,65 @@
+#!/bin/bash
+# Generates a patch for a nonfree PKGBUILD
+#
+# Copyright 2010 Nicolás Reynolds
+
+# ---------- GNU General Public License 3 ----------
+
+# This file is part of Parabola.
+
+# Parabola is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# Parabola is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with Parabola. If not, see <http://www.gnu.org/licenses/>.
+
+usage() {
+    echo "Usage: $0 <pkgname> [<pkgname2> ...]"
+    echo "Requirements:"
+    echo "* Have a <pkgname>/ directory with nonfree build scripts inside"
+    echo "* Have a <pkgname>-libre/ directory with libre build scripts inside"
+}
+
+# Load custom config or system-wide config
+custom_config=$XDG_CONFIG_HOME/libretools/libretools.conf
+if [ -e $custom_config ]; then
+    source $custom_config
+else
+    source /etc/libretools.conf
+fi
+
+# Print usage if no package has been given
+[[ -z "$@" ]] && {
+    usage
+    exit 1
+}
+
+
+for package in $@; do
+# Continue on errors
+    [[ ! -d ./${package} || ! -d ./${package}-libre ]] && {
+        error "no matching ${package} and ${package}-libre found"
+        continue
+    }
+
+    [[ ! -f ./${package}/PKGBUILD || ! -f ./${package}-libre/PKGBUILD ]] && {
+        error "no matching PKGBUILDs found for ${package}-libre"
+        continue
+    }
+
+    source ./${package}-libre/PKGBUILD
+    [[ -z ${pkgbase} ]] && pkgbase=${pkgname}
+
+# Generate a diff file, no -r since we don't want to patch src/ nor pkg/
+    diff -auN ${package} ${package}-libre > $PATCHDIR/${pkgbase}-${pkgver}-${pkgrel}.patch
+
+done
+
+exit 0
-- 
cgit v1.2.3-2-g168b


From b72653f654882335026d04de5c25ea02c20e8412 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Tue, 13 Nov 2012 14:19:36 -0500
Subject: clean up some misc scripts

---
 src/librediff | 60 ++++++++++++++++++++++++++---------------------------------
 1 file changed, 26 insertions(+), 34 deletions(-)

(limited to 'src/librediff')

diff --git a/src/librediff b/src/librediff
index 1f39eb9..6dbe41b 100755
--- a/src/librediff
+++ b/src/librediff
@@ -20,46 +20,38 @@
 # You should have received a copy of the GNU General Public License
 # along with Parabola. If not, see <http://www.gnu.org/licenses/>.
 
-usage() {
-    echo "Usage: $0 <pkgname> [<pkgname2> ...]"
-    echo "Requirements:"
-    echo "* Have a <pkgname>/ directory with nonfree build scripts inside"
-    echo "* Have a <pkgname>-libre/ directory with libre build scripts inside"
-}
+. /etc/libretools.conf
 
-# Load custom config or system-wide config
-custom_config=$XDG_CONFIG_HOME/libretools/libretools.conf
-if [ -e $custom_config ]; then
-    source $custom_config
-else
-    source /etc/libretools.conf
-fi
+cmd=${0##*/}
 
-# Print usage if no package has been given
-[[ -z "$@" ]] && {
-    usage
-    exit 1
+usage() {
+    echo "Usage: $cmd <pkgname> [<pkgname2> ...]"
+    echo "Requirements:"
+    echo " * Have a <pkgname>/ directory with nonfree build scripts inside"
+    echo " * Have a <pkgname>-libre/ directory with libre build scripts inside"
 }
 
+main() {
+	local packages=("$@")
+	if [[ ${packages[#]} = 0 ]]; then
+		usage
+		exit 1
+	fi
 
-for package in $@; do
-# Continue on errors
-    [[ ! -d ./${package} || ! -d ./${package}-libre ]] && {
-        error "no matching ${package} and ${package}-libre found"
-        continue
-    }
-
-    [[ ! -f ./${package}/PKGBUILD || ! -f ./${package}-libre/PKGBUILD ]] && {
-        error "no matching PKGBUILDs found for ${package}-libre"
-        continue
-    }
+	for package in "${packages[@]}"; do
+		if [[ ! -f ./${package}/PKGBUILD  || ! -f ./${package}-libre/PKGBUILD ]]
+		then
+			error "Build scripts not found for ${package}(-libre)"
+		else
 
-    source ./${package}-libre/PKGBUILD
-    [[ -z ${pkgbase} ]] && pkgbase=${pkgname}
+		. ./${package}-libre/PKGBUILD
+		[[ -z ${pkgbase} ]] && pkgbase=${pkgname}
 
-# Generate a diff file, no -r since we don't want to patch src/ nor pkg/
-    diff -auN ${package} ${package}-libre > $PATCHDIR/${pkgbase}-${pkgver}-${pkgrel}.patch
+		# Generate a diff file, no -r since we don't want to patch src/ nor pkg/
+		diff -auN ${package} ${package}-libre > $PATCHDIR/${pkgbase}-${pkgver}-${pkgrel}.patch
+	done
 
-done
+	exit 0
+}
 
-exit 0
+main "$@"
-- 
cgit v1.2.3-2-g168b