diff options
-rw-r--r-- | Makefile | 8 | ||||
-rwxr-xr-x | mkasc.sh | 2 | ||||
-rwxr-xr-x | platform/rpm/mkrpm.sh | 11 | ||||
-rwxr-xr-x | test/compile/compile.sh | 5 |
4 files changed, 15 insertions, 11 deletions
@@ -347,12 +347,12 @@ deb: dist config.sh | |||
347 | ./mkdeb.sh | 347 | ./mkdeb.sh |
348 | 348 | ||
349 | .PHONY: test-compile | 349 | .PHONY: test-compile |
350 | test-compile: dist config.mk | 350 | test-compile: dist config.sh |
351 | cd test/compile; ./compile.sh $(TARNAME)-$(VERSION) | 351 | cd test/compile; ./compile.sh |
352 | 352 | ||
353 | .PHONY: rpms | 353 | .PHONY: rpms |
354 | rpms: src/man config.mk | 354 | rpms: src/man config.sh |
355 | ./platform/rpm/mkrpm.sh $(TARNAME) $(VERSION) | 355 | ./platform/rpm/mkrpm.sh |
356 | 356 | ||
357 | .PHONY: extras | 357 | .PHONY: extras |
358 | extras: all | 358 | extras: all |
@@ -3,7 +3,7 @@ | |||
3 | # Copyright (C) 2014-2023 Firejail Authors | 3 | # Copyright (C) 2014-2023 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | . "$(dirname "$0")/config.sh" | 6 | . "$(dirname "$0")/config.sh" || exit 1 |
7 | 7 | ||
8 | printf 'Calculating SHA256 for all files in /transfer - %s version %s' "$TARNAME" "$VERSION" | 8 | printf 'Calculating SHA256 for all files in /transfer - %s version %s' "$TARNAME" "$VERSION" |
9 | 9 | ||
diff --git a/platform/rpm/mkrpm.sh b/platform/rpm/mkrpm.sh index de26ca8d1..0572480c6 100755 --- a/platform/rpm/mkrpm.sh +++ b/platform/rpm/mkrpm.sh | |||
@@ -3,15 +3,18 @@ | |||
3 | # Copyright (C) 2014-2023 Firejail Authors | 3 | # Copyright (C) 2014-2023 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | # | 5 | # |
6 | # Usage: ./platform/rpm/mkrpm.sh firejail <version> "<config options>" | 6 | # Usage: ./platform/rpm/mkrpm.sh <config options> |
7 | # | 7 | # |
8 | # Builds rpms in a temporary directory then places the result in the | 8 | # Builds rpms in a temporary directory then places the result in the |
9 | # current working directory. | 9 | # current working directory. |
10 | 10 | ||
11 | name="$1" | 11 | # shellcheck source=config.sh |
12 | . "$(dirname "$0")/../../config.sh" || exit 1 | ||
13 | |||
14 | name="$TARNAME" | ||
12 | # Strip any trailing prefix from the version like -rc1 etc | 15 | # Strip any trailing prefix from the version like -rc1 etc |
13 | version="$(printf '%s\n' "$2" | sed 's/\-.*//g')" | 16 | version="$(printf '%s\n' "$VERSION" | sed 's/\-.*//g')" |
14 | config_opt="$3" | 17 | config_opt="$*" |
15 | 18 | ||
16 | if [[ ! -f "platform/rpm/${name}.spec" ]]; then | 19 | if [[ ! -f "platform/rpm/${name}.spec" ]]; then |
17 | printf 'error: spec file not found for name %s\n' "${name}" >&2 | 20 | printf 'error: spec file not found for name %s\n' "${name}" >&2 |
diff --git a/test/compile/compile.sh b/test/compile/compile.sh index 06b4646a8..0e3425f8d 100755 --- a/test/compile/compile.sh +++ b/test/compile/compile.sh | |||
@@ -11,7 +11,8 @@ | |||
11 | # install contrib scripts | 11 | # install contrib scripts |
12 | # --enable-analyzer enable GCC 10 static analyzer | 12 | # --enable-analyzer enable GCC 10 static analyzer |
13 | 13 | ||
14 | 14 | # shellcheck source=config.sh | |
15 | . "$(dirname "$0")/../../config.sh" || exit 1 | ||
15 | 16 | ||
16 | arr[1]="TEST 1: standard compilation" | 17 | arr[1]="TEST 1: standard compilation" |
17 | arr[2]="TEST 2: compile dbus proxy disabled" | 18 | arr[2]="TEST 2: compile dbus proxy disabled" |
@@ -51,7 +52,7 @@ print_title() { | |||
51 | echo "**************************************************" | 52 | echo "**************************************************" |
52 | } | 53 | } |
53 | 54 | ||
54 | DIST="$1" | 55 | DIST="$(TARNAME)-$(VERSION)" |
55 | while [[ $# -gt 0 ]]; do # Until you run out of parameters . . . | 56 | while [[ $# -gt 0 ]]; do # Until you run out of parameters . . . |
56 | case "$1" in | 57 | case "$1" in |
57 | --clean) | 58 | --clean) |