Changed source directory.

12 files changed, 27 insertions, 23 deletions

diff --git a/scripts/ca-create.sh b/scripts/ca-create.sh
index 312ca19..b909e19 100755
--- a/scripts/ca-create.sh
+++ b/scripts/ca-create.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -x
 
-PKI_SRC=`cd ../.. ; pwd`/pki
+SRC_DIR=`cd ../.. ; pwd`
 
 INSTANCE_NAME=pki-ca
 
@@ -19,7 +19,7 @@ pkicreate -pki_instance_root=/var/lib			\
 ln -s /usr/share/tomcat6/bin /var/lib/$INSTANCE_NAME/bin
 ln -s /usr/share/tomcat6/lib /var/lib/$INSTANCE_NAME/lib
 rm -f /var/lib/$INSTANCE_NAME/webapps/ca/WEB-INF/lib/pki-*
-ln -s $PKI_SRC/pki/build/classes /var/lib/$INSTANCE_NAME/webapps/ca/WEB-INF/classes
+ln -s $SRC_DIR/pki/build/classes /var/lib/$INSTANCE_NAME/webapps/ca/WEB-INF/classes
 
 systemctl restart pki-cad@$INSTANCE_NAME.service
 
diff --git a/scripts/caclone-create.sh b/scripts/caclone-create.sh
index 4871815..757271f 100755
--- a/scripts/caclone-create.sh
+++ b/scripts/caclone-create.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -x
 
-PKI_SRC=`cd ../.. ; pwd`/pki
+SRC_DIR=`cd ../.. ; pwd`
 
 INSTANCE_NAME=pki-caclone
 
@@ -19,7 +19,7 @@ pkicreate -pki_instance_root=/var/lib			\
 ln -s /usr/share/tomcat6/bin /var/lib/$INSTANCE_NAME/bin
 ln -s /usr/share/tomcat6/lib /var/lib/$INSTANCE_NAME/lib
 rm -f /var/lib/$INSTANCE_NAME/webapps/ca/WEB-INF/lib/pki-*
-ln -s $PKI_SRC/pki/build/classes /var/lib/$INSTANCE_NAME/webapps/ca/WEB-INF/classes
+ln -s $SRC_DIR/pki/build/classes /var/lib/$INSTANCE_NAME/webapps/ca/WEB-INF/classes
 
 systemctl restart pki-cad@$INSTANCE_NAME.service
 
diff --git a/scripts/console-build.sh b/scripts/console-build.sh
index d5b1930..0ea106b 100755
--- a/scripts/console-build.sh
+++ b/scripts/console-build.sh
@@ -1,8 +1,8 @@
 #!/bin/sh -x
 
-PKI_SRC=`cd ../.. ; pwd`/pki
+SRC_DIR=`cd ../.. ; pwd`
 
-cd $PKI_SRC
+cd $SRC_DIR
 
 rm -rf packages
 mkdir packages
diff --git a/scripts/console-install.sh b/scripts/console-install.sh
index 770fc7d..fc01534 100755
--- a/scripts/console-install.sh
+++ b/scripts/console-install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -x
 
-PKI_SRC=`cd ../.. ; pwd`/pki
+SRC_DIR=`cd ../.. ; pwd`
 
-rpm -ivh $PKI_SRC/packages.console/RPMS/noarch/*.rpm
+rpm -ivh $SRC_DIR/packages.console/RPMS/noarch/*.rpm
diff --git a/scripts/core-build.sh b/scripts/core-build.sh
index 3763d14..2cbd6b6 100755
--- a/scripts/core-build.sh
+++ b/scripts/core-build.sh
@@ -1,8 +1,8 @@
 #!/bin/sh -x
 
-PKI_SRC=`cd ../.. ; pwd`/pki
+SRC_DIR=`cd ../.. ; pwd`
 
-cd $PKI_SRC
+cd $SRC_DIR
 
 rm -rf packages
 mkdir packages
diff --git a/scripts/core-install.sh b/scripts/core-install.sh
index 06bd960..89e3f9e 100755
--- a/scripts/core-install.sh
+++ b/scripts/core-install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -x
 
-PKI_SRC=`cd ../.. ; pwd`/pki
+SRC_DIR=`cd ../.. ; pwd`
 
-rpm -ivh $PKI_SRC/packages.core/RPMS/combined/*.rpm
+rpm -ivh $SRC_DIR/packages.core/RPMS/combined/*.rpm
diff --git a/scripts/core-update.sh b/scripts/core-update.sh
index 904bd29..57dff8e 100755
--- a/scripts/core-update.sh
+++ b/scripts/core-update.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -x
 
-PKI_SRC=`cd ../.. ; pwd`/pki
+SRC_DIR=`cd ../.. ; pwd`
 
-rpm -Uvh $PKI_SRC/packages.core/RPMS/combined/*.rpm
+rpm -Uvh $SRC_DIR/packages.core/RPMS/combined/*.rpm
diff --git a/scripts/drm-java-test.sh b/scripts/drm-java-test.sh
index 19fc3d8..11c87e3 100755
--- a/scripts/drm-java-test.sh
+++ b/scripts/drm-java-test.sh
@@ -1,6 +1,8 @@
 #!/bin/sh -x
 
-CLASSPATH=/root/CS/pki/pki/build/classes
+SRC_DIR=`cd ../.. ; pwd`
+
+CLASSPATH=$SRC_DIR/pki/build/classes
 CLASSPATH=$CLASSPATH:/usr/share/java/apache-commons-cli.jar
 CLASSPATH=$CLASSPATH:/usr/lib64/java/jss4.jar
 CLASSPATH=$CLASSPATH:/usr/share/java/jakarta-commons-httpclient.jar
diff --git a/scripts/drm-python-test.sh b/scripts/drm-python-test.sh
index 87fb4b5..0a54c9f 100755
--- a/scripts/drm-python-test.sh
+++ b/scripts/drm-python-test.sh
@@ -1,9 +1,11 @@
 #!/bin/sh -x
 
+SRC_DIR=`cd ../.. ; pwd`
+
 TEST_DIR=/tmp/drmtest
 CERT_NAME="transportCert cert-pki-kra"
 
-CLASSPATH=/root/CS/pki/pki/build/classes
+CLASSPATH=$SRC_DIR/pki/build/classes
 CLASSPATH=$CLASSPATH:/usr/share/java/apache-commons-cli.jar
 CLASSPATH=$CLASSPATH:/usr/lib64/java/jss4.jar
 CLASSPATH=$CLASSPATH:/usr/share/java/commons-codec.jar
@@ -21,5 +23,5 @@ certutil -A -d $TEST_DIR -n "$CERT_NAME" -i $TEST_DIR/transport.pem -t u,u,u
 
 java -classpath $CLASSPATH com.netscape.cms.servlet.test.GeneratePKIArchiveOptions -d $TEST_DIR -k $TEST_DIR/symkey.out -o $TEST_DIR/options.out -t $TEST_DIR/transport.crt -w Secret123
 
-cd ../../pki/pki/base/kra/functional
+cd $SRC_DIR/pki/base/kra/functional
 python drmclient.py -d $TEST_DIR --options=options.out --symkey=symkey.out -p 10180 -n "$CERT_NAME"
diff --git a/scripts/kra-create.sh b/scripts/kra-create.sh
index 046ea68..374f251 100755
--- a/scripts/kra-create.sh
+++ b/scripts/kra-create.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -x
 
-PKI_SRC=`cd ../.. ; pwd`/pki
+SRC_DIR=`cd ../.. ; pwd`
 
 INSTANCE_NAME=pki-kra
 
@@ -20,6 +20,6 @@ pkicreate -pki_instance_root=/var/lib			\
 ln -s /usr/share/tomcat6/bin /var/lib/$INSTANCE_NAME/bin
 ln -s /usr/share/tomcat6/lib /var/lib/$INSTANCE_NAME/lib
 rm -f /var/lib/$INSTANCE_NAME/webapps/kra/WEB-INF/lib/pki-*
-ln -s $PKI_SRC/pki/build/classes /var/lib/$INSTANCE_NAME/webapps/kra/WEB-INF/classes
+ln -s $SRC_DIR/pki/build/classes /var/lib/$INSTANCE_NAME/webapps/kra/WEB-INF/classes
 
 systemctl restart pki-krad@$INSTANCE_NAME.service
diff --git a/scripts/theme-build.sh b/scripts/theme-build.sh
index 9767dfa..ef80523 100755
--- a/scripts/theme-build.sh
+++ b/scripts/theme-build.sh
@@ -1,8 +1,8 @@
 #!/bin/sh -x
 
-PKI_SRC=`cd ../.. ; pwd`/pki
+SRC_DIR=`cd ../.. ; pwd`
 
-cd $PKI_SRC
+cd $SRC_DIR
 
 rm -rf packages
 mkdir packages
diff --git a/scripts/theme-install.sh b/scripts/theme-install.sh
index fd77e7b..be5cd52 100755
--- a/scripts/theme-install.sh
+++ b/scripts/theme-install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -x
 
-PKI_SRC=`cd ../.. ; pwd`/pki
+SRC_DIR=`cd ../.. ; pwd`
 
-rpm -ivh $PKI_SRC/packages.theme/RPMS/noarch/*.rpm
+rpm -ivh $SRC_DIR/packages.theme/RPMS/noarch/*.rpm