Skip to content

Commit c8d524e

Browse files
committed
contrib/release/build-bsd.sh: remove downloaded package
- remove a downloaded package if there was an error unpacking it - clean-up whitespace in build scripts - set the named recipe to the one given by the user, this name is used for setting FBPACKTARGET in fbc's makefile (cherry picked from commit 3a4b556)
1 parent 47b4fd0 commit c8d524e

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

contrib/release/build-bsd.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# - fbc sources are retrieved from Git; you have to specify the exact commit
1010
# to build (or a tag/branch name).
1111
#
12-
# ./build-bsp.sh <target> <fbc-commit-id> [--offline] [--repo url] [--remote name]
12+
# ./build-bsd.sh <target> <fbc-commit-id> [--offline] [--repo url] [--remote name]
1313
#
1414
# <target> can be one of:
1515
# freebsd-x86
@@ -130,6 +130,7 @@ if [ ! -z "$recipe_name" ]; then
130130
user_recipe=-$recipe_name
131131
;;
132132
esac
133+
named_recipe=$user_recipe
133134
else
134135
# if no recipe given, set the default recipe for the main package
135136
user_recipe=
@@ -283,7 +284,7 @@ freebsd*)
283284
# Download & extract FB for bootstrapping
284285
bootfb_package=$bootfb_title.tar.xz
285286
download $bootfb_package "https://downloads.sourceforge.net/fbc/${bootfb_package}?download"
286-
tar xf ../input/$bootfb_package
287+
tar xf ../input/$bootfb_package || rm -f ../input/$bootfb_package
287288

288289
# fbc sources
289290
cp -R ../input/fbc .

0 commit comments

Comments
 (0)