Created local repo.

8 files changed, 38 insertions, 10 deletions

diff --git a/scripts/console-build.sh b/scripts/console-build.sh
index 0ea106b..e061148 100755
--- a/scripts/console-build.sh
+++ b/scripts/console-build.sh
@@ -7,7 +7,10 @@ cd $SRC_DIR
 rm -rf packages
 mkdir packages
 
-./pki/scripts/compose_pki_console_packages rpms
+pki/scripts/compose_pki_console_packages rpms | tee packages/build.log
+
+mv `find packages/RPMS -name *.rpm` repo
+createrepo repo
 
 rm -rf packages.console
 mv packages packages.console
diff --git a/scripts/console-install.sh b/scripts/console-install.sh
index fc01534..003d097 100755
--- a/scripts/console-install.sh
+++ b/scripts/console-install.sh
@@ -2,4 +2,5 @@
 
 SRC_DIR=`cd ../.. ; pwd`
 
-rpm -ivh $SRC_DIR/packages.console/RPMS/noarch/*.rpm
+cd $SRC_DIR/repo
+rpm -ivh pki-console-*.rpm
diff --git a/scripts/core-build.sh b/scripts/core-build.sh
index dee68f3..263f071 100755
--- a/scripts/core-build.sh
+++ b/scripts/core-build.sh
@@ -7,10 +7,10 @@ cd $SRC_DIR
 rm -rf packages
 mkdir packages
 
-./pki/scripts/compose_pki_core_packages --without-javadoc hybrid_rpms 2>&1 | tee packages/build.log
+pki/scripts/compose_pki_core_packages --without-javadoc hybrid_rpms 2>&1 | tee packages/build.log
 
-mkdir packages/RPMS/combined
-cp -p packages/RPMS/*/*.rpm packages/RPMS/combined
+mv `find packages/RPMS -name *.rpm` repo
+createrepo repo
 
 rm -rf packages.core
 mv packages packages.core
diff --git a/scripts/core-install.sh b/scripts/core-install.sh
index 89e3f9e..b317314 100755
--- a/scripts/core-install.sh
+++ b/scripts/core-install.sh
@@ -2,4 +2,17 @@
 
 SRC_DIR=`cd ../.. ; pwd`
 
-rpm -ivh $SRC_DIR/packages.core/RPMS/combined/*.rpm
+cd $SRC_DIR/repo
+rpm -ivh pki-deploy-*.rpm\
+        pki-selinux-*.rpm\
+        pki-tks-*.rpm\
+        pki-kra-*.rpm\
+        pki-common-*.rpm\
+        pki-native-tools-*.rpm\
+        pki-silent-*.rpm\
+        pki-util-*.rpm\
+        pki-setup-*.rpm\
+        pki-ocsp-*.rpm\
+        pki-ca-*.rpm\
+        pki-java-tools-*.rpm\
+        pki-symkey-*.rpm
diff --git a/scripts/tet.sh b/scripts/tet.sh
index 5899df0..b9e1a6b 100755
--- a/scripts/tet.sh
+++ b/scripts/tet.sh
@@ -5,4 +5,4 @@ mkdir -p $SRC_DIR/logs
 
 TET_DIR=$SRC_DIR/tet
 cd $TET_DIR
-testframework/utils/tet_shared/launch.sh $TET_DIR/testframework | tee $SRC_DIR/logs/tet.log
+testframework/utils/tet_shared/launch.sh testframework | tee logs/tet.log
diff --git a/scripts/theme-build.sh b/scripts/theme-build.sh
index ef80523..ffefb76 100755
--- a/scripts/theme-build.sh
+++ b/scripts/theme-build.sh
@@ -7,7 +7,10 @@ cd $SRC_DIR
 rm -rf packages
 mkdir packages
 
-./pki/scripts/compose_dogtag_pki_theme_packages rpms
+pki/scripts/compose_dogtag_pki_theme_packages rpms | tee packages/build.log
+
+mv `find packages/RPMS -name *.rpm` repo
+createrepo repo
 
 rm -rf packages.theme
 mv packages packages.theme
diff --git a/scripts/theme-install.sh b/scripts/theme-install.sh
index be5cd52..8956b0f 100755
--- a/scripts/theme-install.sh
+++ b/scripts/theme-install.sh
@@ -2,4 +2,12 @@
 
 SRC_DIR=`cd ../.. ; pwd`
 
-rpm -ivh $SRC_DIR/packages.theme/RPMS/noarch/*.rpm
+cd $SRC_DIR/repo
+rpm -ivh dogtag-pki-ca-theme-*.rpm\
+        dogtag-pki-kra-theme-*.rpm\
+        dogtag-pki-tps-theme-*.rpm\
+        dogtag-pki-tks-theme-*.rpm\
+        dogtag-pki-console-theme-*.rpm\
+        dogtag-pki-ra-theme-*.rpm\
+        dogtag-pki-common-theme-*.rpm\
+        dogtag-pki-ocsp-theme-*.rpm
diff --git a/scripts/theme-uninstall.sh b/scripts/theme-uninstall.sh
index 9407622..590ad49 100755
--- a/scripts/theme-uninstall.sh
+++ b/scripts/theme-uninstall.sh
@@ -8,4 +8,4 @@ rpm -ev --nodeps\
 	dogtag-pki-console-theme\
 	dogtag-pki-ra-theme\
 	dogtag-pki-common-theme\
-	dogtag-pki-ocsp-theme\
+	dogtag-pki-ocsp-theme