mirror of
https://github.com/veracrypt/VeraCrypt
synced 2024-11-24 20:13:33 +01:00
Linux: modify installer script to make it run when the "less" command doesn't support the -X argument (Busybox case)
This commit is contained in:
parent
5012e0941a
commit
b920bb2a6a
@ -197,7 +197,7 @@ endif
|
||||
@echo "VERSION=$(TC_VERSION)" >> $(INTERNAL_INSTALLER_NAME)
|
||||
@echo "PACKAGE_TYPE=tar" >> $(INTERNAL_INSTALLER_NAME)
|
||||
@echo "PACKAGE_NAME=$(PACKAGE_NAME)" >> $(INTERNAL_INSTALLER_NAME)
|
||||
@echo "PACKAGE_START=896" >> $(INTERNAL_INSTALLER_NAME)
|
||||
@echo "PACKAGE_START=916" >> $(INTERNAL_INSTALLER_NAME)
|
||||
@echo "INSTALLER_TYPE=$(INSTALLER_TYPE)" >> $(INTERNAL_INSTALLER_NAME)
|
||||
|
||||
@cat $(PWD)/Setup/Linux/veracrypt_install_template.sh >> $(INTERNAL_INSTALLER_NAME)
|
||||
|
@ -774,16 +774,36 @@ printf 'terms of the VeraCrypt License.\n\nPress Enter to display the license te
|
||||
read A
|
||||
|
||||
MORE=more
|
||||
which less >/dev/null 2>/dev/null && MORE='less -E -X'
|
||||
|
||||
HASLESS=0
|
||||
which less >/dev/null 2>/dev/null && HASLESS=1
|
||||
if [ $HASLESS -eq 1 ]
|
||||
then
|
||||
MORE='less -E -X'
|
||||
fi
|
||||
cat <<_END | cat - $LICENSE | $MORE
|
||||
|
||||
Press Enter or space bar to see the rest of the license.
|
||||
|
||||
|
||||
_END
|
||||
if [ $? -ne 0 ]
|
||||
then
|
||||
if [ $HASLESS -eq 1 ]
|
||||
then
|
||||
# use less without -X as it is not supported by some versions (busybox case)
|
||||
MORE='less -E'
|
||||
cat <<_END | cat - $LICENSE | $MORE
|
||||
|
||||
Press Enter or space bar to see the rest of the license.
|
||||
|
||||
|
||||
_END
|
||||
[ $? -ne 0 ] && exit 1
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
[ $? -ne 0 ] && exit 1
|
||||
rm -f $LICENSE
|
||||
|
||||
ACCEPTED=0
|
||||
|
Loading…
Reference in New Issue
Block a user