diff --git a/cp2mirror b/cp2mirror index e78ab4c..68b2cd7 100755 --- a/cp2mirror +++ b/cp2mirror @@ -16,34 +16,36 @@ fi for VERSION in `ls -A $MIRRORPATH/mageia/distrib` do - echo "$MIRRORPATH/mageia/distrib/$VERSION" - if [ "$VERSION" = "cauldron" ]; then - VSTRING="cauldron" - else - VSTRING="mga$VERSION" - fi - rsync -aP $APP_PATH/SRPMS/*."$VSTRING".* $MIRRORPATH/lalis/$VERSION/SRPMS/core/updates/ - - if [ -e "$APP_PATH/RPMS/noarch" ]; then - NOARCH=1 - fi - - for i in $ARCH; do - if [ $NOARCH ]; then - echo "noarch" - ARCH_O="noarch" + if [ -d "$MIRRORPATH/mageia/distrib/$VERSION" ]; then + echo "$MIRRORPATH/mageia/distrib/$VERSION" + if [ "$VERSION" = "cauldron" ]; then + VSTRING="cauldron" else - echo "arch" - ARCH_O=$i + VSTRING="mga$VERSION" fi - if [ -e "$APP_PATH/RPMS/$ARCH_O/" ]; then - if ! [ -e "$MIRRORPATH/lalis/$VERSION/$i/media/core/updates/" ]; then - /usr/bin/mkdir -p "$MIRRORPATH/lalis/$VERSION/$i/media/core/updates/" + rsync -aP $APP_PATH/SRPMS/*."$VSTRING".* $MIRRORPATH/lalis/$VERSION/SRPMS/core/updates/ + + if [ -e "$APP_PATH/RPMS/noarch" ]; then + NOARCH=1 + fi + + for i in $ARCH; do + if [ $NOARCH ]; then + echo "noarch" + ARCH_O="noarch" + else + echo "arch" + ARCH_O=$i fi - echo "rsync -aP $APP_PATH/RPMS/$ARCH_O/*.mga"$VERSION".* $MIRRORPATH/lalis/$VERSION/$i/media/core/updates/" - rsync -aP $APP_PATH/RPMS/$ARCH_O/*.mga"$VERSION".* $MIRRORPATH/lalis/$VERSION/$i/media/core/updates/ - gendistrib --nobadrpm --blind --skipmissingdir $MIRRORPATH/lalis/$VERSION/$i - fi - done + if [ -e "$APP_PATH/RPMS/$ARCH_O/" ]; then + if ! [ -e "$MIRRORPATH/lalis/$VERSION/$i/media/core/updates/" ]; then + /usr/bin/mkdir -p "$MIRRORPATH/lalis/$VERSION/$i/media/core/updates/" + fi + echo "rsync -aP $APP_PATH/RPMS/$ARCH_O/*.mga"$VERSION".* $MIRRORPATH/lalis/$VERSION/$i/media/core/updates/" + rsync -aP $APP_PATH/RPMS/$ARCH_O/*.mga"$VERSION".* $MIRRORPATH/lalis/$VERSION/$i/media/core/updates/ + gendistrib --nobadrpm --blind --skipmissingdir $MIRRORPATH/lalis/$VERSION/$i >/dev/null + fi + done + fi done