diff options
Diffstat (limited to 'src/Setup/Linux')
-rwxr-xr-x[-rw-r--r--] | src/Setup/Linux/mount.veracrypt | 4 | ||||
-rw-r--r-- | src/Setup/Linux/veracrypt_install_template.sh | 13 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/Setup/Linux/mount.veracrypt b/src/Setup/Linux/mount.veracrypt index 499ad9b9..a891c253 100644..100755 --- a/src/Setup/Linux/mount.veracrypt +++ b/src/Setup/Linux/mount.veracrypt @@ -13,11 +13,11 @@ for arg in $*; do fs=*) VCOPTIONS=(${VCOPTIONS[*]} --filesystem=${arg#*=});; keyfiles=*) VCOPTIONS=(${VCOPTIONS[*]} --keyfiles=${arg#*=});; password=*) VCOPTIONS=(${VCOPTIONS[*]} --password=${arg#*=});; - pim=*) VCOPTIONS=(${VCOPTIONS[*]} --pim==${arg#*=});; + pim=*) VCOPTIONS=(${VCOPTIONS[*]} --pim=${arg#*=});; protect-hidden=*) VCOPTIONS=(${VCOPTIONS[*]} --protect-hidden=${arg#*=});; slot=*) VCOPTIONS=(${VCOPTIONS[*]} --slot=${arg#*=});; *) OPTIONS="${OPTIONS}${arg},";; esac done -/usr/bin/veracrypt --non-interactive --text ${VCOPTIONS[*]} --fs-options="${OPTIONS%,*}" ${DEV} ${MNTPT} +/usr/bin/veracrypt --text --non-interactive ${VCOPTIONS[*]} --fs-options="${OPTIONS%,*}" ${DEV} ${MNTPT} diff --git a/src/Setup/Linux/veracrypt_install_template.sh b/src/Setup/Linux/veracrypt_install_template.sh index 966e6f81..e4615966 100644 --- a/src/Setup/Linux/veracrypt_install_template.sh +++ b/src/Setup/Linux/veracrypt_install_template.sh @@ -32,7 +32,11 @@ KTERM=0 case $PACKAGE_TYPE in tar) PACKAGE_INSTALLER=tar - PACKAGE_INSTALLER_OPTS='-C / --keep-directory-symlink --no-overwrite-dir -xpzvf' + if tar --help | grep -q -- '--keep-directory-symlink'; then + PACKAGE_INSTALLER_OPTS='-C / --keep-directory-symlink --no-overwrite-dir -xpzvf' + else + PACKAGE_INSTALLER_OPTS='-C / --no-overwrite-dir -xpzvf' + fi ;; esac @@ -93,7 +97,7 @@ show_message() else if [ $KTERM -eq 1 ] then - konsole --title 'VeraCrypt Setup' -e sh -c "echo $*; read A" + konsole --qwindowtitle 'VeraCrypt Setup' -e sh -c "echo $*; read A" fi fi fi @@ -1031,7 +1035,7 @@ fi if [ "$PACKAGE_TYPE" = "tar" ] then - if ! which fusermount >/dev/null 2>/dev/null || ! which dmsetup >/dev/null 2>/dev/null + if ! which fusermount >/dev/null 2>/dev/null || ! which dmsetup >/dev/null 2>/dev/null || ! service pcscd status >/dev/null 2>/dev/null then show_message "$(cat <<_INFO Requirements for Running VeraCrypt: @@ -1039,6 +1043,7 @@ Requirements for Running VeraCrypt: - FUSE library and tools - device mapper tools + - PC/SC Lite (optional) _INFO )" @@ -1073,7 +1078,7 @@ then else if [ $KTERM -eq 1 ] then - exec konsole --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" + exec konsole --qwindowtitle '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 |