From 6cb3696933f150da40e3564cf7c9a711aee07c71 Mon Sep 17 00:00:00 2001
From: Ronald Tse <ronald.tse@ribose.com>
Date: Tue, 23 Jan 2018 10:57:24 +0800
Subject: [PATCH] Try to make it run again

---
 ci/before_install.sh | 14 ++++----------
 ci/env-openbsd.sh    |  4 ++++
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/ci/before_install.sh b/ci/before_install.sh
index 3f4c75f36..5759b4927 100755
--- a/ci/before_install.sh
+++ b/ci/before_install.sh
@@ -42,13 +42,6 @@ freebsd_install() {
 }
 
 openbsd_install() {
-  sudo pkg_add bzip2
-  sudo pkg_add cmake
-  sudo pkg_add gmake
-  sudo pkg_add gettext-tools
-  sudo pkg_add gnupg-2.1.15p2
-  sudo pkg_add wget
-  sudo pkg_add libiconv
   if [ "$(id -u)" -ne 0 ]; then
     echo "need to run as root"
     exit 1
@@ -56,8 +49,8 @@ openbsd_install() {
 
   export PKG_PATH="https://cloudflare.cdn.openbsd.org/pub/OpenBSD/$(uname -r)/packages/$(uname -m)"
 
-  # CI script dependencies
-  for pkg in bash git wget; do
+  # CI script and build dependencies
+  for pkg in bash git wget bzip2 cmake gmake gettext-tools libiconv; do
     pkg_info | grep -q "${pkg}" && \
       continue
 
@@ -66,7 +59,7 @@ openbsd_install() {
 
   rm -f /bin/bash
   ln -s /usr/local/bin/bash /bin/bash
-  grep -q "^/bin/bash" || \
+  grep -q "^/bin/bash" /etc/shells || \
     echo "/bin/bash" >> /etc/shells
 
   for pkg in automake gnupg; do
@@ -79,6 +72,7 @@ openbsd_install() {
     pkg_add -I "${pkg_ver}"
   done
 
+  # Create link to expected gpg binary name and location
   rm -f ${GPG21_INSTALL}/bin/gpg
   ln /usr/local/bin/gpg2 ${GPG21_INSTALL}/bin/gpg
 
diff --git a/ci/env-openbsd.sh b/ci/env-openbsd.sh
index e8d222600..5f2644c18 100755
--- a/ci/env-openbsd.sh
+++ b/ci/env-openbsd.sh
@@ -11,6 +11,10 @@ export BUILD_MODE=normal
 export CLANG_FORMAT_DIFF="clang-format-diff-4.0"
 export CC=gcc
 export MAKE=gmake
+
+# TODO: make these read from pkg_info
 export AUTOCONF_VERSION=2.69
 export AUTOMAKE_VERSION=1.15
+
+# TODO: use this environment variable in test scripts
 export GPG=gpg2