[java-identity-provider] branch master updated: IDP-974 - shell usage
Scott Cantor
cantor.2 at osu.edu
Wed Sep 5 15:01:17 EDT 2018
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=94d5941cf7c13aed3849138be6ccb35855756a39
The following commit(s) were added to refs/heads/master by this push:
new 94d5941 IDP-974 - shell usage
94d5941 is described below
commit 94d5941cf7c13aed3849138be6ccb35855756a39
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 5 15:01:15 2018 -0400
IDP-974 - shell usage
https://issues.shibboleth.net/jira/browse/IDP-974
Fix location assignment.
---
idp-distribution/src/main/resources/bin/aacli.sh | 3 +--
idp-distribution/src/main/resources/bin/build.sh | 3 +--
idp-distribution/src/main/resources/bin/install.sh | 3 +--
idp-distribution/src/main/resources/bin/keygen.sh | 3 +--
idp-distribution/src/main/resources/bin/mdquery.sh | 3 +--
idp-distribution/src/main/resources/bin/reload-metadata.sh | 3 +--
idp-distribution/src/main/resources/bin/reload-service.sh | 3 +--
idp-distribution/src/main/resources/bin/runclass.sh | 3 +--
idp-distribution/src/main/resources/bin/seckeygen.sh | 3 +--
idp-distribution/src/main/resources/bin/status.sh | 3 +--
idp-distribution/src/main/resources/bin/version.sh | 3 +--
11 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/idp-distribution/src/main/resources/bin/aacli.sh b/idp-distribution/src/main/resources/bin/aacli.sh
index 897b56c..cad1f70 100755
--- a/idp-distribution/src/main/resources/bin/aacli.sh
+++ b/idp-distribution/src/main/resources/bin/aacli.sh
@@ -2,8 +2,7 @@
declare LOCATION
-LOCATION=$0
-LOCATION=${LOCATION%/*}
+LOCATION=$(dirname $0)
$LOCATION/runclass.sh -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.cli.ResolverTestArguments \
net.shibboleth.idp.cli.CLI "$@"
diff --git a/idp-distribution/src/main/resources/bin/build.sh b/idp-distribution/src/main/resources/bin/build.sh
index 94ef7a2..8ea33ad 100755
--- a/idp-distribution/src/main/resources/bin/build.sh
+++ b/idp-distribution/src/main/resources/bin/build.sh
@@ -2,7 +2,6 @@
declare LOCATION
-LOCATION=$0
-LOCATION=${LOCATION%/*}
+LOCATION=$(dirname $0)
$LOCATION/ant.sh "$@" build-war
diff --git a/idp-distribution/src/main/resources/bin/install.sh b/idp-distribution/src/main/resources/bin/install.sh
index cdd0d8f..0c27088 100755
--- a/idp-distribution/src/main/resources/bin/install.sh
+++ b/idp-distribution/src/main/resources/bin/install.sh
@@ -2,7 +2,6 @@
declare LOCATION
-LOCATION=$0
-LOCATION=${LOCATION%/*}
+LOCATION=$(dirname $0)
$LOCATION/ant.sh "$@" install
diff --git a/idp-distribution/src/main/resources/bin/keygen.sh b/idp-distribution/src/main/resources/bin/keygen.sh
index 0eb88e1..26bffcc 100755
--- a/idp-distribution/src/main/resources/bin/keygen.sh
+++ b/idp-distribution/src/main/resources/bin/keygen.sh
@@ -2,7 +2,6 @@
declare LOCATION
-LOCATION=$0
-LOCATION=${LOCATION%/*}
+LOCATION=$(dirname $0)
$LOCATION/runclass.sh net.shibboleth.utilities.java.support.security.SelfSignedCertificateGenerator "$@"
\ No newline at end of file
diff --git a/idp-distribution/src/main/resources/bin/mdquery.sh b/idp-distribution/src/main/resources/bin/mdquery.sh
index 6c86f2a..06c64a0 100755
--- a/idp-distribution/src/main/resources/bin/mdquery.sh
+++ b/idp-distribution/src/main/resources/bin/mdquery.sh
@@ -2,8 +2,7 @@
declare LOCATION
-LOCATION=$0
-LOCATION=${LOCATION%/*}
+LOCATION=$(dirname $0)
$LOCATION/runclass.sh -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.cli.MetadataQueryArguments \
net.shibboleth.idp.cli.CLI "$@"
diff --git a/idp-distribution/src/main/resources/bin/reload-metadata.sh b/idp-distribution/src/main/resources/bin/reload-metadata.sh
index 5ecf818..381ee3d 100755
--- a/idp-distribution/src/main/resources/bin/reload-metadata.sh
+++ b/idp-distribution/src/main/resources/bin/reload-metadata.sh
@@ -2,8 +2,7 @@
declare LOCATION
-LOCATION=$0
-LOCATION=${LOCATION%/*}
+LOCATION=$(dirname $0)
$LOCATION/runclass.sh -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.cli.ReloadMetadataArguments \
net.shibboleth.idp.cli.CLI "$@"
diff --git a/idp-distribution/src/main/resources/bin/reload-service.sh b/idp-distribution/src/main/resources/bin/reload-service.sh
index 0a141a6..b572187 100755
--- a/idp-distribution/src/main/resources/bin/reload-service.sh
+++ b/idp-distribution/src/main/resources/bin/reload-service.sh
@@ -2,8 +2,7 @@
declare LOCATION
-LOCATION=$0
-LOCATION=${LOCATION%/*}
+LOCATION=$(dirname $0)
$LOCATION/runclass.sh -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.cli.ReloadServiceArguments \
net.shibboleth.idp.cli.CLI "$@"
diff --git a/idp-distribution/src/main/resources/bin/runclass.sh b/idp-distribution/src/main/resources/bin/runclass.sh
index 477a8c1..c151599 100755
--- a/idp-distribution/src/main/resources/bin/runclass.sh
+++ b/idp-distribution/src/main/resources/bin/runclass.sh
@@ -6,8 +6,7 @@ declare JAVACMD
declare LOCALCLASSPATH
declare LIBDIR
-LOCATION=$0
-LOCATION=${LOCATION%/*}
+LOCATION=$(dirname $0)
if [ -z "$JAVA_HOME" ] ; then
echo "ERROR: JAVA_HOME environment variable is not set."
diff --git a/idp-distribution/src/main/resources/bin/seckeygen.sh b/idp-distribution/src/main/resources/bin/seckeygen.sh
index c601c08..0bf9150 100755
--- a/idp-distribution/src/main/resources/bin/seckeygen.sh
+++ b/idp-distribution/src/main/resources/bin/seckeygen.sh
@@ -2,7 +2,6 @@
declare LOCATION
-LOCATION=$0
-LOCATION=${LOCATION%/*}
+LOCATION=$(dirname $0)
$LOCATION/runclass.sh net.shibboleth.utilities.java.support.security.BasicKeystoreKeyStrategyTool "$@"
\ No newline at end of file
diff --git a/idp-distribution/src/main/resources/bin/status.sh b/idp-distribution/src/main/resources/bin/status.sh
index 099c9ad..ddbe171 100755
--- a/idp-distribution/src/main/resources/bin/status.sh
+++ b/idp-distribution/src/main/resources/bin/status.sh
@@ -2,8 +2,7 @@
declare LOCATION
-LOCATION=$0
-LOCATION=${LOCATION%/*}
+LOCATION=$(dirname $0)
$LOCATION/runclass.sh -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.cli.StatusArguments \
net.shibboleth.idp.cli.CLI "$@"
diff --git a/idp-distribution/src/main/resources/bin/version.sh b/idp-distribution/src/main/resources/bin/version.sh
index 8aaae55..6a49ceb 100755
--- a/idp-distribution/src/main/resources/bin/version.sh
+++ b/idp-distribution/src/main/resources/bin/version.sh
@@ -2,7 +2,6 @@
declare LOCATION
-LOCATION=$0
-LOCATION=${LOCATION%/*}
+LOCATION=$(dirname $0)
$LOCATION/runclass.sh net.shibboleth.idp.Version
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list