Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

Linux: Add graphical installer support when xterm is not available (Linux Mint case)

Browse Source
This commit is contained in:
Mounir IDRASSI
2015-02-10 12:40:49 +01:00
parent 1eb8aec9fa
commit 5012e0941a
2 changed files with 37 additions and 5 deletions
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=864" >> $(INTERNAL_INSTALLER_NAME) @echo "PACKAGE_START=896" >> $(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)

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

@@ -21,6 +21,8 @@ tty >/dev/null 2>/dev/null && TTY=1
GUI=0 GUI=0
XMESSAGE=0 XMESSAGE=0
XTERM=0 XTERM=0
GTERM=0
KTERM=0
case $PACKAGE_TYPE in case $PACKAGE_TYPE in
@@ -36,13 +38,15 @@ then
GUI=1 GUI=1
which xmessage >/dev/null 2>/dev/null && XMESSAGE=1 which xmessage >/dev/null 2>/dev/null && XMESSAGE=1
which xterm >/dev/null 2>/dev/null && XTERM=1 which xterm >/dev/null 2>/dev/null && XTERM=1
which gnome-terminal >/dev/null 2>/dev/null && GTERM=1
which konsole >/dev/null 2>/dev/null && KTERM=1
fi fi
if [ $TTY -eq 0 ] if [ $TTY -eq 0 ]
then then
[ $GUI -eq 0 ] && echo 'Error: Terminal required' >&2 && exit 1 [ $GUI -eq 0 ] && echo 'Error: Terminal required' >&2 && exit 1
if [ $XMESSAGE -eq 0 ] || [ $XTERM -eq 0 ] if [ $XMESSAGE -eq 0 ] || ([ $XTERM -eq 0 ] && [ $GTERM -eq 0 ] && [ $KTERM -eq 0 ])
then then
which gnome-terminal && exec gnome-terminal -e "$0" which gnome-terminal && exec gnome-terminal -e "$0"
which konsole && exec konsole -e "$0" which konsole && exec konsole -e "$0"
@@ -53,11 +57,13 @@ then
fi fi
fi fi
if [ $XMESSAGE -eq 0 ] || [ $XTERM -eq 0 ] if [ $XMESSAGE -eq 0 ] || ([ $XTERM -eq 0 ] && [ $GTERM -eq 0 ] && [ $KTERM -eq 0 ])
then then
GUI=0 GUI=0
XMESSAGE=0 XMESSAGE=0
XTERM=0 XTERM=0
GTERM=0
KTERM=0
fi fi
@@ -73,7 +79,20 @@ show_message()
then then
echo "$*" echo "$*"
else else
xterm -T 'VeraCrypt Setup' -e sh -c "echo $*; read A" if [ $XTERM -eq 1 ]
then
xterm -T 'VeraCrypt Setup' -e sh -c "echo $*; read A"
else
if [ $GTERM -eq 1 ]
then
gnome-terminal --title='VeraCrypt Setup' -e "sh -c \"echo $*; read A\""
else
if [ $KTERM -eq 1 ]
then
konsole -T 'VeraCrypt Setup' -e "sh -c \"echo $*; read A\""
fi
fi
fi
fi fi
fi fi
else else
@@ -833,7 +852,20 @@ then
if [ $GUI -eq 1 ] if [ $GUI -eq 1 ]
then then
exec xterm -T 'VeraCrypt Setup' -e sh -c "echo Installing package...; $SUDO $PACKAGE_INSTALLER $PACKAGE_INSTALLER_OPTS $PACKAGE; rm -f $PACKAGE; echo; echo Press Enter to exit...; read A" if [ $XTERM -eq 1 ]
then
exec xterm -T 'VeraCrypt Setup' -e sh -c "echo Installing package...; $SUDO $PACKAGE_INSTALLER $PACKAGE_INSTALLER_OPTS $PACKAGE; rm -f $PACKAGE; echo; echo Press Enter to exit...; read A"
else
if [ $GTERM -eq 1 ]
then
exec gnome-terminal --title='VeraCrypt Setup' -e "sh -c \"echo Installing package...; $SUDO $PACKAGE_INSTALLER $PACKAGE_INSTALLER_OPTS $PACKAGE; rm -f $PACKAGE; echo; echo Press Enter to exit...; read A\""
else
if [ $KTERM -eq 1 ]
then
exec konsole -T 'VeraCrypt Setup' -e "sh -c \"echo Installing package...; $SUDO $PACKAGE_INSTALLER $PACKAGE_INSTALLER_OPTS $PACKAGE; rm -f $PACKAGE; echo; echo Press Enter to exit...; read A\""
fi
fi
fi
else else
echo 'Installing package...' echo 'Installing package...'
$SUDO $PACKAGE_INSTALLER $PACKAGE_INSTALLER_OPTS $PACKAGE && INSTALLED=1 $SUDO $PACKAGE_INSTALLER $PACKAGE_INSTALLER_OPTS $PACKAGE && INSTALLED=1