From fa3c63f5dc0627ae8618d10ed38c1006b1fff948 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Thu, 21 Feb 2008 20:03:57 +0100
Subject: Adding apt/aptitude options.

By using APT_OPTIONS and APTITUDE_OPTIONS in config/common,
one can manipulate the default options wich is made to each
and every apt and aptitude call.
---
 functions/defaults.sh |  3 +++
 functions/wrapper.sh  | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100755 functions/wrapper.sh

(limited to 'functions')

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 4214db14b..177520fc4 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -64,6 +64,9 @@ Set_defaults ()
 	# Setting apt pipeline
 	# LH_APT_PIPELINE
 
+	APT_OPTIONS="${APT_OPTIONS:---yes}"
+	APTITUDE_OPTIONS="${APTITUDE_OPTIONS:---assume-yes}"
+
 	# Setting apt recommends
 	case "${LH_MODE}" in
 		debian-edu)
diff --git a/functions/wrapper.sh b/functions/wrapper.sh
new file mode 100755
index 000000000..90144e740
--- /dev/null
+++ b/functions/wrapper.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# wrapper.sh - external command wrappers
+# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+Apt ()
+{
+	case "${LH_APT}" in
+		apt|apt-get)
+			Chroot "apt-get ${APT_OPTIONS} ${@}"
+			;;
+
+		aptitude)
+			Chroot "aptittude ${APTITUDE_OPTIONS} ${@}"
+			;;
+	esac
+}
-- 
cgit v1.2.3