replace "which" with "command -v" for portability

[apt.git] / test / integration / test-apt-key-net-update

diff --git a/test/integration/test-apt-key-net-update b/test/integration/test-apt-key-net-update
index 2a0823becc4486c3532e4272d73152b6b12c6ce3..93c72dd5b36123c8d580d21a9ae51184b00fcce2 100755 (executable)
--- a/test/integration/test-apt-key-net-update
+++ b/test/integration/test-apt-key-net-update
@@ -19,7 +19,7 @@ echo "APT::Key::MasterKeyring \"${TMPWORKINGDIRECTORY}/usr/share/keyrings/test-m
 # setup archive-keyring 
 mkdir -p aptarchive/ubuntu/project
 install -m0644 keys/test-archive-keyring.pub aptarchive/ubuntu/project/
 # setup archive-keyring 
 mkdir -p aptarchive/ubuntu/project
 install -m0644 keys/test-archive-keyring.pub aptarchive/ubuntu/project/

-echo 'APT::Key::ArchiveKeyringURI "http://localhost:8080/ubuntu/project/test-archive-keyring.pub";' >> ./aptconfig.conf
+echo "APT::Key::ArchiveKeyringURI \"http://localhost:${APTHTTPPORT}/ubuntu/project/test-archive-keyring.pub\";" >> ./aptconfig.conf

 echo 'APT::Key::Net-Update-Enabled "1";' >> ./aptconfig.conf
 
 # test against the "real" webserver
 echo 'APT::Key::Net-Update-Enabled "1";' >> ./aptconfig.conf
 
 # test against the "real" webserver


@@ -36,7 +36,7 @@ pub   2048R/DBAC8DAE 2010-08-18'
 # setup archive-keyring 
 mkdir -p aptarchive/ubuntu/project
 install -m0644 keys/marvinparanoid.pub aptarchive/ubuntu/project/
 # setup archive-keyring 
 mkdir -p aptarchive/ubuntu/project
 install -m0644 keys/marvinparanoid.pub aptarchive/ubuntu/project/

-echo 'APT::Key::ArchiveKeyringURI "http://localhost:8080/ubuntu/project/marvinparanoid.pub";' >> ./aptconfig.conf
+echo "APT::Key::ArchiveKeyringURI \"http://localhost:${APTHTTPPORT}/ubuntu/project/marvinparanoid.pub\";" >> ./aptconfig.conf

 echo 'APT::Key::Net-Update-Enabled "1";' >> ./aptconfig.conf
 
 # test against the "real" webserver
 echo 'APT::Key::Net-Update-Enabled "1";' >> ./aptconfig.conf
 
 # test against the "real" webserver