Skip to content

Commit cbc3ed2

Browse files
committed
travisify.sh: fix removal of obsolete files
If .travis/notify.sh was missing, the script did not generate the correct commit removing only .travis/settings.xml. The script is now more cautious, calling "git rm -f" on each file only if it is present.
1 parent e4a3637 commit cbc3ed2

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

travisify.sh

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,16 @@ EOL
116116
update "$travisBuildScript"
117117

118118
# Remove obsolete Travis-related files.
119-
test -f "$travisSettingsFile" && info "Removing obsolete $travisSettingsFile (travis-build.sh generates it now)"
120-
test -f "$travisNotifyScript" && info "Removing obsolete $travisNotifyScript (ImageJ Jenkins is going away)"
121-
$EXEC git rm -f "$travisSettingsFile" "$travisNotifyScript"
119+
if [ -f "$travisSettingsFile" ]
120+
then
121+
info "Removing obsolete $travisSettingsFile (travis-build.sh generates it now)"
122+
$EXEC git rm -f "$travisSettingsFile"
123+
fi
124+
if [ -f "$travisNotifyScript" ]
125+
then
126+
info "Removing obsolete $travisNotifyScript (ImageJ Jenkins is going away)"
127+
$EXEC git rm -f "$travisNotifyScript"
128+
fi
122129
$EXEC git diff-index --quiet HEAD -- || $EXEC git ci -m "Travis: remove obsolete files"
123130

124131
# Upgrade version of pom-scijava.

0 commit comments

Comments
 (0)