From 67485704135ef41d907a4c93db5fbcaee3960bc2 Mon Sep 17 00:00:00 2001
From: Travis Willard <travis@archlinux.org>
Date: Sun, 13 Jan 2008 14:53:29 -0500
Subject: [PATCH] Improve makepkg config loading for checkpkg and extrapkg.
Now, checkpkg and extrapkg will fail if /etc/makepkg.conf doesn't exist, and will also try to load in personal user's settings in ~/.makepkg.conf
Signed-off-by: Travis Willard <travis@archlinux.org>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
checkpkg | 13 ++++++++++++-
extrapkg | 13 ++++++++++++-
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/checkpkg b/checkpkg
index cd08121..2cffa78 100755
--- a/checkpkg
+++ b/checkpkg
@@ -1,6 +1,17 @@
#!/bin/bash
-source /etc/makepkg.conf
+# Source makepkg.conf; fail if it is not found
+if [ -r "/etc/makepkg.conf" ]; then
+ source "/etc/makepkg.conf"
+else
+ echo "/etc/makepkg.conf not found!"
+ exit 1
+fi
+
+# Source user-specific makepkg.conf overrides
+if [ -r ~/.makepkg.conf ]; then
+ source ~/.makepkg.conf
+fi
strip_url() {
echo $1 | sed 's|^.*://.*/||g'
diff --git a/extrapkg b/extrapkg
index 437b330..e4708ac 100755
--- a/extrapkg
+++ b/extrapkg
@@ -1,6 +1,17 @@
#!/bin/bash
-source /etc/makepkg.conf
+# Source makepkg.conf; fail if it is not found
+if [ -r "/etc/makepkg.conf" ]; then
+ source "/etc/makepkg.conf"
+else
+ echo "/etc/makepkg.conf not found!"
+ exit 1
+fi
+
+# Source user-specific makepkg.conf overrides
+if [ -r ~/.makepkg.conf ]; then
+ source ~/.makepkg.conf
+fi
cmd=`basename $0`
--
GitLab