Updated dnf-latest.sh.

diff --git a/dnf-latest.sh b/dnf-latest.sh
index fd8c7276229ce5121e7d0712ba4574a20f3d70ff..c659ee1b72e35cf0deb9f72d202deb85d449c6be 100755 (executable)
--- a/dnf-latest.sh
+++ b/dnf-latest.sh
@@ -5,46 +5,32 @@ FQ_SCRIPTNAME=$(realpath $0)
 SCRIPT_PATH=$(dirname $FQ_SCRIPTNAME)
 . $SCRIPT_PATH/definitions
 
-DOWNLOAD_DIR=/tmp/dnf
+
 IB_BASENAME=${NIM_INSTALLP_BUNDLE_PREFIX}_dnf
 FR_BASENAME=${NIM_FILE_RES_PREFIX}_dnf_conf
 LS_BASENAME=${NIM_LPP_SOURCE_PREFIX}_dnf
+DOWNLOAD_URL_BASE=https://public.dhe.ibm.com/aix/freeSoftware/aixtoolbox/ezinstall/ppc
 
 
 cd $DOWNLOAD_DIR
-#wget https://public.dhe.ibm.com/aix/freeSoftware/aixtoolbox/ezinstall/ppc/dnf_bundle_aix_71_72.tar
-#wget https://public.dhe.ibm.com/aix/freeSoftware/aixtoolbox/ezinstall/ppc/dnf_bundle_aix_73.tar
 for SUFFIX in $SUFFIX_71_72 $SUFFIX_73
 do
-    SOURCE_DIR=$NIM_SOURCES/dnf-$SUFFIX
-    rm -Rf $SOURCE_DIR
-    mkdir $SOURCE_DIR
-    U_SUFFIX=$(echo $SUFFIX | tr '-' '_')
-    tar -x -f dnf_bundle_aix_${U_SUFFIX}.tar -C $SOURCE_DIR
-    rm -f $SOURCE_DIR/extra_list \
-          $SOURCE_DIR/install_dnf.sh \
-          $SOURCE_DIR/rpm.rte
-    chmod 644 $SOURCE_DIR/*
-    IB_NAME=${IB_BASENAME}-$SUFFIX
-    lsnim -t installp_bundle | cut -f 1 -d ' ' | grep $IB_NAME
-    if [ $? -eq 0 ]
+    # file_resource
+    if [ "$SUFFIX" = "$SUFFIX_71_72" ]
     then
-        nim -o remove $IB_NAME
+        FR_SUFFIXES="$SUFFIX_71 $SUFFIX_72"
+    else
+        FR_SUFFIXES=$SUFFIX
     fi
-    nim -o define \
-        -t installp_bundle \
-        -a location=$NIM_INSTALLP_BUNDLES/dnf-${SUFFIX}.bnd \
-        -a server=master \
-        $IB_NAME
-    FR_SUFFIXES=$(echo $SUFFIX | tr '-' ' ')
     for FR_SUFFIX in $FR_SUFFIXES
     do
         FR_NAME=${FR_BASENAME}-$FR_SUFFIX
-        lsnim -t file_res | cut -f 1 -d ' ' | grep $FR_NAME
+        lsnim -t file_res | cut -f 1 -d ' ' | grep $FR_NAME >/dev/null
         if [ $? -eq 0 ]
         then
             nim -o remove $FR_NAME
         fi
+       echo "Creating file_res $FR_NAME"
         nim -o define \
             -t file_res \
             -a dest_dir=/opt/freeware/etc/dnf \
@@ -52,12 +38,38 @@ do
             -a server=master \
             $FR_NAME
     done
+    # installp_bundle
+    IB_NAME=${IB_BASENAME}-$SUFFIX
+    lsnim -t installp_bundle | cut -f 1 -d ' ' | grep $IB_NAME >/dev/null
+    if [ $? -eq 0 ]
+    then
+        nim -o remove $IB_NAME
+    fi
+    echo "Creating lpp_bundle $IB_NAME"
+    nim -o define \
+        -t installp_bundle \
+        -a location=$NIM_INSTALLP_BUNDLES/dnf-${SUFFIX}.bnd \
+        -a server=master \
+        $IB_NAME
+    # lpp_source
+    SOURCE_DIR=$NIM_SOURCES/dnf-$SUFFIX
+    rm -Rf $SOURCE_DIR
+    mkdir $SOURCE_DIR
+    U_SUFFIX=$(echo $SUFFIX | tr '-' '_')
+    SOURCE_FILE=dnf_bundle_aix_${U_SUFFIX}.tar
+    wget $DOWNLOAD_URL_BASE/$SOURCE_FILE
+    tar -x -f $SOURCE_FILE -C $SOURCE_DIR
+    rm -f $SOURCE_DIR/extra_list \
+          $SOURCE_DIR/install_dnf.sh \
+          $SOURCE_DIR/rpm.rte
+    chmod 644 $SOURCE_DIR/*
     LS_NAME=${LS_BASENAME}-$SUFFIX
-    lsnim -t lpp_source | cut -f 1 -d ' ' | grep $LS_NAME
+    lsnim -t lpp_source | cut -f 1 -d ' ' | grep $LS_NAME >/dev/null
     if [ $? -eq 0 ]
     then
         nim -o remove $LS_NAME
     fi
+    echo "Creating lpp_source $LS_NAME"
     nim -o define \
         -t lpp_source \
         -a location=$NIM_LPP_SOURCES/dnf-$SUFFIX \
@@ -66,7 +78,8 @@ do
         -a packages="all" \
         $LS_NAME
     rm -Rf $SOURCE_DIR
+    rm -f $SOURCE_FILE
 done
 
 cd -
-#rm -Rf $DOWNLOAD_DIR
+rm -Rf $DOWNLOAD_DIR