Linux: Better Linux desktop integration. Add mount.veracrypt script for fstab (proposed by unit193 at https://github.com/veracrypt/VeraCrypt/issues/814)
This commit is contained in:
parent
49a1252306
commit
7df5a58adc
|
@ -194,6 +194,9 @@ MESSAGE ( STATUS "Architecture = ${ARCHITECTURE}" )
|
||||||
install(DIRECTORY ${VERACRYPT_BUILD_DIR}/usr/bin
|
install(DIRECTORY ${VERACRYPT_BUILD_DIR}/usr/bin
|
||||||
DESTINATION .
|
DESTINATION .
|
||||||
USE_SOURCE_PERMISSIONS)
|
USE_SOURCE_PERMISSIONS)
|
||||||
|
install(DIRECTORY ${VERACRYPT_BUILD_DIR}/usr/sbin
|
||||||
|
DESTINATION .
|
||||||
|
USE_SOURCE_PERMISSIONS)
|
||||||
install(DIRECTORY ${VERACRYPT_BUILD_DIR}/usr/share
|
install(DIRECTORY ${VERACRYPT_BUILD_DIR}/usr/share
|
||||||
DESTINATION .
|
DESTINATION .
|
||||||
USE_SOURCE_PERMISSIONS)
|
USE_SOURCE_PERMISSIONS)
|
||||||
|
@ -317,6 +320,7 @@ elseif ( ( PLATFORM STREQUAL "CentOS" ) OR ( PLATFORM STREQUAL "openSUSE" ) )
|
||||||
# This is to avoid having %dir of these directories in the .spec file
|
# This is to avoid having %dir of these directories in the .spec file
|
||||||
set( CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr" )
|
set( CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr" )
|
||||||
list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/bin" )
|
list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/bin" )
|
||||||
|
list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/sbin" )
|
||||||
list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/share" )
|
list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/share" )
|
||||||
list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/share/applications" )
|
list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/share/applications" )
|
||||||
list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/share/doc" )
|
list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/share/doc" )
|
||||||
|
|
|
@ -255,11 +255,16 @@ prepare: $(APPNAME)
|
||||||
mkdir -p $(BASE_DIR)/Setup/Linux/usr/share/veracrypt/languages
|
mkdir -p $(BASE_DIR)/Setup/Linux/usr/share/veracrypt/languages
|
||||||
cp -r $(BASE_DIR)/../Translations/* $(BASE_DIR)/Setup/Linux/usr/share/veracrypt/languages/
|
cp -r $(BASE_DIR)/../Translations/* $(BASE_DIR)/Setup/Linux/usr/share/veracrypt/languages/
|
||||||
|
|
||||||
|
mkdir -p $(BASE_DIR)/Setup/Linux/usr/sbin
|
||||||
|
cp $(BASE_DIR)/Setup/Linux/mount.$(APPNAME) $(BASE_DIR)/Setup/Linux/usr/sbin/mount.$(APPNAME)
|
||||||
|
chmod +x $(BASE_DIR)/Setup/Linux/usr/sbin/mount.$(APPNAME)
|
||||||
ifndef TC_NO_GUI
|
ifndef TC_NO_GUI
|
||||||
mkdir -p $(BASE_DIR)/Setup/Linux/usr/share/applications
|
mkdir -p $(BASE_DIR)/Setup/Linux/usr/share/applications
|
||||||
mkdir -p $(BASE_DIR)/Setup/Linux/usr/share/pixmaps
|
mkdir -p $(BASE_DIR)/Setup/Linux/usr/share/pixmaps
|
||||||
|
mkdir -p $(BASE_DIR)/Setup/Linux/usr/share/mime/packages
|
||||||
cp $(BASE_DIR)/Resources/Icons/VeraCrypt-256x256.xpm $(BASE_DIR)/Setup/Linux/usr/share/pixmaps/$(APPNAME).xpm
|
cp $(BASE_DIR)/Resources/Icons/VeraCrypt-256x256.xpm $(BASE_DIR)/Setup/Linux/usr/share/pixmaps/$(APPNAME).xpm
|
||||||
cp $(BASE_DIR)/Setup/Linux/$(APPNAME).desktop $(BASE_DIR)/Setup/Linux/usr/share/applications/$(APPNAME).desktop
|
cp $(BASE_DIR)/Setup/Linux/$(APPNAME).desktop $(BASE_DIR)/Setup/Linux/usr/share/applications/$(APPNAME).desktop
|
||||||
|
cp $(BASE_DIR)/Setup/Linux/$(APPNAME).xml $(BASE_DIR)/Setup/Linux/usr/share/mime/packages/$(APPNAME).xml
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -306,8 +311,10 @@ prepare: $(APPNAME)
|
||||||
ifndef TC_NO_GUI
|
ifndef TC_NO_GUI
|
||||||
mkdir -p $(BASE_DIR)/Setup/FreeBSD/usr/share/applications
|
mkdir -p $(BASE_DIR)/Setup/FreeBSD/usr/share/applications
|
||||||
mkdir -p $(BASE_DIR)/Setup/FreeBSD/usr/share/pixmaps
|
mkdir -p $(BASE_DIR)/Setup/FreeBSD/usr/share/pixmaps
|
||||||
|
mkdir -p $(BASE_DIR)/Setup/Linux/usr/share/mime/packages
|
||||||
cp $(BASE_DIR)/Resources/Icons/VeraCrypt-256x256.xpm $(BASE_DIR)/Setup/FreeBSD/usr/share/pixmaps/$(APPNAME).xpm
|
cp $(BASE_DIR)/Resources/Icons/VeraCrypt-256x256.xpm $(BASE_DIR)/Setup/FreeBSD/usr/share/pixmaps/$(APPNAME).xpm
|
||||||
cp $(BASE_DIR)/Setup/Linux/$(APPNAME).desktop $(BASE_DIR)/Setup/FreeBSD/usr/share/applications/$(APPNAME).desktop
|
cp $(BASE_DIR)/Setup/Linux/$(APPNAME).desktop $(BASE_DIR)/Setup/FreeBSD/usr/share/applications/$(APPNAME).desktop
|
||||||
|
cp $(BASE_DIR)/Setup/Linux/$(APPNAME).xml $(BASE_DIR)/Setup/Linux/usr/share/mime/packages/$(APPNAME).xml
|
||||||
endif
|
endif
|
||||||
chown -R root:wheel $(BASE_DIR)/Setup/FreeBSD/usr
|
chown -R root:wheel $(BASE_DIR)/Setup/FreeBSD/usr
|
||||||
chmod -R go-w $(BASE_DIR)/Setup/FreeBSD/usr
|
chmod -R go-w $(BASE_DIR)/Setup/FreeBSD/usr
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
#!/bin/bash
|
||||||
|
DEV="$1"
|
||||||
|
MNTPT="$2"
|
||||||
|
VCOPTIONS=""
|
||||||
|
OPTIONS=""
|
||||||
|
|
||||||
|
shift 3
|
||||||
|
IFS=','
|
||||||
|
for arg in $*; do
|
||||||
|
case "$arg" in
|
||||||
|
truecrypt) VCOPTIONS=(${VCOPTIONS[*]} --truecrypt);;
|
||||||
|
system) VCOPTIONS=(${VCOPTIONS[*]} --mount-options=system);;
|
||||||
|
fs=*) VCOPTIONS=(${VCOPTIONS[*]} --filesystem=${arg#*=});;
|
||||||
|
keyfiles=*) VCOPTIONS=(${VCOPTIONS[*]} --keyfiles=${arg#*=});;
|
||||||
|
password=*) VCOPTIONS=(${VCOPTIONS[*]} --password=${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}
|
|
@ -1,10 +1,11 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Encoding=UTF-8
|
|
||||||
Name=VeraCrypt
|
|
||||||
GenericName=VeraCrypt
|
|
||||||
Comment=VeraCrypt
|
|
||||||
Exec=/usr/bin/veracrypt
|
|
||||||
Icon=veracrypt
|
|
||||||
Terminal=false
|
|
||||||
Type=Application
|
Type=Application
|
||||||
Categories=Encryption;Encryption Tools;Utility;
|
Name=VeraCrypt
|
||||||
|
GenericName=VeraCrypt volume manager
|
||||||
|
Comment=Create and mount VeraCrypt encrypted volumes
|
||||||
|
Icon=veracrypt
|
||||||
|
Exec=/usr/bin/veracrypt %f
|
||||||
|
Categories=Security;Utility;Filesystem
|
||||||
|
Keywords=encryption,filesystem
|
||||||
|
Terminal=false
|
||||||
|
MimeType=application/x-veracrypt-volume;application/x-truecrypt-volume;
|
Loading…
Reference in New Issue