diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/compose_dogtag_pki_meta_packages | 2 | ||||
| -rwxr-xr-x | scripts/compose_dogtag_pki_theme_packages | 2 | ||||
| -rwxr-xr-x | scripts/compose_ipa_pki_theme_packages | 2 | ||||
| -rwxr-xr-x | scripts/compose_pki_console_packages | 2 | ||||
| -rwxr-xr-x | scripts/compose_pki_core_packages | 25 | ||||
| -rwxr-xr-x | scripts/compose_pki_migrate_packages | 2 | ||||
| -rwxr-xr-x | scripts/compose_pki_ra_packages | 2 | ||||
| -rwxr-xr-x | scripts/compose_pki_tps_packages | 2 |
8 files changed, 26 insertions, 13 deletions
diff --git a/scripts/compose_dogtag_pki_meta_packages b/scripts/compose_dogtag_pki_meta_packages index a2dd5752f..a70213c79 100755 --- a/scripts/compose_dogtag_pki_meta_packages +++ b/scripts/compose_dogtag_pki_meta_packages @@ -30,7 +30,7 @@ PKI_PWD=`pwd` ## if [ $WORK_DIR ]; then - PKI_PACKAGES="$WORK_DIR" + PKI_PACKAGES="`cd $WORK_DIR ; pwd`" else PKI_PACKAGES="${PKI_PWD}/packages" fi diff --git a/scripts/compose_dogtag_pki_theme_packages b/scripts/compose_dogtag_pki_theme_packages index f340dbf9c..5b52acaef 100755 --- a/scripts/compose_dogtag_pki_theme_packages +++ b/scripts/compose_dogtag_pki_theme_packages @@ -47,7 +47,7 @@ PKI_COMPONENT_LIST="test common-ui ra-ui tps-ui console-ui" ## if [ $WORK_DIR ]; then - PKI_PACKAGES="$WORK_DIR" + PKI_PACKAGES="`cd $WORK_DIR ; pwd`" else PKI_PACKAGES="${PKI_PWD}/packages" fi diff --git a/scripts/compose_ipa_pki_theme_packages b/scripts/compose_ipa_pki_theme_packages index eac6cddd6..8cd8768b0 100755 --- a/scripts/compose_ipa_pki_theme_packages +++ b/scripts/compose_ipa_pki_theme_packages @@ -47,7 +47,7 @@ PKI_COMPONENT_LIST="common-ui ca-ui" ## if [ $WORK_DIR ]; then - PKI_PACKAGES="$WORK_DIR" + PKI_PACKAGES="`cd $WORK_DIR ; pwd`" else PKI_PACKAGES="${PKI_PWD}/packages" fi diff --git a/scripts/compose_pki_console_packages b/scripts/compose_pki_console_packages index 22f17d07d..4e5bc66ba 100755 --- a/scripts/compose_pki_console_packages +++ b/scripts/compose_pki_console_packages @@ -47,7 +47,7 @@ PKI_COMPONENT_LIST="test console" ## if [ $WORK_DIR ]; then - PKI_PACKAGES="$WORK_DIR" + PKI_PACKAGES="`cd $WORK_DIR ; pwd`" else PKI_PACKAGES="${PKI_PWD}/packages" fi diff --git a/scripts/compose_pki_core_packages b/scripts/compose_pki_core_packages index 99d480c31..eb124ebb0 100755 --- a/scripts/compose_pki_core_packages +++ b/scripts/compose_pki_core_packages @@ -39,9 +39,9 @@ PKI_CORE_VERSION="10.1.0" ## PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_CORE}.spec" -PKI_COMPONENT_LIST="test setup symkey util common native-tools java-tools server selinux ca kra ocsp tks silent" +PKI_COMPONENT_LIST="test setup symkey util common native-tools java-tools server selinux ca kra ocsp tks tps-tomcat silent" -if [ "$JAVADOC" = "" ]; then +if [ "$WITHOUT_JAVADOC" = "" ]; then PKI_COMPONENT_LIST="$PKI_COMPONENT_LIST javadoc" fi @@ -50,7 +50,7 @@ fi ## if [ $WORK_DIR ]; then - PKI_PACKAGES="$WORK_DIR" + PKI_PACKAGES="`cd $WORK_DIR ; pwd`" else PKI_PACKAGES="${PKI_PWD}/packages" fi @@ -154,12 +154,25 @@ else cd ${PKI_BASE_DIR} cp -p ${PKI_BASE_MANIFEST} ${PKI_CORE_BASE_DIR} cp -p VERSION ${PKI_CORE_BASE_DIR} - for component in "${PKI_COMPONENT_LIST}" ; + for component in ${PKI_COMPONENT_LIST} ; do - find ${component} \ + if [ "${component}" = "tps-tomcat" ] ; then + # rename tps-tomcat to tps + dest="tps" + else + dest="${component}" + fi + + # copying ${PKI_BASE_DIR}/${component} to ${PKI_CORE_BASE_DIR}/${dest} + cd ${component} + mkdir ${PKI_CORE_BASE_DIR}/${dest} + + find \ -name .svn -prune -o \ -name *.swp -prune -o \ - -print | cpio -pdum ${PKI_CORE_BASE_DIR} > /dev/null 2>&1 + -print | cpio -pdum ${PKI_CORE_BASE_DIR}/${dest} > /dev/null 2>&1 + + cd .. done cd - > /dev/null 2>&1 diff --git a/scripts/compose_pki_migrate_packages b/scripts/compose_pki_migrate_packages index f9bcaccb8..be93c42c1 100755 --- a/scripts/compose_pki_migrate_packages +++ b/scripts/compose_pki_migrate_packages @@ -47,7 +47,7 @@ PKI_COMPONENT_LIST="test migrate" ## if [ $WORK_DIR ]; then - PKI_PACKAGES="$WORK_DIR" + PKI_PACKAGES="`cd $WORK_DIR ; pwd`" else PKI_PACKAGES="${PKI_PWD}/packages" fi diff --git a/scripts/compose_pki_ra_packages b/scripts/compose_pki_ra_packages index 0e93ee4e1..9aa4dda14 100755 --- a/scripts/compose_pki_ra_packages +++ b/scripts/compose_pki_ra_packages @@ -47,7 +47,7 @@ PKI_COMPONENT_LIST="ra" ## if [ $WORK_DIR ]; then - PKI_PACKAGES="$WORK_DIR" + PKI_PACKAGES="`cd $WORK_DIR ; pwd`" else PKI_PACKAGES="${PKI_PWD}/packages" fi diff --git a/scripts/compose_pki_tps_packages b/scripts/compose_pki_tps_packages index a23c52982..4ffa83cf5 100755 --- a/scripts/compose_pki_tps_packages +++ b/scripts/compose_pki_tps_packages @@ -47,7 +47,7 @@ PKI_COMPONENT_LIST="tps" ## if [ $WORK_DIR ]; then - PKI_PACKAGES="$WORK_DIR" + PKI_PACKAGES="`cd $WORK_DIR ; pwd`" else PKI_PACKAGES="${PKI_PWD}/packages" fi |