Skip to content

Commit 3e91d64

Browse files
committed
fixup
1 parent 72778ed commit 3e91d64

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

ci/install-dependencies.sh

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,27 @@ ubuntu-*|i386/ubuntu-*|debian-*)
6868
wget --quiet --directory-prefix="$CUSTOM_PATH" \
6969
"$P4WHENCE/bin.linux26x86_64/p4d" \
7070
"$P4WHENCE/bin.linux26x86_64/p4" &&
71-
chmod a+x "$CUSTOM_PATH/p4d" "$CUSTOM_PATH/p4" ||
72-
echo >&2 "P4 download (optional) failed"
71+
chmod a+x "$CUSTOM_PATH/p4d" "$CUSTOM_PATH/p4" || {
72+
rm -f "$CUSTOM_PATH/p4"
73+
rm -f "$CUSTOM_PATH/p4d"
74+
echo >&2 "P4 download (optional) failed"
75+
}
7376

7477
wget --quiet \
7578
"$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" &&
7679
tar -xzf "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" \
7780
-C "$CUSTOM_PATH" --strip-components=1 \
7881
"git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs" &&
79-
rm "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" ||
80-
echo >&2 "LFS download (optional) failed"
82+
rm "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" || {
83+
rm -f "$CUSTOM_PATH/git-lfs"
84+
echo >&2 "LFS download (optional) failed"
85+
}
8186

8287
wget --quiet "$JGITWHENCE" --output-document="$CUSTOM_PATH/jgit" &&
83-
chmod a+x "$CUSTOM_PATH/jgit" ||
84-
echo >&2 "JGit download (optional) failed"
88+
chmod a+x "$CUSTOM_PATH/jgit" || {
89+
rm -f "$CUSTOM_PATH/jgit"
90+
echo >&2 "JGit download (optional) failed"
91+
}
8592
;;
8693
esac
8794
;;

0 commit comments

Comments
 (0)