From 810a4cefa5851e812dd97480642b5934446ac22f Mon Sep 17 00:00:00 2001 From: root Date: Sun, 19 Aug 2018 19:40:25 +0200 Subject: [PATCH] committing changes in /etc after apt run --- X11/Xsession.d/50_check_unity_support | 16 +++++++++++++-- bash_completion.d/libreoffice.sh | 28 +++++++++++++-------------- teamviewer/global.conf | 2 +- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/X11/Xsession.d/50_check_unity_support b/X11/Xsession.d/50_check_unity_support index 83f2bd3..a05b5b0 100644 --- a/X11/Xsession.d/50_check_unity_support +++ b/X11/Xsession.d/50_check_unity_support @@ -2,6 +2,18 @@ # If the hardware does not pass unity_support_test, fall back to LLVMpipe # which does. -if [ "x$DESKTOP_SESSION" = "xubuntu" ]; then - /usr/lib/nux/unity_support_test || export LIBGL_ALWAYS_SOFTWARE=1 +if [ "x$DESKTOP_SESSION" = "xubuntu" ] && [ -x "/usr/lib/nux/unity_support_test" ]; then + ( + IFS=':' + for d in $XDG_CURRENT_DESKTOP; do + if [ "x$d" = "xUnity" ] || [ "x$d" = "xUnity7" ]; then + return 0 + fi + done + return 1 + ) + + if [ $? = 0 ]; then + /usr/lib/nux/unity_support_test || export LIBGL_ALWAYS_SOFTWARE=1 + fi fi diff --git a/bash_completion.d/libreoffice.sh b/bash_completion.d/libreoffice.sh index c864e53..faa9f2d 100644 --- a/bash_completion.d/libreoffice.sh +++ b/bash_completion.d/libreoffice.sh @@ -33,17 +33,17 @@ _loexp_ () dc='*-d?(c)*' case "${1##*/}" in - loimpress) e='!*.+(sxi|SXI|sti|STI|ppt|PPT|pps|PPS|pot|POT|sxd|SXD|sda|SDA|sdd|SDD|sdp|SDP|vor|VOR|cgm|CGM|odp|ODP|otp|OTP|fodp|FODP|ppsm|PPSM|ppsx|PPSX|pptm|PPTM|pptx|PPTX|potm|POTM|potx|POTX)' ;; - unopkg) e='!*.+(oxt|OXT)' ;; - lodraw) e='!*.+(sxd|SXD|std|STD|dxf|DXF|emf|EMF|eps|EPS|met|MET|pct|PCT|sgf|SGF|sgv|SGV|sda|SDA|sdd|SDD|vor|VOR|svm|SVM|wmf|WMF|bmp|BMP|gif|GIF|jpg|JPG|jpeg|JPEG|jfif|JFIF|fif|FIF|jpe|JPE|pcd|PCD|pcx|PCX|pgm|PGM|png|PNG|ppm|PPM|psd|PSD|ras|RAS|tga|TGA|tif|TIF|tiff|TIFF|xbm|XBM|xpm|XPM|odg|ODG|otg|OTG|fodg|FODG|odc|ODC|odi|ODI|sds|SDS|wpg|WPG|svg|SVG|vdx|VDX|vsd|VSD|vsdm|VSDM|vsdx|VSDX)' ;; - loweb) e='!*.+(htm|HTM|html|HTML|stw|STW|txt|TXT|vor|VOR|oth|OTH)' ;; - loffice) e='!*.+(sxd|SXD|std|STD|dxf|DXF|emf|EMF|eps|EPS|met|MET|pct|PCT|sgf|SGF|sgv|SGV|sda|SDA|sdd|SDD|vor|VOR|svm|SVM|wmf|WMF|bmp|BMP|gif|GIF|jpg|JPG|jpeg|JPEG|jfif|JFIF|fif|FIF|jpe|JPE|pcd|PCD|pcx|PCX|pgm|PGM|png|PNG|ppm|PPM|psd|PSD|ras|RAS|tga|TGA|tif|TIF|tiff|TIFF|xbm|XBM|xpm|XPM|odg|ODG|otg|OTG|fodg|FODG|odc|ODC|odi|ODI|sds|SDS|wpg|WPG|svg|SVG|vdx|VDX|vsd|VSD|vsdm|VSDM|vsdx|VSDX|doc|DOC|dot|DOT|rtf|RTF|sxw|SXW|stw|STW|sdw|SDW|vor|VOR|txt|TXT|htm?|HTM?|xml|XML|wp|WP|wpd|WPD|wps|WPS|odt|ODT|ott|OTT|fodt|FODT|docm|DOCM|docx|DOCX|dotm|DOTM|dotx|DOTX|sxm|SXM|smf|SMF|mml|MML|odf|ODF|sxi|SXI|sti|STI|ppt|PPT|pps|PPS|pot|POT|sxd|SXD|sda|SDA|sdd|SDD|sdp|SDP|vor|VOR|cgm|CGM|odp|ODP|otp|OTP|fodp|FODP|ppsm|PPSM|ppsx|PPSX|pptm|PPTM|pptx|PPTX|potm|POTM|potx|POTX|odb|ODB|sxc|SXC|stc|STC|dif|DIF|dbf|DBF|xls|XLS|xlw|XLW|xlt|XLT|rtf|RTF|sdc|SDC|vor|VOR|slk|SLK|txt|TXT|htm|HTM|html|HTML|wk1|WK1|wks|WKS|123|123|xml|XML|ods|ODS|ots|OTS|fods|FODS|csv|CSV|xlsb|XLSB|xlsm|XLSM|xlsx|XLSX|xltm|XLTM|xltx|XLTX|sxg|SXG|odm|ODM|sgl|SGL|stw|STW|dot|DOT|vor|VOR|stc|STC|xlt|XLT|sti|STI|pot|POT|std|STD|stw|STW|dotm|DOTM|dotx|DOTX|potm|POTM|potx|POTX|xltm|XLTM|xltx|XLTX|htm|HTM|html|HTML|stw|STW|txt|TXT|vor|VOR|oth|OTH)' ;; lobase) e='!*.+(odb|ODB)' ;; lofromtemplate) e='!*.+(stw|STW|dot|DOT|vor|VOR|stc|STC|xlt|XLT|sti|STI|pot|POT|std|STD|stw|STW|dotm|DOTM|dotx|DOTX|potm|POTM|potx|POTX|xltm|XLTM|xltx|XLTX)' ;; - lomath) e='!*.+(sxm|SXM|smf|SMF|mml|MML|odf|ODF)' ;; - libreoffice) e='!*.+(sxd|SXD|std|STD|dxf|DXF|emf|EMF|eps|EPS|met|MET|pct|PCT|sgf|SGF|sgv|SGV|sda|SDA|sdd|SDD|vor|VOR|svm|SVM|wmf|WMF|bmp|BMP|gif|GIF|jpg|JPG|jpeg|JPEG|jfif|JFIF|fif|FIF|jpe|JPE|pcd|PCD|pcx|PCX|pgm|PGM|png|PNG|ppm|PPM|psd|PSD|ras|RAS|tga|TGA|tif|TIF|tiff|TIFF|xbm|XBM|xpm|XPM|odg|ODG|otg|OTG|fodg|FODG|odc|ODC|odi|ODI|sds|SDS|wpg|WPG|svg|SVG|vdx|VDX|vsd|VSD|vsdm|VSDM|vsdx|VSDX|doc|DOC|dot|DOT|rtf|RTF|sxw|SXW|stw|STW|sdw|SDW|vor|VOR|txt|TXT|htm?|HTM?|xml|XML|wp|WP|wpd|WPD|wps|WPS|odt|ODT|ott|OTT|fodt|FODT|docm|DOCM|docx|DOCX|dotm|DOTM|dotx|DOTX|sxm|SXM|smf|SMF|mml|MML|odf|ODF|sxi|SXI|sti|STI|ppt|PPT|pps|PPS|pot|POT|sxd|SXD|sda|SDA|sdd|SDD|sdp|SDP|vor|VOR|cgm|CGM|odp|ODP|otp|OTP|fodp|FODP|ppsm|PPSM|ppsx|PPSX|pptm|PPTM|pptx|PPTX|potm|POTM|potx|POTX|odb|ODB|sxc|SXC|stc|STC|dif|DIF|dbf|DBF|xls|XLS|xlw|XLW|xlt|XLT|rtf|RTF|sdc|SDC|vor|VOR|slk|SLK|txt|TXT|htm|HTM|html|HTML|wk1|WK1|wks|WKS|123|123|xml|XML|ods|ODS|ots|OTS|fods|FODS|csv|CSV|xlsb|XLSB|xlsm|XLSM|xlsx|XLSX|xltm|XLTM|xltx|XLTX|sxg|SXG|odm|ODM|sgl|SGL|stw|STW|dot|DOT|vor|VOR|stc|STC|xlt|XLT|sti|STI|pot|POT|std|STD|stw|STW|dotm|DOTM|dotx|DOTX|potm|POTM|potx|POTX|xltm|XLTM|xltx|XLTX|htm|HTM|html|HTML|stw|STW|txt|TXT|vor|VOR|oth|OTH)' ;; + unopkg) e='!*.+(oxt|OXT)' ;; + lodraw) e='!*.+(sxd|SXD|std|STD|dxf|DXF|emf|EMF|eps|EPS|met|MET|pct|PCT|sgf|SGF|sgv|SGV|sda|SDA|sdd|SDD|vor|VOR|svm|SVM|wmf|WMF|bmp|BMP|gif|GIF|jpg|JPG|jpeg|JPEG|jfif|JFIF|fif|FIF|jpe|JPE|pcd|PCD|pcx|PCX|pgm|PGM|png|PNG|ppm|PPM|psd|PSD|ras|RAS|tga|TGA|tif|TIF|tiff|TIFF|xbm|XBM|xpm|XPM|odg|ODG|otg|OTG|fodg|FODG|odc|ODC|odi|ODI|sds|SDS|wpg|WPG|svg|SVG|vdx|VDX|vsd|VSD|vsdm|VSDM|vsdx|VSDX)' ;; localc) e='!*.+(sxc|SXC|stc|STC|dif|DIF|dbf|DBF|xls|XLS|xlw|XLW|xlt|XLT|rtf|RTF|sdc|SDC|vor|VOR|slk|SLK|txt|TXT|htm|HTM|html|HTML|wk1|WK1|wks|WKS|123|123|xml|XML|ods|ODS|ots|OTS|fods|FODS|csv|CSV|xlsb|XLSB|xlsm|XLSM|xlsx|XLSX|xltm|XLTM|xltx|XLTX)' ;; + libreoffice) e='!*.+(sxd|SXD|std|STD|dxf|DXF|emf|EMF|eps|EPS|met|MET|pct|PCT|sgf|SGF|sgv|SGV|sda|SDA|sdd|SDD|vor|VOR|svm|SVM|wmf|WMF|bmp|BMP|gif|GIF|jpg|JPG|jpeg|JPEG|jfif|JFIF|fif|FIF|jpe|JPE|pcd|PCD|pcx|PCX|pgm|PGM|png|PNG|ppm|PPM|psd|PSD|ras|RAS|tga|TGA|tif|TIF|tiff|TIFF|xbm|XBM|xpm|XPM|odg|ODG|otg|OTG|fodg|FODG|odc|ODC|odi|ODI|sds|SDS|wpg|WPG|svg|SVG|vdx|VDX|vsd|VSD|vsdm|VSDM|vsdx|VSDX|doc|DOC|dot|DOT|rtf|RTF|sxw|SXW|stw|STW|sdw|SDW|vor|VOR|txt|TXT|htm?|HTM?|xml|XML|wp|WP|wpd|WPD|wps|WPS|odt|ODT|ott|OTT|fodt|FODT|docm|DOCM|docx|DOCX|dotm|DOTM|dotx|DOTX|sxm|SXM|smf|SMF|mml|MML|odf|ODF|sxi|SXI|sti|STI|ppt|PPT|pps|PPS|pot|POT|sxd|SXD|sda|SDA|sdd|SDD|sdp|SDP|vor|VOR|cgm|CGM|odp|ODP|otp|OTP|fodp|FODP|ppsm|PPSM|ppsx|PPSX|pptm|PPTM|pptx|PPTX|potm|POTM|potx|POTX|odb|ODB|sxc|SXC|stc|STC|dif|DIF|dbf|DBF|xls|XLS|xlw|XLW|xlt|XLT|rtf|RTF|sdc|SDC|vor|VOR|slk|SLK|txt|TXT|htm|HTM|html|HTML|wk1|WK1|wks|WKS|123|123|xml|XML|ods|ODS|ots|OTS|fods|FODS|csv|CSV|xlsb|XLSB|xlsm|XLSM|xlsx|XLSX|xltm|XLTM|xltx|XLTX|sxg|SXG|odm|ODM|sgl|SGL|stw|STW|dot|DOT|vor|VOR|stc|STC|xlt|XLT|sti|STI|pot|POT|std|STD|stw|STW|dotm|DOTM|dotx|DOTX|potm|POTM|potx|POTX|xltm|XLTM|xltx|XLTX|htm|HTM|html|HTML|stw|STW|txt|TXT|vor|VOR|oth|OTH)' ;; lowriter) e='!*.+(doc|DOC|dot|DOT|rtf|RTF|sxw|SXW|stw|STW|sdw|SDW|vor|VOR|txt|TXT|htm?|HTM?|xml|XML|wp|WP|wpd|WPD|wps|WPS|odt|ODT|ott|OTT|fodt|FODT|docm|DOCM|docx|DOCX|dotm|DOTM|dotx|DOTX|sxg|SXG|odm|ODM|sgl|SGL)' ;; + loffice) e='!*.+(sxd|SXD|std|STD|dxf|DXF|emf|EMF|eps|EPS|met|MET|pct|PCT|sgf|SGF|sgv|SGV|sda|SDA|sdd|SDD|vor|VOR|svm|SVM|wmf|WMF|bmp|BMP|gif|GIF|jpg|JPG|jpeg|JPEG|jfif|JFIF|fif|FIF|jpe|JPE|pcd|PCD|pcx|PCX|pgm|PGM|png|PNG|ppm|PPM|psd|PSD|ras|RAS|tga|TGA|tif|TIF|tiff|TIFF|xbm|XBM|xpm|XPM|odg|ODG|otg|OTG|fodg|FODG|odc|ODC|odi|ODI|sds|SDS|wpg|WPG|svg|SVG|vdx|VDX|vsd|VSD|vsdm|VSDM|vsdx|VSDX|doc|DOC|dot|DOT|rtf|RTF|sxw|SXW|stw|STW|sdw|SDW|vor|VOR|txt|TXT|htm?|HTM?|xml|XML|wp|WP|wpd|WPD|wps|WPS|odt|ODT|ott|OTT|fodt|FODT|docm|DOCM|docx|DOCX|dotm|DOTM|dotx|DOTX|sxm|SXM|smf|SMF|mml|MML|odf|ODF|sxi|SXI|sti|STI|ppt|PPT|pps|PPS|pot|POT|sxd|SXD|sda|SDA|sdd|SDD|sdp|SDP|vor|VOR|cgm|CGM|odp|ODP|otp|OTP|fodp|FODP|ppsm|PPSM|ppsx|PPSX|pptm|PPTM|pptx|PPTX|potm|POTM|potx|POTX|odb|ODB|sxc|SXC|stc|STC|dif|DIF|dbf|DBF|xls|XLS|xlw|XLW|xlt|XLT|rtf|RTF|sdc|SDC|vor|VOR|slk|SLK|txt|TXT|htm|HTM|html|HTML|wk1|WK1|wks|WKS|123|123|xml|XML|ods|ODS|ots|OTS|fods|FODS|csv|CSV|xlsb|XLSB|xlsm|XLSM|xlsx|XLSX|xltm|XLTM|xltx|XLTX|sxg|SXG|odm|ODM|sgl|SGL|stw|STW|dot|DOT|vor|VOR|stc|STC|xlt|XLT|sti|STI|pot|POT|std|STD|stw|STW|dotm|DOTM|dotx|DOTX|potm|POTM|potx|POTX|xltm|XLTM|xltx|XLTX|htm|HTM|html|HTML|stw|STW|txt|TXT|vor|VOR|oth|OTH)' ;; + loimpress) e='!*.+(sxi|SXI|sti|STI|ppt|PPT|pps|PPS|pot|POT|sxd|SXD|sda|SDA|sdd|SDD|sdp|SDP|vor|VOR|cgm|CGM|odp|ODP|otp|OTP|fodp|FODP|ppsm|PPSM|ppsx|PPSX|pptm|PPTM|pptx|PPTX|potm|POTM|potx|POTX)' ;; + lomath) e='!*.+(sxm|SXM|smf|SMF|mml|MML|odf|ODF)' ;; + loweb) e='!*.+(htm|HTM|html|HTML|stw|STW|txt|TXT|vor|VOR|oth|OTH)' ;; *) e='!*' esac @@ -95,16 +95,16 @@ _loexp_ () complete -d -X '.[^./]*' -F _loexp_ ${_file} \ - loimpress \ + lobase \ + lofromtemplate \ unopkg \ lodraw \ - loweb \ + localc \ + libreoffice \ + lowriter \ loffice \ - lobase \ - lofromtemplate \ + loimpress \ lomath \ - libreoffice \ - localc \ - lowriter + loweb unset _def _dir _file _nosp _minusdd _minusdf diff --git a/teamviewer/global.conf b/teamviewer/global.conf index f2952fb..7f317c2 100644 --- a/teamviewer/global.conf +++ b/teamviewer/global.conf @@ -17,4 +17,4 @@ TeamViewer Global Settings [bin ] PK = dc5641dcd04e9cd404982e9177002743a5c27b8b39636d56e6544f76061760dadad5227c7798c2e46a0599de6daf91d9da694796488d37b98703624538b74cfe0a080b5b2398fd060fabce96f30cf90fb93e1a65883ae78d72382d62916116116a6333c9dbba14f264e54d50f887f3ab554b41cd4b74f254531d5feb936a3f96d0fce25d27e2471f29aef9b52b87644d47b12df8e33c4aad1e95c8b41fb63781d8373b6a147145a173d3646ef888ee9f2ffb51e22a90afd2e547cd44fab80959e7cb7af12a9f994069c60cb39b23310320b37009ab2df1b33dce16946971755f9ada0e78a68882c9d767b1169ab9586452ea7b1287559517075052b487ca2b0a0a1777e800def7f97d0ed552d543d5b8a69021c2731583e800f713fc827034fcb9c5119a0bf785775475fe77c079b4aa0539d87f449556fbffe5e3cd16521ef0af5205b806e51f928062121752b024471ef7ee5ee9e828585bf7f2c982111ca6508c159b51bae4af7a574d0a763078e0a278b777cbc61bb17ac1bcfc6744e9153fea69bbb917cd7ee32ca349cb068f96fcbf5d17509e77f8b925be79e6d9bbe2116211e9edafe123e2f7921891519222eadd6c866deaa9ed200183c9e2c52185330b3a3d0a43b3dbede24d6d36a9de8878f457d9396662a53ff21c64a62297b99980fa1c8b2d360037546abc2449a19411406b8d5ab9b0e634aa2e124b7d996d79ee42caad221da70bdae5ce7fcaf4159ee393703f6ac831f50a60af1fe46179c2c6cb51301b2e947a7fd8fb31e6f7294ad4e3e5aae88b9358ce160da9f95189b23d385c051428552dfb2681dbf3ab2943b04a21b949b8b163b4bc6cacdb5c309b28907e671559d3d8b6305b784d829dca5b050ebb4333ef09b5e5475c71e7d2 [bin ] SK = dc5641dcd04e9cd404982e9177002743a5c27b8b39636d56e6544f76061760dac23de5710782c706e1766f98e619d4956ec4ecfcd49c940d1d79e8c1739446312c0bbdfcac0aac5560cc809780b963a1134d209cb9e8843961f8951e97955f1dae30b15a42621daa619deafead896bf9082d7bc0f790f7d7dc2aeccceacda7cde3ff5c851348e565927f4967f02469623724e037f03626d7b5e907317f9ea60ee2f2ea08a8cb9287e0210121d53cd2faed19aec2c85e613683af2ddbd01ce47559af9a1bc2b7ed122982a818c1845f122f2bdac8e9c2ed8dc9a9a5384ec641c39d85012d4bdc62d0848fa5f1956e46596058af165be3be3d3c1dc5be02380aad7c7ffd4b48ee6f9a7399ad05517884315bfd48b076a8eac73bd8e90b4b76f267ac1d3a94eb0821cc3d0bb23766e2f0974df5232d340cea565797a2b9b2d27494991f955e30ed2e5c26ff7507957f2c8d6be113d34270555453dcba58942e6d6e89550e990b9f4ec4327e9fc6325ed9ea01e77c2df60381582b4c51d896d99e10c1ffdcb6e5c14c1854f164c5c017f89584617ae6fdb3a146582d281903e0d8c07f3db0fb00acf47fa69a8b6fe3581644533b04970457a04d19ce22efb74d6fef395b1fcc3cfd11e14f0690d5c49552fd1a3b8a69b74618a451426e688acdc19505de4add131bbd4d290d5d61c2ab9dbfa59c509679bfa8d6f569b3c7f136f7582eabb467ccb5094d141bfc49fdbe1eb99f63bd41d7f8e99fd3195cb2d851d7e9ef976922abf8665fec03b803c22d159a74f9965ae3efef4d556ecb6fe112fd8af2f8777b48eab4ded1a8370b64d532a397c8166cad26c126d3d4e6802367bd874bde66c8573f631b9680922f8495b9a8c221407a01b0e572cbbafc4a9564ec05 [bin ] SRPPasswordMachineIdentifier = 2331d140c7670af7230122a130323e7b0a4dc9af0d6179e2b247bad4eb1a272d30f7344d56e2a1aad0159a6eb0369ef70146854bf3a3b9d9da302aa3fb519f88c64cd7a190541e91a4d432ea891ca731b1e2cbc060bfbe624da88e3368aaf0fffd7ea4b8e3a8f5414047fa3ee2f6ed9d -[strng] Version = "13.1.8286 " +[strng] Version = "13.2.13582 " -- 2.43.0