summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-10-04 13:03:43 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-10-04 13:04:29 -0500
commit3e5e1eefbe553b9223cfc1743b420f471227bc2b (patch)
treea232769e06351dac583207fdb34f859c4ed292d3
parent423d7650e89cbfa36b6744b11637760f0b410453 (diff)
downloadpki-dev-3e5e1eefbe553b9223cfc1743b420f471227bc2b.tar.gz
pki-dev-3e5e1eefbe553b9223cfc1743b420f471227bc2b.tar.xz
pki-dev-3e5e1eefbe553b9223cfc1743b420f471227bc2b.zip
Updated RA scripts.
-rwxr-xr-xscripts/ra-build.sh18
-rwxr-xr-xscripts/ra-install.sh10
2 files changed, 18 insertions, 10 deletions
diff --git a/scripts/ra-build.sh b/scripts/ra-build.sh
index 73191ac..ec096d6 100755
--- a/scripts/ra-build.sh
+++ b/scripts/ra-build.sh
@@ -1,17 +1,21 @@
#!/bin/sh -x
-SRC_DIR=`cd ../.. ; pwd`
+WORK_DIR=`pwd`
+PROJECT_DIR=`cd ../.. ; pwd`
+COMPONENT=ra
-cd $SRC_DIR
+mkdir -p $WORK_DIR/build
+rm -rf $WORK_DIR/build/$COMPONENT
+cd $PROJECT_DIR
rm -rf packages
mkdir -p packages
-pki/scripts/compose_pki_ra_packages rpms | tee packages/build.log
+pki/scripts/compose_pki_${COMPONENT}_packages rpms 2>&1 | tee packages/build.log
+
+mv packages $WORK_DIR/build/$COMPONENT
+cd $WORK_DIR/build/$COMPONENT
mkdir -p repo
-mv `find packages/RPMS -name *.rpm` repo
+mv `find RPMS -name *.rpm` repo
createrepo repo
-
-rm -rf packages.ra
-mv packages packages.ra
diff --git a/scripts/ra-install.sh b/scripts/ra-install.sh
index 856c74e..cd5fe6f 100755
--- a/scripts/ra-install.sh
+++ b/scripts/ra-install.sh
@@ -1,6 +1,10 @@
#!/bin/sh -x
-SRC_DIR=`cd ../.. ; pwd`
+WORK_DIR=`pwd`
+PROJECT_DIR=`cd ../.. ; pwd`
+COMPONENT=ra
+
+cd $WORK_DIR/build/$COMPONENT/repo
+
+yum install -y *.rpm
-cd $SRC_DIR/repo
-rpm -ivh pki-ra-*.rpm