6 files changed, 22 insertions, 5 deletions
diff --git a/scripts/core-build.sh b/scripts/core-build.sh
index 393f1c0..5ad0932 100755
--- a/scripts/core-build.sh
+++ b/scripts/core-build.sh
@@ -11,6 +11,8 @@ cd $BUILD_DIR
 rm -rf rpmbuild
 mkdir -p rpmbuild
 
+echo $COMPOSE --work-dir $BUILD_DIR/rpmbuild hybrid_rpms
+
 #$COMPOSE --work-dir $BUILD_DIR/rpmbuild --without-javadoc hybrid_rpms 2>&1 | tee build.log
 $COMPOSE --work-dir $BUILD_DIR/rpmbuild hybrid_rpms 2>&1 | tee build.log
 
diff --git a/scripts/core-download.sh b/scripts/core-download.sh
index ce851db..875ee12 100755
--- a/scripts/core-download.sh
+++ b/scripts/core-download.sh
@@ -1,21 +1,27 @@
 #!/bin/sh -x
 
+mkdir -p ~/Downloads
 cd ~/Downloads
 
+#https://kojipkgs.fedoraproject.org//packages/pki-core/10.3.1/1.fc24/noarch/pki-base-10.3.1-1.fc24.noarch.rpm
 BASE_URL=http://kojipkgs.fedoraproject.org/packages
+
 PACKAGE=pki-core
-VERSION=10.1.0
+VERSION=10.3.1
 RELEASE=1
-OS=fc20
+OS=fc24
 
 wget $BASE_URL/$PACKAGE/$VERSION/$RELEASE.$OS/noarch/pki-base-$VERSION-$RELEASE.$OS.noarch.rpm
+wget $BASE_URL/$PACKAGE/$VERSION/$RELEASE.$OS/noarch/pki-base-java-$VERSION-$RELEASE.$OS.noarch.rpm
+wget $BASE_URL/$PACKAGE/$VERSION/$RELEASE.$OS/noarch/pki-base-python3-$VERSION-$RELEASE.$OS.noarch.rpm
 wget $BASE_URL/$PACKAGE/$VERSION/$RELEASE.$OS/noarch/pki-ca-$VERSION-$RELEASE.$OS.noarch.rpm
 wget $BASE_URL/$PACKAGE/$VERSION/$RELEASE.$OS/noarch/pki-javadoc-$VERSION-$RELEASE.$OS.noarch.rpm
 wget $BASE_URL/$PACKAGE/$VERSION/$RELEASE.$OS/noarch/pki-kra-$VERSION-$RELEASE.$OS.noarch.rpm
 wget $BASE_URL/$PACKAGE/$VERSION/$RELEASE.$OS/noarch/pki-ocsp-$VERSION-$RELEASE.$OS.noarch.rpm
 wget $BASE_URL/$PACKAGE/$VERSION/$RELEASE.$OS/noarch/pki-server-$VERSION-$RELEASE.$OS.noarch.rpm
 wget $BASE_URL/$PACKAGE/$VERSION/$RELEASE.$OS/noarch/pki-tks-$VERSION-$RELEASE.$OS.noarch.rpm
-wget $BASE_URL/$PACKAGE/$VERSION/$RELEASE.$OS/noarch/pki-tps-tomcat-$VERSION-$RELEASE.$OS.noarch.rpm
+
 wget $BASE_URL/$PACKAGE/$VERSION/$RELEASE.$OS/x86_64/pki-symkey-$VERSION-$RELEASE.$OS.x86_64.rpm
 wget $BASE_URL/$PACKAGE/$VERSION/$RELEASE.$OS/x86_64/pki-tools-$VERSION-$RELEASE.$OS.x86_64.rpm
+wget $BASE_URL/$PACKAGE/$VERSION/$RELEASE.$OS/x86_64/pki-tps-$VERSION-$RELEASE.$OS.x86_64.rpm
 wget $BASE_URL/$PACKAGE/$VERSION/$RELEASE.$OS/x86_64/pki-core-debuginfo-$VERSION-$RELEASE.$OS.x86_64.rpm
diff --git a/scripts/core-install.sh b/scripts/core-install.sh
index b7f88d7..94bca7c 100755
--- a/scripts/core-install.sh
+++ b/scripts/core-install.sh
@@ -6,4 +6,4 @@ BUILD_DIR=$HOME/build/pki-core
 
 cd $BUILD_DIR/repo
 
-yum localinstall -y *.rpm
+yum install -y *.rpm
diff --git a/scripts/core-remove.sh b/scripts/core-remove.sh
index 09629e5..567e8b6 100755
--- a/scripts/core-remove.sh
+++ b/scripts/core-remove.sh
@@ -2,15 +2,17 @@
 
 rpm -e --nodeps pki-symkey
 rpm -e --nodeps pki-base
+rpm -e --nodeps pki-base-java
+rpm -e --nodeps python3-pki
 rpm -e --nodeps pki-tools
 rpm -e --nodeps pki-server
 rpm -e --nodeps pki-ca
 rpm -e --nodeps pki-kra
 rpm -e --nodeps pki-ocsp
 rpm -e --nodeps pki-tks
+rpm -e --nodeps pki-tps
 rpm -e --nodeps pki-core-debuginfo
 rpm -e --nodeps pki-util
 rpm -e --nodeps pki-silent
 rpm -e --nodeps pki-selinux
-rpm -e --nodeps pki-tps-tomcat
 rpm -e --nodeps pki-javadoc
diff --git a/scripts/core-uninstall.sh b/scripts/core-uninstall.sh
index 87de86c..61ef32e 100755
--- a/scripts/core-uninstall.sh
+++ b/scripts/core-uninstall.sh
@@ -15,3 +15,7 @@ yum erase -y\
 	pki-tps-tomcat\
 	pki-javadoc\
 	pki-core-debuginfo
+
+yum erase -y\
+	pki-base-java\
+	python3-pki
diff --git a/scripts/core-yum-install.sh b/scripts/core-yum-install.sh
new file mode 100755
index 0000000..dd9b55d
--- /dev/null
+++ b/scripts/core-yum-install.sh
@@ -0,0 +1,3 @@
+#!/bin/sh -x
+
+yum install -y pki-base pki-symkey pki-tools pki-server pki-ca pki-kra pki-ocsp pki-tks pki-tps