Drop bashisms pushd/popd

integration-test.sh

@@ -23,9 +23,8 @@ install_keystore() {
     mkdir -p $tmpdir/src/git.autistici.org/id
     ln -s $PWD $tmpdir/src/git.autistici.org/id/keystore
 
-    pushd $tmpdir/src/git.autistici.org/id/keystore
-    GOPATH=$tmpdir go build -o /usr/bin/dovecot-keylookupd cmd/dovecot-keylookupd
-    GOPATH=$tmpdir go build -o /usr/bin/keystored cmd/keystored
+    GOPATH=$tmpdir go build -o /usr/bin/dovecot-keylookupd git.autistici.org/id/keystore/cmd/dovecot-keylookupd
+    GOPATH=$tmpdir go build -o /usr/bin/keystored git.autistici.org/id/keystore/cmd/keystored
     
     addgroup --system --quiet dovecot-keylookupd
     adduser --system --no-create-home --home /run/dovecot-keylookupd \
@@ -40,11 +39,10 @@ install_keystore() {
     systemctl daemon-reload
 
     mkdir -p /var/lib/keystore /etc/sso
-    GOPATH=$tmpdir go run integration-test/init.go --dbpath=/var/lib/keystore/test.db --ssopath=/etc/sso $TESTPW1 $TESTPW2
+    GOPATH=$tmpdir go run git.autistici.org/id/keystore/integration-test/init.go --dbpath=/var/lib/keystore/test.db --ssopath=/etc/sso $TESTPW1 $TESTPW2
     chown -R keystored /var/lib/keystore
 
     rm -fr $tmpdir
-    popd
 }
 
 configure_dovecot() {