diff options
| author |   Peter Wilmott <p@p8952.info> | 2015-04-13 19:03:12 +0100 |
|---|---|---|
| committer | Peter Wilmott <p@p8952.info> | 2015-04-13 19:03:12 +0100 |
| commit | 5380f6d27f6a04d4ced645f9221b9025bb0f970c (patch) | |
| tree | 56ddeecdabf7b91d94b8ff71c291cf0667954d55 /bin | |
| parent | When building a package also build it with the next target if possible (diff) | |
| download | ruby-tinderbox-5380f6d27f6a04d4ced645f9221b9025bb0f970c.tar.gz ruby-tinderbox-5380f6d27f6a04d4ced645f9221b9025bb0f970c.tar.bz2 ruby-tinderbox-5380f6d27f6a04d4ced645f9221b9025bb0f970c.zip | |
Correct repoman.sh to work better when the next target is unknown; Rubocop style fixes
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/repoman.sh | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/bin/repoman.sh b/bin/repoman.sh index 25d36b1..923b8b2 100755 --- a/bin/repoman.sh +++ b/bin/repoman.sh @@ -22,9 +22,11 @@ function REPOMAN() { repoman manifest repoman full > /tmp/repoman_log_current || true - sed -i -e "/^USE_RUBY/s/$CURR_TARGET/$CURR_TARGET $NEXT_TARGET/" "$NAME-$VERSION.ebuild" - repoman manifest - repoman full > /tmp/repoman_log_next || true + if [[ "$NEXT_TARGET" != 'unknown' ]]; then + sed -i -e "/^USE_RUBY/s/$CURR_TARGET/$CURR_TARGET $NEXT_TARGET/" "$NAME-$VERSION.ebuild" + repoman manifest + repoman full > /tmp/repoman_log_next || true + fi LOG } @@ -32,19 +34,22 @@ function REPOMAN() { function LOG() { DATE=$(date +%s) SHA1=$(sha1sum "/usr/portage/$CATEGORY/$NAME/$NAME-$VERSION.ebuild" | awk '{print $1}') - mkdir -p "$SCRIPT_DIR/ci-logs/$SHA1/current_target/repomans/$DATE" - mkdir -p "$SCRIPT_DIR/ci-logs/$SHA1/next_target/repomans/$DATE" + mkdir -p "$SCRIPT_DIR/ci-logs/$SHA1/current_target/repomans/$DATE" cp /tmp/repoman_log_current "$SCRIPT_DIR/ci-logs/$SHA1/current_target/repomans/$DATE/repoman_log" - cp /tmp/repoman_log_next "$SCRIPT_DIR/ci-logs/$SHA1/next_target/repomans/$DATE/repoman_log" + + if [[ "$NEXT_TARGET" != 'unknown' ]]; then + mkdir -p "$SCRIPT_DIR/ci-logs/$SHA1/next_target/repomans/$DATE" + cp /tmp/repoman_log_next "$SCRIPT_DIR/ci-logs/$SHA1/next_target/repomans/$DATE/repoman_log" + fi chmod 755 -R "$SCRIPT_DIR/ci-logs" } function CLEANUP() { - rm /tmp/repoman_log_current - rm /tmp/repoman_log_next - rm -r "$SCRIPT_DIR/overlay" + rm /tmp/repoman_log_current || true + rm /tmp/repoman_log_next || true + rm -r "$SCRIPT_DIR/overlay" || true } ENV_SETUP |