From 2d698b6e42d8dca191ac795ef5dba3bf62496eec Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri, 9 Apr 2010 16:13:32 -0700
Subject: Integrate bash 3.2 version

This is merge of current Debian stable (Lenny) version of Bash
with Vyatta changes.
---
 debian/bash.postinst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'debian/bash.postinst')

diff --git a/debian/bash.postinst b/debian/bash.postinst
index 3db17ee..5fa0da1 100644
--- a/debian/bash.postinst
+++ b/debian/bash.postinst
@@ -1,4 +1,6 @@
-#! /bin/bash -e
+#! /bin/bash
+
+set -e
 
 # the symlink is in the package now. So this should never happen ...
 if [ ! -e /bin/sh ]; then
@@ -12,7 +14,9 @@ update-alternatives --install \
     10 \
   || true
 
-if [ -x /usr/sbin/add-shell ]; then
+if [ "$1" = configure ] && dpkg --compare-versions "$2" le 3.2-2 \
+    && [ -x /usr/sbin/add-shell ]
+then
     /usr/sbin/add-shell /bin/bash
     /usr/sbin/add-shell /bin/rbash
 fi
-- 
cgit v1.2.3