nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-11-28 14:03:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Linux: modify installer script to make it run when the "less" command doesn't support the -X argument (Busybox case)

Browse Source
This commit is contained in:
Mounir IDRASSI 2015-02-10 15:05:20 +01:00
parent 5012e0941a
commit b920bb2a6a
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Main/Main.make
View File

@ -197,7 +197,7 @@ endif
@echo "VERSION=$(TC_VERSION)" >> $(INTERNAL_INSTALLER_NAME) @echo "VERSION=$(TC_VERSION)" >> $(INTERNAL_INSTALLER_NAME)
@echo "PACKAGE_TYPE=tar" >> $(INTERNAL_INSTALLER_NAME) @echo "PACKAGE_TYPE=tar" >> $(INTERNAL_INSTALLER_NAME)
@echo "PACKAGE_NAME=$(PACKAGE_NAME)" >> $(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) @echo "INSTALLER_TYPE=$(INSTALLER_TYPE)" >> $(INTERNAL_INSTALLER_NAME)
@cat $(PWD)/Setup/Linux/veracrypt_install_template.sh >> $(INTERNAL_INSTALLER_NAME) @cat $(PWD)/Setup/Linux/veracrypt_install_template.sh >> $(INTERNAL_INSTALLER_NAME)

24
src/Setup/Linux/veracrypt_install_template.sh
View File

@ -774,16 +774,36 @@ printf 'terms of the VeraCrypt License.\n\nPress Enter to display the license te
read A read A
MORE=more 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 cat <<_END | cat - $LICENSE | $MORE
Press Enter or space bar to see the rest of the license. Press Enter or space bar to see the rest of the license.
_END _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 [ $? -ne 0 ] && exit 1
else
exit 1
fi
fi
rm -f $LICENSE rm -f $LICENSE
ACCEPTED=0 ACCEPTED=0