Update instructions to use the more common gpg2.

TritonDataCenter · Apr 8, 2020 · ef33e10 · ef33e10
1 parent e834c06
commit ef33e10
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/install-on-illumos/index.markdown b/install-on-illumos/index.markdown
@@ -101,8 +101,8 @@ curl -O https://pkgsrc.joyent.com/packages/SmartOS/bootstrap/${BOOTSTRAP_TAR}
 
 # Verify PGP signature.  This step is optional, and requires gpg.
 curl -O https://pkgsrc.joyent.com/packages/SmartOS/bootstrap/${BOOTSTRAP_TAR}.asc
-curl -sS https://pkgsrc.joyent.com/pgp/DE817B8E.asc | gpg --import
-gpg --verify ${BOOTSTRAP_TAR}{.asc,}
+curl -sS https://pkgsrc.joyent.com/pgp/DE817B8E.asc | gpg2 --import
+gpg2 --verify ${BOOTSTRAP_TAR}{.asc,}
 
 # Install bootstrap kit to {{ page.prefix }}
 tar -zxpf ${BOOTSTRAP_TAR} -C /
@@ -134,8 +134,8 @@ curl -kO https://pkgsrc.joyent.com/packages/SmartOS/bootstrap/${BOOTSTRAP_TAR}
 
 # Verify PGP signature.  This step is optional, and requires gpg.
 curl -kO https://pkgsrc.joyent.com/packages/SmartOS/bootstrap/${BOOTSTRAP_TAR}.asc
-curl -ksS https://pkgsrc.joyent.com/pgp/DE817B8E.asc | gpg --import
-gpg --verify ${BOOTSTRAP_TAR}{.asc,}
+curl -ksS https://pkgsrc.joyent.com/pgp/DE817B8E.asc | gpg2 --import
+gpg2 --verify ${BOOTSTRAP_TAR}{.asc,}
 
 # Install bootstrap kit to /opt/tools
 tar -zxpf ${BOOTSTRAP_TAR} -C /
@@ -185,8 +185,8 @@ curl -O https://pkgsrc.joyent.com/packages/SmartOS/bootstrap-upgrade/${UPGRADE_T
 
 # Verify PGP signature.  This step is optional, and requires gpg.
 curl -O https://pkgsrc.joyent.com/packages/SmartOS/bootstrap-upgrade/${UPGRADE_TAR}.asc
-curl -sS https://pkgsrc.joyent.com/pgp/DE817B8E.asc | gpg --import
-gpg --verify ${UPGRADE_TAR}{.asc,}
+curl -sS https://pkgsrc.joyent.com/pgp/DE817B8E.asc | gpg2 --import
+gpg2 --verify ${UPGRADE_TAR}{.asc,}
 
 # Ensure you are running the latest package tools.
 PKG_PATH=http://pkgsrc.joyent.com/packages/SmartOS/trunk/x86_64/All pkg_add -U pkg_install pkgin
@@ -216,8 +216,8 @@ curl -kO https://pkgsrc.joyent.com/packages/SmartOS/bootstrap-upgrade/${UPGRADE_
 
 # Verify PGP signature.  This step is optional, and requires gpg.
 curl -kO https://pkgsrc.joyent.com/packages/SmartOS/bootstrap-upgrade/${UPGRADE_TAR}.asc
-curl -sS https://pkgsrc.joyent.com/pgp/DE817B8E.asc | gpg --import
-gpg --verify ${UPGRADE_TAR}{.asc,}
+curl -sS https://pkgsrc.joyent.com/pgp/DE817B8E.asc | gpg2 --import
+gpg2 --verify ${UPGRADE_TAR}{.asc,}
 
 # Ensure you are running the latest package tools.
 PKG_PATH=http://pkgsrc.joyent.com/packages/SmartOS/trunk/tools/All pkg_add -U pkg_install pkgin

diff --git a/install-on-linux/index.markdown b/install-on-linux/index.markdown
@@ -46,8 +46,8 @@ sha1sum -c check-shasum
 
 # Verify PGP signature.  This step is optional, and requires gpg.
 curl -O https://pkgsrc.joyent.com/packages/Linux/el7/bootstrap/${BOOTSTRAP_TAR}.asc
-curl -sS https://pkgsrc.joyent.com/pgp/56AAACAF.asc | gpg --import
-gpg --verify ${BOOTSTRAP_TAR}{.asc,}
+curl -sS https://pkgsrc.joyent.com/pgp/56AAACAF.asc | gpg2 --import
+gpg2 --verify ${BOOTSTRAP_TAR}{.asc,}
 
 # Install bootstrap kit to {{ page.prefix }}
 sudo tar -zxpf ${BOOTSTRAP_TAR} -C /
@@ -75,8 +75,8 @@ sha1sum -c check-shasum
 
 # Verify PGP signature.  This step is optional, and requires gpg.
 curl -O https://pkgsrc.joyent.com/packages/Linux/el6/bootstrap/${BOOTSTRAP_TAR}.asc
-curl -sS https://pkgsrc.joyent.com/pgp/56AAACAF.asc | gpg --import
-gpg --verify ${BOOTSTRAP_TAR}{.asc,}
+curl -sS https://pkgsrc.joyent.com/pgp/56AAACAF.asc | gpg2 --import
+gpg2 --verify ${BOOTSTRAP_TAR}{.asc,}
 
 # Install bootstrap kit to {{ page.prefix }}
 sudo tar -zxpf ${BOOTSTRAP_TAR} -C /

diff --git a/install-on-osx/index.markdown b/install-on-osx/index.markdown
@@ -104,8 +104,8 @@ shasum -c check-shasum
 
 # Verify PGP signature.  This step is optional, and requires gpg.
 curl -O https://pkgsrc.joyent.com/packages/Darwin/bootstrap/${BOOTSTRAP_TAR}.asc
-curl -sS https://pkgsrc.joyent.com/pgp/1F32A9AD.asc | gpg --import
-gpg --verify ${BOOTSTRAP_TAR}{.asc,}
+curl -sS https://pkgsrc.joyent.com/pgp/1F32A9AD.asc | gpg2 --import
+gpg2 --verify ${BOOTSTRAP_TAR}{.asc,}
 
 # Install bootstrap kit to {{ page.prefix }}
 sudo tar -zxpf ${BOOTSTRAP_TAR} -C /
@@ -135,8 +135,8 @@ shasum -c check-shasum
 
 # Verify PGP signature.  This step is optional, and requires gpg.
 curl -O https://pkgsrc.joyent.com/packages/Darwin/bootstrap/${BOOTSTRAP_TAR}.asc
-curl -sS https://pkgsrc.joyent.com/pgp/1F32A9AD.asc | gpg --import
-gpg --verify ${BOOTSTRAP_TAR}{.asc,}
+curl -sS https://pkgsrc.joyent.com/pgp/1F32A9AD.asc | gpg2 --import
+gpg2 --verify ${BOOTSTRAP_TAR}{.asc,}
 
 # Install bootstrap kit to {{ page.prefix }}
 sudo tar -zxpf ${BOOTSTRAP_TAR} -C /
@@ -166,8 +166,8 @@ shasum -c check-shasum
 
 # Verify PGP signature.  This step is optional, and requires gpg.
 curl -O https://us-east.manta.joyent.com/pkgsrc/public/packages/Darwin/10.9/bootstrap/${BOOTSTRAP_TAR}.asc
-curl -sS https://pkgsrc.joyent.com/pgp/1F32A9AD.asc | gpg --import
-gpg --verify ${BOOTSTRAP_TAR}{.asc,}
+curl -sS https://pkgsrc.joyent.com/pgp/1F32A9AD.asc | gpg2 --import
+gpg2 --verify ${BOOTSTRAP_TAR}{.asc,}
 
 # Install bootstrap kit to {{ page.prefix }}
 sudo tar -zxpf ${BOOTSTRAP_TAR} -C /
@@ -197,8 +197,8 @@ shasum -c check-shasum
 
 # Verify PGP signature.  This step is optional, and requires gpg.
 curl -O https://pkgsrc.joyent.com/packages/Darwin/bootstrap/${BOOTSTRAP_TAR}.asc
-curl -sS https://pkgsrc.joyent.com/pgp/1F32A9AD.asc | gpg --import
-gpg --verify ${BOOTSTRAP_TAR}{.asc,}
+curl -sS https://pkgsrc.joyent.com/pgp/1F32A9AD.asc | gpg2 --import
+gpg2 --verify ${BOOTSTRAP_TAR}{.asc,}
 
 # Install bootstrap kit to {{ page.prefix }}
 sudo tar -zxpf ${BOOTSTRAP_TAR} -C /