diff --git a/roles/git/make_checkout_seed/files/make-git-checkout-seed.sh b/roles/git/make_checkout_seed/files/make-git-checkout-seed.sh index e40ac6edfc..e873523b90 100644 --- a/roles/git/make_checkout_seed/files/make-git-checkout-seed.sh +++ b/roles/git/make_checkout_seed/files/make-git-checkout-seed.sh @@ -3,7 +3,6 @@ # mkdir /srv/git_seed # cron job to invoke file daily # Need to setup OUTPUT_DIR to be served by apache -# modified by doteast # Where the git repos live. These are bare repos ORIGIN_DIR=/srv/git/rpms @@ -13,16 +12,12 @@ WORK_DIR=/srv/git_seed # Subdirectory makes cleanup easier SEED_DIR=$WORK_DIR/git-checkout -# subdirectory to collect rpm spec files -SPEC_DIR=$WORK_DIR/rpm-specs - # Where to store the seed tarball for download OUTPUT_DIR=/srv/cache/lookaside/ # Instead of starting fresh each time, we'll try to use git pull to keep things synced #rm -rf $WORK_DIR/* mkdir -p $SEED_DIR -mkdir -p $SPEC_DIR # Give people an indication of when this checkout was last synced TIMESTAMP=`date --rfc-3339=seconds` @@ -38,21 +33,15 @@ for repo in $ORIGIN_DIR/*.git ; do git pull --all &> /dev/null sed -i "s@url = .*@url = git://pkgs.fedoraproject.org/$(basename $repo .git)@" $working_tree/.git/config popd &>/dev/null - cp $working_tree/$(basename $repo .git).spec $SPEC_DIR/ else pushd $SEED_DIR &>/dev/null git clone $repo &> /dev/null popd &>/dev/null sed -i "s@url = .*@url = git://pkgs.fedoraproject.org/$(basename $repo .git)@" $working_tree/.git/config - cp $working_tree/$(basename $repo .git).spec $SPEC_DIR/ fi done tar -cf - -C$WORK_DIR $(basename $SEED_DIR)|xz -2 > $OUTPUT_DIR/.git-seed-$DATE.tar.xz -tar -cf - -C$WORK_DIR $(basename $SPEC_DIR)|xz -2 > $OUTPUT_DIR/.rpm-specs-$DATE.tar.xz rm $OUTPUT_DIR/git-seed*tar.xz -rm $OUTPUT_DIR/rpm-specs*tar.xz mv $OUTPUT_DIR/.git-seed-$DATE.tar.xz $OUTPUT_DIR/git-seed-$DATE.tar.xz -mv $OUTPUT_DIR/.rpm-specs-$DATE.tar.xz $OUTPUT_DIR/rpm-specs-$DATE.tar.xz ln -s git-seed-$DATE.tar.xz $OUTPUT_DIR/git-seed-latest.tar.xz -ln -s rpm-specs-$DATE.tar.xz $OUTPUT_DIR/rpm-specs-latest.tar.xz