Update core scripts.

3 files changed, 9 insertions, 33 deletions

diff --git a/scripts/core-rebuild.sh b/scripts/core-rebuild.sh
index a3c01b4..3c79a1d 100755
--- a/scripts/core-rebuild.sh
+++ b/scripts/core-rebuild.sh
@@ -1,7 +1,5 @@
 #!/bin/sh -x
 
-./core-remove-rpms.sh
-
 ./core-build.sh
 
 ./core-uninstall.sh
diff --git a/scripts/core-remove-rpms.sh b/scripts/core-remove-rpms.sh
deleted file mode 100755
index 1c076a1..0000000
--- a/scripts/core-remove-rpms.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh -x
-
-SRC_DIR=`cd ../.. ; pwd`
-
-cd $SRC_DIR/repo
-
-rm -rf pki-core-*.rpm
-rm -rf pki-deploy-*.rpm
-rm -rf pki-selinux-*.rpm
-rm -rf pki-tks-*.rpm
-rm -rf pki-kra-*.rpm
-rm -rf pki-common-*.rpm
-rm -rf pki-native-tools-*.rpm
-rm -rf pki-silent-*.rpm
-rm -rf pki-util-*.rpm
-rm -rf pki-setup-*.rpm
-rm -rf pki-ocsp-*.rpm
-rm -rf pki-ca-*.rpm
-rm -rf pki-java-tools-*.rpm
-rm -rf pki-symkey-*.rpm
diff --git a/scripts/core-uninstall.sh b/scripts/core-uninstall.sh
index f38c520..f4b4de0 100755
--- a/scripts/core-uninstall.sh
+++ b/scripts/core-uninstall.sh
@@ -1,20 +1,18 @@
 #!/bin/sh -x
 
 yum erase -y\
-	pki-core-debuginfo\
+	pki-symkey\
+	pki-base\
+	pki-tools\
 	pki-util-javadoc\
 	pki-common-javadoc\
 	pki-java-tools-javadoc\
-	pki-selinux\
-	pki-tks\
-	pki-kra\
-	pki-common\
-	pki-native-tools\
 	pki-silent\
-	pki-util\
+	pki-selinux\
+	pki-server\
 	pki-setup\
-	pki-ocsp\
 	pki-ca\
-	pki-java-tools\
-	pki-symkey\
-	pki-deploy
+	pki-kra\
+	pki-ocsp\
+	pki-tks\
+	pki-core-debuginfo