Make dpkg exec smarter; Update bash, tcsh, and zsh

5 files changed, 44 insertions, 3 deletions

diff --git a/data/bash/_metadata/postinst b/data/bash/_metadata/postinst
new file mode 100755
index 000000000..de743ea96
--- /dev/null
+++ b/data/bash/_metadata/postinst
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+if [ ! -e /bin/sh ]; then
+    ln -s bash /bin/sh
+fi
+
+case "$1" in
+    abort-remove|configure)
+        dpkg-divert --quiet --local --divert /bin/sh.distrib /bin/sh
+        update-alternatives --quiet --install /bin/sh sh /bin/bash 100 || true
+        ;;
+    *)
+        exit 0
+        ;;
+esac
diff --git a/data/bash/_metadata/prerm b/data/bash/_metadata/prerm
new file mode 100755
index 000000000..500128886
--- /dev/null
+++ b/data/bash/_metadata/prerm
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e
+
+case "$1" in
+    upgrade)
+  ;;
+
+    remove|deconfigure)
+      update-alternatives --quiet --remove sh /bin/bash
+      dpkg-divert --quiet --remove /bin/sh
+      if [ ! -e /bin/sh ]; then
+          echo There would be no shell!
+          ln -s bash /bin/sh
+          exit 1
+      fi
+  ;;
+
+    failed-upgrade)
+  ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+  ;;
+esac
diff --git a/data/bash/_metadata/readline.ver.iphoneos-arm b/data/bash/_metadata/readline.ver.iphoneos-arm
index 4fedf1d20..cc40bca69 100644
--- a/data/bash/_metadata/readline.ver.iphoneos-arm
+++ b/data/bash/_metadata/readline.ver.iphoneos-arm
@@ -1 +1 @@
-7.0
+8.0
diff --git a/data/bash/_metadata/readline.ver.iphoneos-arm64 b/data/bash/_metadata/readline.ver.iphoneos-arm64
deleted file mode 100644
index 48b0c7a0d..000000000
--- a/data/bash/_metadata/readline.ver.iphoneos-arm64
+++ /dev/null
@@ -1 +0,0 @@
-7.0.5-1
diff --git a/data/bash/_metadata/version b/data/bash/_metadata/version
index 36a9353f4..50e2274e6 100644
--- a/data/bash/_metadata/version
+++ b/data/bash/_metadata/version
@@ -1 +1 @@
-4.4.23
+5.0.3