scripts: export TERMUX_PACKAGE_FORMAT and TERMUX_PACKAGE_MANAGER
Otherwise these variables is not visible to child shells. This caused configure step of termux-tools to always use debian/apt combination, since it checks for variables among environmental variables and they were not visible.
This commit is contained in:
parent
162fb8d95d
commit
b044a49d0f
|
@ -370,7 +370,7 @@ while (($# >= 1)); do
|
|||
if [ -z "$1" ]; then
|
||||
termux_error_exit "./build-package.sh: argument to '--format' should not be empty"
|
||||
fi
|
||||
TERMUX_PACKAGE_FORMAT="$1"
|
||||
export TERMUX_PACKAGE_FORMAT="$1"
|
||||
else
|
||||
termux_error_exit "./build-package.sh: option '--format' requires an argument"
|
||||
fi
|
||||
|
|
|
@ -22,8 +22,8 @@ termux_step_setup_variables() {
|
|||
fi
|
||||
|
||||
case "${TERMUX_PACKAGE_FORMAT-}" in
|
||||
debian) TERMUX_PACKAGE_MANAGER="apt";;
|
||||
pacman) TERMUX_PACKAGE_MANAGER="pacman";;
|
||||
debian) export TERMUX_PACKAGE_MANAGER="apt";;
|
||||
pacman) export TERMUX_PACKAGE_MANAGER="pacman";;
|
||||
*) termux_error_exit "Unsupported package format \"${TERMUX_PACKAGE_FORMAT-}\". Only 'debian' and 'pacman' formats are supported";;
|
||||
esac
|
||||
|
||||
|
|
Loading…
Reference in New Issue