--- plugins_tools/chrome_pkcs11/beid-update-nssdb.orig	2018-07-20 12:53:45 UTC
+++ plugins_tools/chrome_pkcs11/beid-update-nssdb
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! /bin/sh
 #
 # The MIT License (MIT)
 #
@@ -26,15 +26,17 @@
 # Copyright(c) Wouter Verhelst, 2018
 
 NSSDB=$HOME/.pki/nssdb
-MODUTIL="/usr/bin/modutil -force -dbdir sql:$NSSDB"
-CERTUTIL="/usr/bin/certutil -d sql:$NSSDB"
+MODUTIL="/usr/bin/modutil"
+CERTUTIL="/usr/bin/certutil"
 LIBS=$(ld --verbose | grep SEARCH | awk '{ gsub(/;/,"\n"); print }' | awk -F '\"' '/SEARCH_DIR\(\"=?/ { gsub(/=/,""); print $2 }')
 PKCS11=libbeidpkcs11.so.0
 
+[ -e $CERTUTIL -a -e $MODUTIL ] || exit
+
 if [ ! -f $NSSDB/cert9.db ]; then
     echo "Initializing new database"
     mkdir -p $NSSDB
-    $CERTUTIL -N --empty-password
+    $CERTUTIL -d sql:$NSSDB -N --empty-password
 fi
 
 for DIR in $LIBS; do
@@ -45,8 +47,8 @@ for DIR in $LIBS; do
             echo "ID-card support for Google Chrome/Chromium/Opera already enabled"
         else
             echo "Enabling ID-card functionality in Google Chrome/Chromium/Opera via $LIB"
-            $MODUTIL -delete "Belgium eID"
-            $MODUTIL -add "Belgium eID" -libfile $LIB -mechanisms FRIENDLY
+            $MODUTIL -force -dbdir sql:$NSSDB -delete "Belgium eID"
+            $MODUTIL -force -dbdir sql:$NSSDB -add "Belgium eID" -libfile $LIB -mechanisms FRIENDLY
         fi
         exit
     fi