VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2015-04-19 14:08:27 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2015-04-19 14:12:53 (GMT)
commit856395962bfe3aa4e0f9537cf386e0b1a80b337b (patch)
tree859d7cea331786de42ef2a57f3c43e9eeec6b05c /src
parentbb2149aac87757aa27a22c42f45e82712d814205 (diff)
downloadVeraCrypt-856395962bfe3aa4e0f9537cf386e0b1a80b337b.zip
VeraCrypt-856395962bfe3aa4e0f9537cf386e0b1a80b337b.tar.gz
Linux installer: Add support for kdesudo and correct usage of konsole external call.
Diffstat (limited to 'src')
-rw-r--r--src/Main/Main.make2
-rw-r--r--src/Setup/Linux/veracrypt_install_template.sh5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Main/Main.make b/src/Main/Main.make
index 9854bd4..7461f82 100644
--- a/src/Main/Main.make
+++ b/src/Main/Main.make
@@ -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=916" >> $(INTERNAL_INSTALLER_NAME)
+ @echo "PACKAGE_START=917" >> $(INTERNAL_INSTALLER_NAME)
@echo "INSTALLER_TYPE=$(INSTALLER_TYPE)" >> $(INTERNAL_INSTALLER_NAME)
@cat $(PWD)/Setup/Linux/veracrypt_install_template.sh >> $(INTERNAL_INSTALLER_NAME)
diff --git a/src/Setup/Linux/veracrypt_install_template.sh b/src/Setup/Linux/veracrypt_install_template.sh
index 22d080f..5fc0fd8 100644
--- a/src/Setup/Linux/veracrypt_install_template.sh
+++ b/src/Setup/Linux/veracrypt_install_template.sh
@@ -89,7 +89,7 @@ show_message()
else
if [ $KTERM -eq 1 ]
then
- konsole -T 'VeraCrypt Setup' -e "sh -c \"echo $*; read A\""
+ konsole --title 'VeraCrypt Setup' --caption 'VeraCrypt Setup' -e sh -c "echo $*; read A"
fi
fi
fi
@@ -734,6 +734,7 @@ else
fi
[ -n "$SUDO" -a $GUI -eq 1 ] && which gksudo >/dev/null 2>/dev/null && SUDO="gksudo -D 'VeraCrypt Setup' --"
+[ -n "$SUDO" -a $GUI -eq 1 ] && which kdesudo >/dev/null 2>/dev/null && SUDO="kdesudo -d --comment 'VeraCrypt Setup' --"
# License agreement
@@ -882,7 +883,7 @@ then
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\""
+ exec konsole --title 'VeraCrypt Setup' --caption '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