Fix Issue 19100 - install.sh signature verification fails, no public key

dlang · Aug 13, 2018 · bae1b34 · bae1b34
1 parent f6de5fe
commit bae1b34
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/script/install.sh b/script/install.sh
@@ -345,7 +345,7 @@ run_command() {
     case $1 in
         install)
             check_tools curl
-            if [ ! -f "$ROOT/install.sh" ]; then
+            if [ ! -f "$ROOT/install.sh" ] || [ ! -f "$ROOT/d-keyring.gpg" ] ; then
                 install_dlang_installer
             fi
             if [ -z "${2:-}" ]; then

diff --git a/travis.sh b/travis.sh
@@ -100,6 +100,16 @@ done
 ./script/install.sh remove --help | tr -d '\n' | grep "Usage\s*install.sh uninstall" >/dev/null
 ./script/install.sh remove -h | tr -d '\n' | grep "Usage\s*install.sh uninstall" >/dev/null
 
+# test that a missing keyring gets restored - https://issues.dlang.org/show_bug.cgi?id=19100
+rm ~/dlang/d-keyring.gpg
+./script/install.sh dmd-2.081.2
+if [ ! $(find ~/dlang/d-keyring.gpg -type f -size +8096c 2>/dev/null) ]; then
+    ls -l ~/dlang/d-keyring.gpg
+    echo "Invalid keyring got installed."
+    exit 1
+fi
+./script/install.sh remove dmd-2.081.2
+
 # check whether all installations have been uninstalled successfully
 if bash script/install.sh list
 then