From efe47d21b7d1f629004159b618f15479418b7d7a Mon Sep 17 00:00:00 2001 From: Ivan Rako Date: Wed, 31 Oct 2007 09:09:57 +0000 Subject: [PATCH] r12: --- carnet-debconf-get | 8 -------- debian/control | 2 +- install-carnet-debian | 7 ++++++- 3 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 carnet-debconf-get diff --git a/carnet-debconf-get b/carnet-debconf-get deleted file mode 100644 index 3c619bf..0000000 --- a/carnet-debconf-get +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - -. /usr/share/debconf/confmodule - -db_get $1 -echo $RET diff --git a/debian/control b/debian/control index 05c24cb..1286508 100644 --- a/debian/control +++ b/debian/control @@ -8,5 +8,5 @@ Standards-Version: 3.6.1 Package: carnet-debian Provides: carnet-debian-cn Architecture: all -Depends: debconf, apt-cn +Depends: debconf, apt-cn, carnet-tools-cn (>= 2.8) Description: Installer for CARNet Debian packages diff --git a/install-carnet-debian b/install-carnet-debian index bdb8759..cbf57df 100644 --- a/install-carnet-debian +++ b/install-carnet-debian @@ -2,7 +2,12 @@ set -e -packages="`carnet-debconf-get carnet-debian/packages 2>&1 | tr -d ','`" +. /usr/share/debconf/confmodule +. /usr/share/carnet-tools/functions.sh + +cp_db_get carnet-debian/packages + +packages="`echo $RET | tr -d ','`" if [ -z "$packages" ]; then echo "CN: No packages for install." -- 1.7.10.4