From 8aa41ac42f1a1cd12e558f4b2d714daa34918ac8 Mon Sep 17 00:00:00 2001 From: Herman van Boeijen Date: Mon, 29 Oct 2018 11:36:00 +0100 Subject: [PATCH 001/406] Adding en_US support for Illustrator CC 2019 --- mackup/applications/illustrator.cfg | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/mackup/applications/illustrator.cfg b/mackup/applications/illustrator.cfg index a15cbbc85..ca399fc0c 100644 --- a/mackup/applications/illustrator.cfg +++ b/mackup/applications/illustrator.cfg @@ -11,3 +11,21 @@ Library/Preferences/Adobe Illustrator 18 Settings Library/Preferences/Adobe Illustrator 19 Settings Library/Preferences/Adobe Illustrator 20 Settings Library/Preferences/com.adobe.illustrator.plist + +Library/Preferences/Adobe Illustrator 23 Settings/en_US/Adobe Illustrator Prefs +Library/Preferences/Adobe Illustrator 23 Settings/en_US/Workspaces/ +Library/Preferences/Adobe Illustrator 23 Settings/en_US/Modified Workspaces/ +Library/Preferences/Adobe Illustrator 23 Settings/en_US/DataRecovery +Library/Preferences/Adobe Illustrator 23 Settings/en_US/Tools/Tools Panel Presets +Library/Preferences/Adobe Illustrator 23 Settings/en_US/Print Presets +Library/Preferences/Adobe Illustrator 23 Settings/en_US/Transparency flattener presets +Library/Preferences/Adobe Illustrator 23 Settings/en_US/ +Library/Preferences/Adobe Illustrator 23 Settings/en_US/VariableWidthProfiles +Library/Preferences/Adobe Illustrator 23 Settings/en_US/Perspective grid Presets +Library/Preferences/Adobe Illustrator 23 Settings/en_US/Vectorizing Presets +Library/Preferences/Adobe Illustrator 23 Settings/en_US/Last Used Artboard Export Settings +Library/Preferences/Adobe Illustrator 23 Settings/en_US/Last Used Asset Export Settings + +Library/Application Support/Adobe/Adobe Illustrator 23/en_US/Swatches/ +Library/Application Support/Adobe/Adobe Illustrator 23/en_US/Adobe SVG Filters.svg +Library/Application Support/Adobe/OOBE From c5597e9a6be2cdc6ca7ff2d78d4c42720d342132 Mon Sep 17 00:00:00 2001 From: Herman van Boeijen Date: Mon, 29 Oct 2018 11:39:44 +0100 Subject: [PATCH 002/406] Removed crash recovery folder, as it's very local --- mackup/applications/illustrator.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/mackup/applications/illustrator.cfg b/mackup/applications/illustrator.cfg index ca399fc0c..bb0c7de41 100644 --- a/mackup/applications/illustrator.cfg +++ b/mackup/applications/illustrator.cfg @@ -15,7 +15,6 @@ Library/Preferences/com.adobe.illustrator.plist Library/Preferences/Adobe Illustrator 23 Settings/en_US/Adobe Illustrator Prefs Library/Preferences/Adobe Illustrator 23 Settings/en_US/Workspaces/ Library/Preferences/Adobe Illustrator 23 Settings/en_US/Modified Workspaces/ -Library/Preferences/Adobe Illustrator 23 Settings/en_US/DataRecovery Library/Preferences/Adobe Illustrator 23 Settings/en_US/Tools/Tools Panel Presets Library/Preferences/Adobe Illustrator 23 Settings/en_US/Print Presets Library/Preferences/Adobe Illustrator 23 Settings/en_US/Transparency flattener presets From d08d470f95151adb3d70d733c9e4a87d9fa3d538 Mon Sep 17 00:00:00 2001 From: Herman van Boeijen Date: Mon, 29 Oct 2018 11:43:37 +0100 Subject: [PATCH 003/406] Add support for Adobe Illustrator CC2019 (v23) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f7060179..2f3620c75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Add support for xonsh (via @kmcm0) - Add support for Alacritty - Add support for WebStorm 2017.1, 2017.2, 2017.3, 2018.1, 2018.2 (via @KrzysztofKarol) +- Add support for Adobe Illustrator CC2019 (v23) ## Mackup 0.8.19 From 8b30fd72a68b9f99f8131c91e77fd9ae739c13fe Mon Sep 17 00:00:00 2001 From: John Fitzpatrick Date: Wed, 21 Nov 2018 10:01:16 +1100 Subject: [PATCH 004/406] Added support for PhpStorm 2018.2 (#1258) * New filespecs in mackup/applications/phpstorm.cfg * Entry in CHANGELOG --- CHANGELOG.md | 1 + mackup/applications/phpstorm.cfg | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70f0815fd..e775620ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Add support for hstr (via @paxperscientiam) - Add support for b-ryan/powerline-shell (via @paxperscientiam) - Add support for kovidgoyal/kitty (via @foray1010) +- Add support for PhpStorm 2018.2 (via @j13k) ## Mackup 0.8.20 diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg index 7017bf394..ba0b7cd34 100644 --- a/mackup/applications/phpstorm.cfg +++ b/mackup/applications/phpstorm.cfg @@ -3,6 +3,8 @@ name = PhpStorm [configuration_files] Library/Preferences/com.jetbrains.PhpStorm.plist +Library/Application Support/PhpStorm2018.2 +Library/Preferences/PhpStorm2018.2 Library/Application Support/PhpStorm2018.1 Library/Preferences/PhpStorm2018.1 Library/Application Support/PhpStorm2017.3 From a6dffa07ba0ac1494e5551b69726523ee0930257 Mon Sep 17 00:00:00 2001 From: Kyle Johnston Date: Mon, 17 Dec 2018 13:44:30 -0500 Subject: [PATCH 005/406] Update support for i3 (#1267) * Update support for i3 As stated in https://i3wm.org/docs/userguide.html#configuring, the i3 config file can be stored at either ~/.i3/config or ~/.config/i3/config. i3.cfg has been updated to include the latter option. README.md has two listings for i3, both pointing to the same website. i3wm has been removed, leaving just the official name of i3. * Update CHANGELOG.md --- CHANGELOG.md | 1 + README.md | 1 - mackup/applications/i3.cfg | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e775620ff..8c363c04b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Update support for i3 (@KyleWJohnston) - Add support for bc (via @paxperscientiam) - Add support for Google clasp (via @paxperscientiam) - Add support for hstr (via @paxperscientiam) diff --git a/README.md b/README.md index d7117d10f..fdaef2e17 100644 --- a/README.md +++ b/README.md @@ -308,7 +308,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [HyperSwitch](https://bahoom.com/hyperswitch) - [i2cssh](https://github.com/wouterdebie/i2cssh) - [i3](https://i3wm.org/) -- [i3wm](http://i3wm.org/) - [IdeaVim](https://github.com/JetBrains/ideavim) - [Inkscape](https://inkscape.org/) - [Insomnia](https://insomnia.rest/) diff --git a/mackup/applications/i3.cfg b/mackup/applications/i3.cfg index 9317fc866..0c31ef46f 100644 --- a/mackup/applications/i3.cfg +++ b/mackup/applications/i3.cfg @@ -3,4 +3,5 @@ name = i3 [configuration_files] .i3/config +.config/i3/config .i3status.conf From 6b2497422d49e2e55e56e6a4d93548ca27d6fe71 Mon Sep 17 00:00:00 2001 From: utegental Date: Thu, 27 Dec 2018 11:32:10 +0600 Subject: [PATCH 006/406] Added IntelijIdea2018.3 support (#1275) * Added IntelijIdea2018.3 support * Added newline in the end * Added changelog record for IntelliJIdea2018.3 --- CHANGELOG.md | 1 + mackup/applications/intellijidea.cfg | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c363c04b..ff4610e77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Add support for b-ryan/powerline-shell (via @paxperscientiam) - Add support for kovidgoyal/kitty (via @foray1010) - Add support for PhpStorm 2018.2 (via @j13k) +- Add support for IntelliJIdea2018.3 (via @utegental) ## Mackup 0.8.20 diff --git a/mackup/applications/intellijidea.cfg b/mackup/applications/intellijidea.cfg index 08b587e84..b0becfea4 100644 --- a/mackup/applications/intellijidea.cfg +++ b/mackup/applications/intellijidea.cfg @@ -43,3 +43,6 @@ IdeaIC2018.2/config/ Library/Preferences/IntelliJIdea2018.2 Library/Application Support/IntelliJIdea2018.2 IntelliJIdea2018.2/config/ +Library/Preferences/IntelliJIdea2018.3 +Library/Application Support/IntelliJIdea2018.3 +IntelliJIdea2018.3/config/ From fd4efcba216b28f04d91b58f1b53bced8e34276f Mon Sep 17 00:00:00 2001 From: Toshiki Murayama Date: Thu, 27 Dec 2018 14:34:03 +0900 Subject: [PATCH 007/406] Updated karabiner-elements.cfg (#1276) * Updated karabiner-elements.cfg * Updated CHANGELOG.md --- CHANGELOG.md | 1 + mackup/applications/karabiner-elements.cfg | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff4610e77..03ccaa5b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Add support for b-ryan/powerline-shell (via @paxperscientiam) - Add support for kovidgoyal/kitty (via @foray1010) - Add support for PhpStorm 2018.2 (via @j13k) +- Fix support for Karabiner Elements (via @mrymtsk) - Add support for IntelliJIdea2018.3 (via @utegental) ## Mackup 0.8.20 diff --git a/mackup/applications/karabiner-elements.cfg b/mackup/applications/karabiner-elements.cfg index c11fbf25e..98305506f 100644 --- a/mackup/applications/karabiner-elements.cfg +++ b/mackup/applications/karabiner-elements.cfg @@ -2,5 +2,4 @@ name = Karabiner Elements [configuration_files] -.config/karabiner/karabiner.json -.config/karabiner/assets/complex_modifications +.config/karabiner From 8844f483cf153c39880d9e740a7089a7eebe092c Mon Sep 17 00:00:00 2001 From: solarknight Date: Thu, 3 Jan 2019 06:18:36 +0800 Subject: [PATCH 008/406] Add support for oh-my-tmux project (#1277) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/oh-my-tmux.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/oh-my-tmux.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 03ccaa5b5..94c5474e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Add support for b-ryan/powerline-shell (via @paxperscientiam) - Add support for kovidgoyal/kitty (via @foray1010) - Add support for PhpStorm 2018.2 (via @j13k) +- Add support for Oh My Tmux (via @solarknight) - Fix support for Karabiner Elements (via @mrymtsk) - Add support for IntelliJIdea2018.3 (via @utegental) diff --git a/README.md b/README.md index fdaef2e17..4761e3cd1 100644 --- a/README.md +++ b/README.md @@ -396,6 +396,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [nvALT](http://brettterpstra.com/projects/nvalt/) - [nvpy](https://github.com/cpbotha/nvpy) - [Oh My Fish](https://github.com/bpinto/oh-my-fish) +- [Oh My Tmux](https://github.com/gpakosz/.tmux) - [Oh My Zsh](https://github.com/robbyrussell/oh-my-zsh) - [OmniFocus](https://www.omnigroup.com/omnifocus/) - [OmniGraffle](https://www.omnigroup.com/omnigraffle/) diff --git a/mackup/applications/oh-my-tmux.cfg b/mackup/applications/oh-my-tmux.cfg new file mode 100644 index 000000000..1cbeecbbd --- /dev/null +++ b/mackup/applications/oh-my-tmux.cfg @@ -0,0 +1,5 @@ +[application] +name = Oh My Tmux + +[configuration_files] +.tmux.conf.local From 0c263e6465537fd787f413b9c4470c1dfc13347d Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 2 Jan 2019 14:21:00 -0800 Subject: [PATCH 009/406] Mackup 0.8.21 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94c5474e0..162ac05d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.21 + - Update support for i3 (@KyleWJohnston) - Add support for bc (via @paxperscientiam) - Add support for Google clasp (via @paxperscientiam) diff --git a/mackup/constants.py b/mackup/constants.py index 9df6fa1fe..bff3e14cf 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.20' +VERSION = '0.8.21' # Support platforms PLATFORM_DARWIN = 'Darwin' From e7ae3c0167998f225117b8d0e11fe777402b312b Mon Sep 17 00:00:00 2001 From: Toshiki Murayama Date: Mon, 14 Jan 2019 09:20:38 +0900 Subject: [PATCH 010/406] Add support for Volt (#1285) * Add support for Volt * Documents updated * typo --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/volt.cfg | 7 +++++++ 3 files changed, 10 insertions(+) create mode 100644 mackup/applications/volt.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 162ac05d6..3191bc114 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Add support for Volt (via @mrymtsk) + ## Mackup 0.8.21 - Update support for i3 (@KyleWJohnston) diff --git a/README.md b/README.md index 4761e3cd1..4bc84339c 100644 --- a/README.md +++ b/README.md @@ -532,6 +532,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Visual Studio Code](https://code.visualstudio.com) - [Visual Studio for Mac](https://www.visualstudio.com/vs/visual-studio-mac/) - [VLC](http://www.videolan.org/) +- [Volt](https://github.com/vim-volt/volt) - [Wakatime](https://wakatime.com/) - [WebStorm](https://www.jetbrains.com/webstorm/) - [Wget](https://www.gnu.org/software/wget/) diff --git a/mackup/applications/volt.cfg b/mackup/applications/volt.cfg new file mode 100644 index 000000000..c7925e852 --- /dev/null +++ b/mackup/applications/volt.cfg @@ -0,0 +1,7 @@ +[application] +name = Volt + +[configuration_files] +volt/lock.json +volt/plugconf +volt/rc From 03a79fc5c5c7242f4950e332cf12df1110cdc7b1 Mon Sep 17 00:00:00 2001 From: Patrick Schratz Date: Mon, 14 Jan 2019 01:26:52 +0100 Subject: [PATCH 011/406] update typora.cfg (#1282) --- mackup/applications/typora.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/typora.cfg b/mackup/applications/typora.cfg index fd394fc2d..6950cb331 100644 --- a/mackup/applications/typora.cfg +++ b/mackup/applications/typora.cfg @@ -2,4 +2,5 @@ name = Typora [configuration_files] +.config/Typora/themes Library/Application Support/abnerworks.Typora/themes From 79300c9d7fad85b23e7cb82da7f588882dbb022d Mon Sep 17 00:00:00 2001 From: Patrick Schratz Date: Mon, 14 Jan 2019 01:27:17 +0100 Subject: [PATCH 012/406] Update r.cfg (#1280) * update r.cfg * readd .Rprofile --- mackup/applications/r.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mackup/applications/r.cfg b/mackup/applications/r.cfg index 7d5d7289f..ac8c9e711 100644 --- a/mackup/applications/r.cfg +++ b/mackup/applications/r.cfg @@ -5,4 +5,7 @@ name = R .R .Rhistory .Rprofile +.Rprofile.d +.Renviron +.Renviron.d Library/Preferences/org.R-project.R.plist From 2db675be8cd54c1e60539e8194a09d881258dd3d Mon Sep 17 00:00:00 2001 From: utegental Date: Mon, 14 Jan 2019 11:32:49 +0600 Subject: [PATCH 013/406] Add support for DataGrip (#1286) * Add support for DataGrip * Added newline --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/datagrip.cfg | 12 ++++++++++++ 3 files changed, 14 insertions(+) create mode 100644 mackup/applications/datagrip.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 3191bc114..971b4849f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for DataGrip 2017.3, 2018.1, 2018.2, 2018.3 (via @utegental) - Add support for Volt (via @mrymtsk) ## Mackup 0.8.21 diff --git a/README.md b/README.md index 4bc84339c..99500a4e3 100644 --- a/README.md +++ b/README.md @@ -230,6 +230,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [cVim](https://github.com/1995eaton/chromium-vim) - [Cyberduck](https://cyberduck.io/) - [DaisyDisk](https://daisydiskapp.com) +- [DataGrip](https://www.jetbrains.com/datagrip/) - [Dash](https://kapeli.com/dash) - [Day-O](http://www.shauninman.com/archive/2011/10/20/day_o_mac_menu_bar_clock) - [DbVisualizer](https://www.dbvis.com/) diff --git a/mackup/applications/datagrip.cfg b/mackup/applications/datagrip.cfg new file mode 100644 index 000000000..31f95d786 --- /dev/null +++ b/mackup/applications/datagrip.cfg @@ -0,0 +1,12 @@ +[application] +name = DataGrip + +[configuration_files] +Library/Application Support/DataGrip2017.3 +Library/Preferences/DataGrip2017.3 +Library/Application Support/DataGrip2018.1 +Library/Preferences/DataGrip2018.1 +Library/Application Support/DataGrip2018.2 +Library/Preferences/DataGrip2018.2 +Library/Application Support/DataGrip2018.3 +Library/Preferences/DataGrip2018.3 From b26d86db55b8fd9d3acbcde1db08fb0f4bc86a39 Mon Sep 17 00:00:00 2001 From: Alex Yeung Date: Mon, 14 Jan 2019 14:27:01 +0800 Subject: [PATCH 014/406] feat: add support for alternative config path for Alacritty (#1274) --- CHANGELOG.md | 1 + mackup/applications/alacritty.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 971b4849f..544dc7578 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Add support for Oh My Tmux (via @solarknight) - Fix support for Karabiner Elements (via @mrymtsk) - Add support for IntelliJIdea2018.3 (via @utegental) +- Add support for alternative config path for Alacritty (via @foray1010) ## Mackup 0.8.20 diff --git a/mackup/applications/alacritty.cfg b/mackup/applications/alacritty.cfg index 44cab2936..5247613f1 100644 --- a/mackup/applications/alacritty.cfg +++ b/mackup/applications/alacritty.cfg @@ -2,4 +2,5 @@ name = Alacritty [configuration_files] +.config/alacritty/alacritty.yml .alacritty.yml From 76a5172a88311bbf3522501b393634181bc71686 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 13 Jan 2019 22:27:50 -0800 Subject: [PATCH 015/406] Fix bad merge --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 544dc7578..b0b934230 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Add support for DataGrip 2017.3, 2018.1, 2018.2, 2018.3 (via @utegental) - Add support for Volt (via @mrymtsk) +- Add support for alternative config path for Alacritty (via @foray1010) ## Mackup 0.8.21 @@ -17,7 +18,6 @@ - Add support for Oh My Tmux (via @solarknight) - Fix support for Karabiner Elements (via @mrymtsk) - Add support for IntelliJIdea2018.3 (via @utegental) -- Add support for alternative config path for Alacritty (via @foray1010) ## Mackup 0.8.20 From 4991bff3c6476c55fb456503a9d90a6e33f2ea2c Mon Sep 17 00:00:00 2001 From: Oliver Mannion <125105+tekumara@users.noreply.github.com> Date: Mon, 14 Jan 2019 17:41:10 +1100 Subject: [PATCH 016/406] remove misleading sections from the READMEs which incorrectly suggest (#1273) you can add a [configuration_files] section to ~/.mackup.cfg --- README.md | 1 - doc/README.md | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/README.md b/README.md index 99500a4e3..2e2b4dcf4 100644 --- a/README.md +++ b/README.md @@ -566,7 +566,6 @@ We can [with your help](doc#get-official-support-for-an-application) ;) Have an application that shouldn't be generally supported but that you use? Or a cool file you want to sync? -- Use a `~/.mackup.cfg` to [sync a single file](doc#configuration) (e.g. `~/.gitignore`) - Create a `~/.mackup` directory to [sync an application or any file or directory](doc#add-support-for-an-application-or-any-file-or-directory) ## Why did you do this diff --git a/doc/README.md b/doc/README.md index 7879d55a1..cba9ebe83 100644 --- a/doc/README.md +++ b/doc/README.md @@ -9,17 +9,6 @@ To configure Mackup, create a file named ´.mackup.cfg´ in your home directory. vi ~/.mackup.cfg ``` -Add personal files to sync by including the `configuration_files` header, e.g. - -```ini -[configuration_files] -.gitignore_global -.config/your-custom-file -``` - -Note that Mackup assumes the file paths listed here are relative to your home -directory. - ## Storage ### Dropbox From 0426da619e514037bb0e3089431adb3eeaddb4b0 Mon Sep 17 00:00:00 2001 From: Krzysztof Karol Date: Mon, 14 Jan 2019 07:49:13 +0100 Subject: [PATCH 017/406] Add support for Webstorm 2018.3 (#1265) --- CHANGELOG.md | 1 + mackup/applications/webstorm.cfg | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0b934230..9bc54fd12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Add support for DataGrip 2017.3, 2018.1, 2018.2, 2018.3 (via @utegental) - Add support for Volt (via @mrymtsk) - Add support for alternative config path for Alacritty (via @foray1010) +- Add support for WebStorm 2018.3 (via @KrzysztofKarol) ## Mackup 0.8.21 diff --git a/mackup/applications/webstorm.cfg b/mackup/applications/webstorm.cfg index 1a9a080cc..a17c2bf04 100644 --- a/mackup/applications/webstorm.cfg +++ b/mackup/applications/webstorm.cfg @@ -26,3 +26,5 @@ Library/Application Support/WebStorm2018.1 Library/Preferences/WebStorm2018.1 Library/Application Support/WebStorm2018.2 Library/Preferences/WebStorm2018.2 +Library/Application Support/WebStorm2018.3 +Library/Preferences/WebStorm2018.3 From b2225e42bc8c6f7065a1b199527515fd4a80cc27 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 13 Jan 2019 22:53:29 -0800 Subject: [PATCH 018/406] Remove support for BBEdit (#1288) Fix #1264 --- CHANGELOG.md | 1 + README.md | 1 - mackup/applications/bbedit.cfg | 6 ------ 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 mackup/applications/bbedit.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bc54fd12..fe5cf8c31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Add support for Volt (via @mrymtsk) - Add support for alternative config path for Alacritty (via @foray1010) - Add support for WebStorm 2018.3 (via @KrzysztofKarol) +- Removed support for BBEdit ## Mackup 0.8.21 diff --git a/README.md b/README.md index 2e2b4dcf4..384c0deb0 100644 --- a/README.md +++ b/README.md @@ -183,7 +183,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Bartender](http://www.macbartender.com/) - [Bash it](https://github.com/Bash-it/bash-it) - [Bash](http://www.gnu.org/software/bash/) -- [BBEdit](http://www.barebones.com/products/bbedit/) - [Bc](https://www.gnu.org/software/bc/) - [Beatport Pro](https://www.beatport.com/desktop) - [BetterSnapTool](http://www.boastr.net/) diff --git a/mackup/applications/bbedit.cfg b/mackup/applications/bbedit.cfg deleted file mode 100644 index 8e3a971e1..000000000 --- a/mackup/applications/bbedit.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[application] -name = BBEdit - -[configuration_files] -Library/Application Support/BBEdit -Library/Preferences/com.barebones.bbedit.plist From 884da622a1f97ca72396f8d225d0c48eb093b3ed Mon Sep 17 00:00:00 2001 From: Cody Carrell Date: Mon, 14 Jan 2019 01:56:02 -0500 Subject: [PATCH 019/406] Added support for IntelliJIDEA 2018.3 (#1263) --- CHANGELOG.md | 1 + mackup/applications/intellijidea.cfg | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe5cf8c31..ef67e67f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Add support for alternative config path for Alacritty (via @foray1010) - Add support for WebStorm 2018.3 (via @KrzysztofKarol) - Removed support for BBEdit +- Add support for IntelliJIDEA 2018.3 (via @nysos3) ## Mackup 0.8.21 diff --git a/mackup/applications/intellijidea.cfg b/mackup/applications/intellijidea.cfg index b0becfea4..11922bf27 100644 --- a/mackup/applications/intellijidea.cfg +++ b/mackup/applications/intellijidea.cfg @@ -43,6 +43,9 @@ IdeaIC2018.2/config/ Library/Preferences/IntelliJIdea2018.2 Library/Application Support/IntelliJIdea2018.2 IntelliJIdea2018.2/config/ +Library/Preferences/IdeaIC2018.3 +Library/Application Support/IdeaIC2018.3 +IdeaIC2018.3/config/ Library/Preferences/IntelliJIdea2018.3 Library/Application Support/IntelliJIdea2018.3 IntelliJIdea2018.3/config/ From 664a30d4f948469cc6c6223a92873418208aeae5 Mon Sep 17 00:00:00 2001 From: Raymond Rutjes Date: Mon, 14 Jan 2019 07:59:53 +0100 Subject: [PATCH 020/406] feat: add support for GoLand 2018.3 (#1260) --- CHANGELOG.md | 1 + mackup/applications/goland.cfg | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef67e67f6..40196d41f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Add support for WebStorm 2018.3 (via @KrzysztofKarol) - Removed support for BBEdit - Add support for IntelliJIDEA 2018.3 (via @nysos3) +- Add support for GoLand 2018.3 (via @rayrutjes) ## Mackup 0.8.21 diff --git a/mackup/applications/goland.cfg b/mackup/applications/goland.cfg index 0ae90b1fc..a46cf5643 100644 --- a/mackup/applications/goland.cfg +++ b/mackup/applications/goland.cfg @@ -11,3 +11,5 @@ Library/Preferences/GoLand2018.1 Library/Application Support/GoLand2018.1 Library/Preferences/GoLand2018.2 Library/Application Support/GoLand2018.2 +Library/Preferences/GoLand2018.3 +Library/Application Support/GoLand2018.3 From b7684c36d77d6c4f0ae672b300da2bd3193829d3 Mon Sep 17 00:00:00 2001 From: Iain Beeston Date: Mon, 14 Jan 2019 07:05:42 +0000 Subject: [PATCH 021/406] Updated the readme to explain that pip on ubuntu installs locally (#826) The mac install instructions suggest using homebrew, which installs mackup system wide in /usr/local. For other operating systems it suggests pip, which also installs system-wide by default. However, on ubuntu pip is patched to install to a user's home directory by default. That's great, but it's not automatically in the $PATH (like /usr/local/bin is) and this can be confusing for users who aren't used to python. --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 384c0deb0..3f69d80cd 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,12 @@ If not running OS X, or you don't like Homebrew, you can use [pip](https://pip.p > is already installed on your system. > If this is the case, it will be upgraded to the latest version. +> On **Ubuntu**, pip will install to the current user's home +> directory rather than system-wide. Because of this, when +> installing pip on **Ubuntu** you will need to run `pip install` +> with the `--system` flag as well (on other platforms this is not +> needed) + ```bash # Install Mackup with PIP pip install --upgrade mackup From 270b1b42a542e44bdae462869a4abcf9df3dc782 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 13 Jan 2019 23:12:01 -0800 Subject: [PATCH 022/406] Fix mdl error in CI (#1289) --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3f69d80cd..c9ea67fcf 100644 --- a/README.md +++ b/README.md @@ -40,12 +40,6 @@ If not running OS X, or you don't like Homebrew, you can use [pip](https://pip.p > is already installed on your system. > If this is the case, it will be upgraded to the latest version. -> On **Ubuntu**, pip will install to the current user's home -> directory rather than system-wide. Because of this, when -> installing pip on **Ubuntu** you will need to run `pip install` -> with the `--system` flag as well (on other platforms this is not -> needed) - ```bash # Install Mackup with PIP pip install --upgrade mackup @@ -54,6 +48,12 @@ pip install --upgrade mackup mackup backup ``` +> On **Ubuntu**, pip will install to the current user's home +> directory rather than system-wide. Because of this, when +> installing pip on **Ubuntu** you will need to run `pip install` +> with the `--system` flag as well (on other platforms this is not +> needed) + You're all set and constantly backed up from now on. Next, on any new workstation, do: From 3762df5140a105a89fa1c822db5a49cb185fb017 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 14 Jan 2019 09:17:35 -0800 Subject: [PATCH 023/406] Order paths and remove orphaned newlines --- mackup/applications/illustrator.cfg | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/mackup/applications/illustrator.cfg b/mackup/applications/illustrator.cfg index bb0c7de41..60f5bc4d8 100644 --- a/mackup/applications/illustrator.cfg +++ b/mackup/applications/illustrator.cfg @@ -6,25 +6,23 @@ Library/Application Support/Adobe/Adobe Illustrator 17 Library/Application Support/Adobe/Adobe Illustrator 18 Library/Application Support/Adobe/Adobe Illustrator 19 Library/Application Support/Adobe/Adobe Illustrator 20 +Library/Application Support/Adobe/Adobe Illustrator 23/en_US/Adobe SVG Filters.svg +Library/Application Support/Adobe/Adobe Illustrator 23/en_US/Swatches/ +Library/Application Support/Adobe/OOBE Library/Preferences/Adobe Illustrator 17 Settings Library/Preferences/Adobe Illustrator 18 Settings Library/Preferences/Adobe Illustrator 19 Settings Library/Preferences/Adobe Illustrator 20 Settings -Library/Preferences/com.adobe.illustrator.plist - +Library/Preferences/Adobe Illustrator 23 Settings/en_US/ Library/Preferences/Adobe Illustrator 23 Settings/en_US/Adobe Illustrator Prefs -Library/Preferences/Adobe Illustrator 23 Settings/en_US/Workspaces/ +Library/Preferences/Adobe Illustrator 23 Settings/en_US/Last Used Artboard Export Settings +Library/Preferences/Adobe Illustrator 23 Settings/en_US/Last Used Asset Export Settings Library/Preferences/Adobe Illustrator 23 Settings/en_US/Modified Workspaces/ -Library/Preferences/Adobe Illustrator 23 Settings/en_US/Tools/Tools Panel Presets +Library/Preferences/Adobe Illustrator 23 Settings/en_US/Perspective grid Presets Library/Preferences/Adobe Illustrator 23 Settings/en_US/Print Presets +Library/Preferences/Adobe Illustrator 23 Settings/en_US/Tools/Tools Panel Presets Library/Preferences/Adobe Illustrator 23 Settings/en_US/Transparency flattener presets -Library/Preferences/Adobe Illustrator 23 Settings/en_US/ Library/Preferences/Adobe Illustrator 23 Settings/en_US/VariableWidthProfiles -Library/Preferences/Adobe Illustrator 23 Settings/en_US/Perspective grid Presets Library/Preferences/Adobe Illustrator 23 Settings/en_US/Vectorizing Presets -Library/Preferences/Adobe Illustrator 23 Settings/en_US/Last Used Artboard Export Settings -Library/Preferences/Adobe Illustrator 23 Settings/en_US/Last Used Asset Export Settings - -Library/Application Support/Adobe/Adobe Illustrator 23/en_US/Swatches/ -Library/Application Support/Adobe/Adobe Illustrator 23/en_US/Adobe SVG Filters.svg -Library/Application Support/Adobe/OOBE +Library/Preferences/Adobe Illustrator 23 Settings/en_US/Workspaces/ +Library/Preferences/com.adobe.illustrator.plist From d2a67fb050d9ec5dffa3bb0f8e5c28975d3c15b2 Mon Sep 17 00:00:00 2001 From: Albert Salim Date: Wed, 16 Jan 2019 12:40:45 +0800 Subject: [PATCH 024/406] Add .default-gems to asdf.cfg (#1290) --- mackup/applications/asdf.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/asdf.cfg b/mackup/applications/asdf.cfg index df7bf9924..109799dd3 100644 --- a/mackup/applications/asdf.cfg +++ b/mackup/applications/asdf.cfg @@ -4,3 +4,4 @@ name = asdf [configuration_files] .asdfrc .tool-versions +.default-gems From 9cc265e599e423e9d9a21bb788d002a393e51977 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 15 Jan 2019 21:20:04 -0800 Subject: [PATCH 025/406] We should not worry if the XDG_CONFIG_HOME does not exist (#1292) Fix #1253 --- mackup/appsdb.py | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/mackup/appsdb.py b/mackup/appsdb.py index 0458af013..7e1b81d36 100644 --- a/mackup/appsdb.py +++ b/mackup/appsdb.py @@ -57,25 +57,21 @@ def __init__(self): home = os.path.expanduser('~/') failobj = "{}.config".format(home) xdg_config_home = os.environ.get('XDG_CONFIG_HOME', failobj) - if xdg_config_home: - if not os.path.exists(xdg_config_home): - raise ValueError('$XDG_CONFIG_HOME: {} does not exist' - .format(xdg_config_home)) - if not xdg_config_home.startswith(home): - raise ValueError('$XDG_CONFIG_HOME: {} must be ' - 'somewhere within your home ' - 'directory: {}' - .format(xdg_config_home, home)) - if config.has_section('xdg_configuration_files'): - for path in config.options('xdg_configuration_files'): - if path.startswith('/'): - raise ValueError('Unsupported absolute path: ' - '{}' - .format(path)) - path = os.path.join(xdg_config_home, path) - path = path.replace(home, '') - (self.apps[app_name]['configuration_files'] - .add(path)) + if not xdg_config_home.startswith(home): + raise ValueError('$XDG_CONFIG_HOME: {} must be ' + 'somewhere within your home ' + 'directory: {}' + .format(xdg_config_home, home)) + if config.has_section('xdg_configuration_files'): + for path in config.options('xdg_configuration_files'): + if path.startswith('/'): + raise ValueError('Unsupported absolute path: ' + '{}' + .format(path)) + path = os.path.join(xdg_config_home, path) + path = path.replace(home, '') + (self.apps[app_name]['configuration_files'] + .add(path)) @staticmethod def get_config_files(): From fa1589dc8aa215a6fe48dbca727d593c33b33296 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 15 Jan 2019 21:21:38 -0800 Subject: [PATCH 026/406] Mackup 0.8.22 --- CHANGELOG.md | 3 +++ mackup/constants.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0beaec1d7..7e3013594 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.22 + - Add support for DataGrip 2017.3, 2018.1, 2018.2, 2018.3 (via @utegental) - Add support for Volt (via @mrymtsk) - Add support for alternative config path for Alacritty (via @foray1010) @@ -9,6 +11,7 @@ - Removed support for BBEdit - Add support for IntelliJIDEA 2018.3 (via @nysos3) - Add support for GoLand 2018.3 (via @rayrutjes) +- Fix an issue for users without a `~/.config/` folder. ## Mackup 0.8.21 diff --git a/mackup/constants.py b/mackup/constants.py index bff3e14cf..96a796de9 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.21' +VERSION = '0.8.22' # Support platforms PLATFORM_DARWIN = 'Darwin' From 2d2775429bc1f6d21315fae4131eb087f6e1b7a2 Mon Sep 17 00:00:00 2001 From: Kristopher Neidecker Date: Sat, 19 Jan 2019 15:09:41 -0500 Subject: [PATCH 027/406] Add support for WordGrinder (term based word processor) (#1294) * Add support for WordGrinder (term based word processor) Uses a .wordgrinder.settings dot file in $HOME * Add support for WordGrinder (term based word processor) Uses a .wordgrinder.settings dot file in $HOME (updated readme, changelog) * Missing ending newline --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/wordgrinder.cfg | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/wordgrinder.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e3013594..a228729c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Add support for WordGrinder (via @mutantant) + ## Mackup 0.8.22 - Add support for DataGrip 2017.3, 2018.1, 2018.2, 2018.3 (via @utegental) diff --git a/README.md b/README.md index c9ea67fcf..51bc3498f 100644 --- a/README.md +++ b/README.md @@ -545,6 +545,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [WhatsApp Web](https://web.whatsapp.com/) - [Wireshark 2](https://www.wireshark.org) - [Witch](http://manytricks.com/witch/) +- [WordGrinder](https://cowlark.com/wordgrinder/) - [WordPress WP-CLI](http://wp-cli.org/) - [Workrave](http://www.workrave.org/) - [X11](http://www.x.org/) diff --git a/mackup/applications/wordgrinder.cfg b/mackup/applications/wordgrinder.cfg new file mode 100644 index 000000000..888e7ecad --- /dev/null +++ b/mackup/applications/wordgrinder.cfg @@ -0,0 +1,5 @@ +[application] +name = wordgrinder + +[configuration_files] +.wordgrinder.settings From c0b72a6f1c7f62ebeae27ad1a1a68b20b2465f14 Mon Sep 17 00:00:00 2001 From: Kristopher Neidecker Date: Sat, 19 Jan 2019 15:14:13 -0500 Subject: [PATCH 028/406] Add support for Storyist 3 (#1295) * Add support for Storyist 3 Storyist 3 is a novel writing app. 2 config files, one which contains your license if you purchase, and the other your settings. * Add support for Storyist 3 writing software Storyist 3 is a novel writing app. 2 config files, one which contains your license if you purchase, and the other your settings. (Added info to Readme, Changelog) * Update README.md * CR at end of file --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/storyist-3.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/storyist-3.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index a228729c6..06d602544 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for Storyist 3 writing software (via @mutantant) - Add support for WordGrinder (via @mutantant) ## Mackup 0.8.22 diff --git a/README.md b/README.md index 51bc3498f..6f30f9040 100644 --- a/README.md +++ b/README.md @@ -497,6 +497,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Spotify](https://www.spotify.com/) - [Stata](http://www.stata.com/) - [Stay](https://cordlessdog.com/stay/) +- [Storyist](http://storyist.com/) - [Sublime Text](http://www.sublimetext.com/) - [Subversion](http://subversion.apache.org/) - [SuperDuper!](http://www.shirt-pocket.com/SuperDuper/SuperDuperDescription.html) diff --git a/mackup/applications/storyist-3.cfg b/mackup/applications/storyist-3.cfg new file mode 100644 index 000000000..5db4d2e94 --- /dev/null +++ b/mackup/applications/storyist-3.cfg @@ -0,0 +1,6 @@ +[application] +name = storyist-3 + +[configuration_files] +Library/Preferences/.com.storyist.storyist.plist +Library/Preferences/com.storyist.storyist.plist From 624aaf658835234b89620036bb3d414129c7e59d Mon Sep 17 00:00:00 2001 From: Toshiki Murayama Date: Tue, 22 Jan 2019 04:27:50 +0900 Subject: [PATCH 029/406] fix adobe illustrator 23 (#1296) --- CHANGELOG.md | 1 + mackup/applications/illustrator.cfg | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06d602544..31d23a810 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Add support for Storyist 3 writing software (via @mutantant) - Add support for WordGrinder (via @mutantant) +- Fix support for Adobe Illustrator CC2019 (v23) ## Mackup 0.8.22 diff --git a/mackup/applications/illustrator.cfg b/mackup/applications/illustrator.cfg index 60f5bc4d8..ad6f89e08 100644 --- a/mackup/applications/illustrator.cfg +++ b/mackup/applications/illustrator.cfg @@ -13,7 +13,6 @@ Library/Preferences/Adobe Illustrator 17 Settings Library/Preferences/Adobe Illustrator 18 Settings Library/Preferences/Adobe Illustrator 19 Settings Library/Preferences/Adobe Illustrator 20 Settings -Library/Preferences/Adobe Illustrator 23 Settings/en_US/ Library/Preferences/Adobe Illustrator 23 Settings/en_US/Adobe Illustrator Prefs Library/Preferences/Adobe Illustrator 23 Settings/en_US/Last Used Artboard Export Settings Library/Preferences/Adobe Illustrator 23 Settings/en_US/Last Used Asset Export Settings From 6753a6c6a8ab7078869152246299355832619265 Mon Sep 17 00:00:00 2001 From: Toshiki Murayama Date: Tue, 22 Jan 2019 11:07:25 +0900 Subject: [PATCH 030/406] further fix adobe illustrator 23 (#1298) --- mackup/applications/illustrator.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mackup/applications/illustrator.cfg b/mackup/applications/illustrator.cfg index ad6f89e08..05db3bd33 100644 --- a/mackup/applications/illustrator.cfg +++ b/mackup/applications/illustrator.cfg @@ -7,7 +7,7 @@ Library/Application Support/Adobe/Adobe Illustrator 18 Library/Application Support/Adobe/Adobe Illustrator 19 Library/Application Support/Adobe/Adobe Illustrator 20 Library/Application Support/Adobe/Adobe Illustrator 23/en_US/Adobe SVG Filters.svg -Library/Application Support/Adobe/Adobe Illustrator 23/en_US/Swatches/ +Library/Application Support/Adobe/Adobe Illustrator 23/en_US/Swatches Library/Application Support/Adobe/OOBE Library/Preferences/Adobe Illustrator 17 Settings Library/Preferences/Adobe Illustrator 18 Settings @@ -16,12 +16,12 @@ Library/Preferences/Adobe Illustrator 20 Settings Library/Preferences/Adobe Illustrator 23 Settings/en_US/Adobe Illustrator Prefs Library/Preferences/Adobe Illustrator 23 Settings/en_US/Last Used Artboard Export Settings Library/Preferences/Adobe Illustrator 23 Settings/en_US/Last Used Asset Export Settings -Library/Preferences/Adobe Illustrator 23 Settings/en_US/Modified Workspaces/ +Library/Preferences/Adobe Illustrator 23 Settings/en_US/Modified Workspaces Library/Preferences/Adobe Illustrator 23 Settings/en_US/Perspective grid Presets Library/Preferences/Adobe Illustrator 23 Settings/en_US/Print Presets Library/Preferences/Adobe Illustrator 23 Settings/en_US/Tools/Tools Panel Presets Library/Preferences/Adobe Illustrator 23 Settings/en_US/Transparency flattener presets Library/Preferences/Adobe Illustrator 23 Settings/en_US/VariableWidthProfiles Library/Preferences/Adobe Illustrator 23 Settings/en_US/Vectorizing Presets -Library/Preferences/Adobe Illustrator 23 Settings/en_US/Workspaces/ +Library/Preferences/Adobe Illustrator 23 Settings/en_US/Workspaces Library/Preferences/com.adobe.illustrator.plist From 3eb9f1d9ff26538084063d57491b3a0a3b5fbbe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=AF=E5=8F=AF=E7=86=8A?= Date: Wed, 23 Jan 2019 03:40:57 +0800 Subject: [PATCH 031/406] Fixes #1297;remove bundle directory from vim config (#1299) --- CHANGELOG.md | 1 + mackup/applications/vim.cfg | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31d23a810..6feb018ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Add support for Storyist 3 writing software (via @mutantant) - Add support for WordGrinder (via @mutantant) - Fix support for Adobe Illustrator CC2019 (v23) +- remove `bundle` directory from vim config (via @cocobear) ## Mackup 0.8.22 diff --git a/mackup/applications/vim.cfg b/mackup/applications/vim.cfg index f13b3f447..ad816d025 100644 --- a/mackup/applications/vim.cfg +++ b/mackup/applications/vim.cfg @@ -6,7 +6,6 @@ name = Vim .gvimrc.after .gvimrc.before .vim/autoload -.vim/bundle .vim/colors .vim/doc .vim/ftdetect From 7714430a5d01d705cc4210b0a461df47d8cb99ef Mon Sep 17 00:00:00 2001 From: Aleksandr Lossenko <29657+egze@users.noreply.github.com> Date: Thu, 24 Jan 2019 18:26:36 +0100 Subject: [PATCH 032/406] Support more folders in TextMate (#1300) * support more folders (Bundles, PlugIns, Pristine Copy) * add info to CHANGELOG --- CHANGELOG.md | 1 + mackup/applications/textmate.cfg | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6feb018ed..5284bb004 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Improve support for TextMate (via @egze) - Add support for Storyist 3 writing software (via @mutantant) - Add support for WordGrinder (via @mutantant) - Fix support for Adobe Illustrator CC2019 (v23) diff --git a/mackup/applications/textmate.cfg b/mackup/applications/textmate.cfg index a1646a991..614688fec 100644 --- a/mackup/applications/textmate.cfg +++ b/mackup/applications/textmate.cfg @@ -2,6 +2,9 @@ name = TextMate [configuration_files] +Library/Application Support/TextMate/Bundles +Library/Application Support/TextMate/PlugIns +Library/Application Support/TextMate/Pristine Copy Library/Application Support/TextMate/Managed/Bundles Library/Preferences/com.macromates.textmate.plist Library/Preferences/com.macromates.textmate.latex_config.plist From 950427424be1c2be8afb3914c7974db8e66a93b6 Mon Sep 17 00:00:00 2001 From: Patrick Schratz Date: Fri, 25 Jan 2019 23:11:38 +0100 Subject: [PATCH 033/406] add tilix support (#1302) * add tilix support * Remove extra new line --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/tilix.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/tilix.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5284bb004..acebd8018 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for Tilix (via @pat-s) - Improve support for TextMate (via @egze) - Add support for Storyist 3 writing software (via @mutantant) - Add support for WordGrinder (via @mutantant) diff --git a/README.md b/README.md index 6f30f9040..195613de2 100644 --- a/README.md +++ b/README.md @@ -514,6 +514,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [TextMate](http://macromates.com/) - [Textual](http://www.codeux.com/textual/) - [Tig](https://github.com/jonas/tig) +- [Tilix](https://github.com/gnunn1/tilix) - [tint2](https://code.google.com/p/tint2/) - [TinyFugue](http://tinyfugue.sourceforge.net) - [Tmux](http://tmux.sourceforge.net/) diff --git a/mackup/applications/tilix.cfg b/mackup/applications/tilix.cfg new file mode 100644 index 000000000..7f0ed8ee0 --- /dev/null +++ b/mackup/applications/tilix.cfg @@ -0,0 +1,5 @@ +[application] +name = tilix + +[configuration_files] +tilix.dconf From bb68fe9098854f77e7a035190f8ded2523ac5a76 Mon Sep 17 00:00:00 2001 From: Igor Krupenja Date: Wed, 30 Jan 2019 03:06:24 +0200 Subject: [PATCH 034/406] Marta (#1303) * Add support for Marta * Update CHANGELOG and README * Update Marta config to exclude state * Missing newline --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/marta.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/marta.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index acebd8018..97f738d52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Add support for WordGrinder (via @mutantant) - Fix support for Adobe Illustrator CC2019 (v23) - remove `bundle` directory from vim config (via @cocobear) +- Add support for Marta (via @krupenja) ## Mackup 0.8.22 diff --git a/README.md b/README.md index 195613de2..ee6e4bf4c 100644 --- a/README.md +++ b/README.md @@ -368,6 +368,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Mailmate](http://freron.com/) - [Mailplane](http://mailplaneapp.com/) - [Marked 2](http://marked2app.com) +- [Marta](https://marta.yanex.org/) - [MATLAB](http://www.mathworks.com/products/matlab/) - [Maven](http://maven.apache.org) - [Max](http://sbooth.org/Max/) diff --git a/mackup/applications/marta.cfg b/mackup/applications/marta.cfg new file mode 100644 index 000000000..dda9fb916 --- /dev/null +++ b/mackup/applications/marta.cfg @@ -0,0 +1,6 @@ +[application] +name = Marta + +[configuration_files] +Library/Application Support/org.yanex.marta/conf.json +Library/Application Support/org.yanex.marta/favorites.json From 5f2d72eb85f7bf59c12c6dc997a09b5b9b28b8d1 Mon Sep 17 00:00:00 2001 From: Patrick <47076822+sUyMur@users.noreply.github.com> Date: Wed, 30 Jan 2019 02:08:46 +0100 Subject: [PATCH 035/406] Ulauncher (#1306) * Added ulauncher to applications * added ulauncher to readme.md * added change to WIP section of Changelog.md * corrected ubersicht.cfg - deleted test line --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/ulauncher.cfg | 7 +++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/ulauncher.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 97f738d52..95bb596e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for ulauncher (via @sUyMur) - Add support for Tilix (via @pat-s) - Improve support for TextMate (via @egze) - Add support for Storyist 3 writing software (via @mutantant) diff --git a/README.md b/README.md index ee6e4bf4c..9c4311dfe 100644 --- a/README.md +++ b/README.md @@ -532,6 +532,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Typinator](http://www.ergonis.com/products/typinator/) - [Typora](https://typora.io) - [uTorrent](http://www.utorrent.com/) +- [ulauncher](https://ulauncher.io/) - [Ventrilo](http://www.ventrilo.com/) - [Versions](http://www.versionsapp.com) - [Vim](http://www.vim.org/) diff --git a/mackup/applications/ulauncher.cfg b/mackup/applications/ulauncher.cfg new file mode 100644 index 000000000..3c912defc --- /dev/null +++ b/mackup/applications/ulauncher.cfg @@ -0,0 +1,7 @@ +[application] +name = Ulauncher + +[configuration_files] +.config/ulauncher/extensions.json +.config/ulauncher/settings.json +.config/ulauncher/shortcuts.json From d904016c023e3b66b84a96e22858daa0974c8e3d Mon Sep 17 00:00:00 2001 From: Patrick <47076822+sUyMur@users.noreply.github.com> Date: Wed, 30 Jan 2019 02:10:54 +0100 Subject: [PATCH 036/406] added support for grsync (#1310) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/grsync.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/grsync.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 95bb596e2..e44b83ab1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for grsync (via @sUyMur) - Add support for ulauncher (via @sUyMur) - Add support for Tilix (via @pat-s) - Improve support for TextMate (via @egze) diff --git a/README.md b/README.md index 9c4311dfe..7897ff9ad 100644 --- a/README.md +++ b/README.md @@ -295,6 +295,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [GoShare](https://github.com/dictget/goshare) - [Gradle](http://gradle.org) - [GrandTotal 3](http://www.mediaatelier.com/GrandTotal4/) +- [grsync](http://www.opbyte.it/grsync/) - [Hammerspoon](http://www.hammerspoon.org/) - [HandBrake](https://handbrake.fr/) - [Hands Off!](http://www.oneperiodic.com/products/handsoff/) diff --git a/mackup/applications/grsync.cfg b/mackup/applications/grsync.cfg new file mode 100644 index 000000000..0a564446b --- /dev/null +++ b/mackup/applications/grsync.cfg @@ -0,0 +1,5 @@ +[application] +name = grsync + +[configuration_files] +.grsync/grsync.ini From 7e29c339179298a60578a7c7cda9375fc1d35705 Mon Sep 17 00:00:00 2001 From: Patrick <47076822+sUyMur@users.noreply.github.com> Date: Wed, 30 Jan 2019 02:13:15 +0100 Subject: [PATCH 037/406] added support for deepin-terminal (#1307) * added support for deepin-terminal * added deepin-terminal to changelog and readme --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/deepin-terminal.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/deepin-terminal.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e44b83ab1..d84142bd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for deepin-terminal (via @sUyMur) - Add support for grsync (via @sUyMur) - Add support for ulauncher (via @sUyMur) - Add support for Tilix (via @pat-s) diff --git a/README.md b/README.md index 7897ff9ad..fb3037938 100644 --- a/README.md +++ b/README.md @@ -240,6 +240,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Day-O](http://www.shauninman.com/archive/2011/10/20/day_o_mac_menu_bar_clock) - [DbVisualizer](https://www.dbvis.com/) - [Deal Alert](http://dealalertapp.com/) +- [Deepin-Terminal](https://github.com/linuxdeepin/deepin-terminal) - [Default Folder X](http://www.stclairsoft.com/DefaultFolderX/) - [Devil's Pie 2](http://www.gusnan.se/devilspie2/) - [Devil's Pie]() diff --git a/mackup/applications/deepin-terminal.cfg b/mackup/applications/deepin-terminal.cfg new file mode 100644 index 000000000..f64ea5021 --- /dev/null +++ b/mackup/applications/deepin-terminal.cfg @@ -0,0 +1,5 @@ +[application] +name = deepin-terminal + +[configuration_files] +.config/deepin/deepin-terminal/config.conf From 68e3f4e10f458e4bcd2f0be8597bf465f37e3d1e Mon Sep 17 00:00:00 2001 From: Patrick <47076822+sUyMur@users.noreply.github.com> Date: Wed, 30 Jan 2019 02:14:56 +0100 Subject: [PATCH 038/406] added support for Deepin dde dock (#1309) * added support for deepin-dde-dock * added support for deepin-dde-dock * Changed to correct app name * spelling --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/deepin-dde-dock.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/deepin-dde-dock.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index d84142bd8..1748e2318 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for Deepin-dde-dock (via @sUyMur) - Add support for deepin-terminal (via @sUyMur) - Add support for grsync (via @sUyMur) - Add support for ulauncher (via @sUyMur) diff --git a/README.md b/README.md index fb3037938..9e6099612 100644 --- a/README.md +++ b/README.md @@ -240,6 +240,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Day-O](http://www.shauninman.com/archive/2011/10/20/day_o_mac_menu_bar_clock) - [DbVisualizer](https://www.dbvis.com/) - [Deal Alert](http://dealalertapp.com/) +- [Deepin-dde-dock](https://github.com/linuxdeepin/dde-dock) - [Deepin-Terminal](https://github.com/linuxdeepin/deepin-terminal) - [Default Folder X](http://www.stclairsoft.com/DefaultFolderX/) - [Devil's Pie 2](http://www.gusnan.se/devilspie2/) diff --git a/mackup/applications/deepin-dde-dock.cfg b/mackup/applications/deepin-dde-dock.cfg new file mode 100644 index 000000000..8e0c3a341 --- /dev/null +++ b/mackup/applications/deepin-dde-dock.cfg @@ -0,0 +1,5 @@ +[application] +name = deepin-dde-dock + +[configuration_files] +.config/deepin/dde-dock.conf From 70202caa9d3d2aee5b7908e3d5fada880f438f94 Mon Sep 17 00:00:00 2001 From: Patrick <47076822+sUyMur@users.noreply.github.com> Date: Wed, 30 Jan 2019 02:16:21 +0100 Subject: [PATCH 039/406] added support for deepin-dde-file-manager (#1308) * added support for deepin-dde-file-manager * Update deepin-dde-file-manager.cfg --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/deepin-dde-file-manager.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/deepin-dde-file-manager.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 1748e2318..bfe1fd58a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for deepin-dde-file-manager (via @sUyMur) - Add support for Deepin-dde-dock (via @sUyMur) - Add support for deepin-terminal (via @sUyMur) - Add support for grsync (via @sUyMur) diff --git a/README.md b/README.md index 9e6099612..fda010089 100644 --- a/README.md +++ b/README.md @@ -241,6 +241,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [DbVisualizer](https://www.dbvis.com/) - [Deal Alert](http://dealalertapp.com/) - [Deepin-dde-dock](https://github.com/linuxdeepin/dde-dock) +- [Deepin-dde-file-manager](https://www.deepin.org/en/original/dde-file-manager/) - [Deepin-Terminal](https://github.com/linuxdeepin/deepin-terminal) - [Default Folder X](http://www.stclairsoft.com/DefaultFolderX/) - [Devil's Pie 2](http://www.gusnan.se/devilspie2/) diff --git a/mackup/applications/deepin-dde-file-manager.cfg b/mackup/applications/deepin-dde-file-manager.cfg new file mode 100644 index 000000000..0efc57a3d --- /dev/null +++ b/mackup/applications/deepin-dde-file-manager.cfg @@ -0,0 +1,5 @@ +[application] +name = deepin-dde-file-manager + +[configuration_files] +.config/deepin/dde-file-manager.json From c6c4d2762ac605e68fb658ce8dd49e86e5dcc189 Mon Sep 17 00:00:00 2001 From: Igor Krupenja Date: Wed, 30 Jan 2019 03:18:55 +0200 Subject: [PATCH 040/406] Add support for Sublime Merge (#1304) * Add support for Sublime Merge * Missing newline --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/sublime-merge.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/sublime-merge.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index bfe1fd58a..d1ad3a392 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Add support for WordGrinder (via @mutantant) - Fix support for Adobe Illustrator CC2019 (v23) - remove `bundle` directory from vim config (via @cocobear) +- Add support for Sublime Merge (via @krupenja) - Add support for Marta (via @krupenja) ## Mackup 0.8.22 diff --git a/README.md b/README.md index fda010089..105e118ea 100644 --- a/README.md +++ b/README.md @@ -503,6 +503,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Stata](http://www.stata.com/) - [Stay](https://cordlessdog.com/stay/) - [Storyist](http://storyist.com/) +- [Sublime Merge](https://www.sublimemerge.com/) - [Sublime Text](http://www.sublimetext.com/) - [Subversion](http://subversion.apache.org/) - [SuperDuper!](http://www.shirt-pocket.com/SuperDuper/SuperDuperDescription.html) diff --git a/mackup/applications/sublime-merge.cfg b/mackup/applications/sublime-merge.cfg new file mode 100644 index 000000000..0311e74cb --- /dev/null +++ b/mackup/applications/sublime-merge.cfg @@ -0,0 +1,5 @@ +[application] +name = Sublime Merge + +[configuration_files] +Library/Application Support/Sublime Merge/Packages/User From 99d4abf7d97444da1d028bd08f81c3ee3f1bfc17 Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Wed, 30 Jan 2019 03:44:53 +0100 Subject: [PATCH 041/406] Remove support for iTunes Scripts (#1311) --- CHANGELOG.md | 1 + README.md | 1 - mackup/applications/itunesscripts.cfg | 5 ----- 3 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 mackup/applications/itunesscripts.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index d1ad3a392..421aa0410 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Add support for WordGrinder (via @mutantant) - Fix support for Adobe Illustrator CC2019 (v23) - remove `bundle` directory from vim config (via @cocobear) +- Remove iTunes Scripts (via @dnicolson) - Add support for Sublime Merge (via @krupenja) - Add support for Marta (via @krupenja) diff --git a/README.md b/README.md index 105e118ea..145f04d58 100644 --- a/README.md +++ b/README.md @@ -570,7 +570,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [zathura](https://pwmt.org/projects/zathura/) - [Zsh](http://zsh.sourceforge.net/) - [Übersicht](http://tracesof.net/uebersicht/) -- iTunes Applescripts ## Can you support application X diff --git a/mackup/applications/itunesscripts.cfg b/mackup/applications/itunesscripts.cfg deleted file mode 100644 index 913b11617..000000000 --- a/mackup/applications/itunesscripts.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[application] -name = iTunesScripts - -[configuration_files] -Library/iTunes/Scripts From d69a92530ae936a4b8234595eceabf537fa93d7c Mon Sep 17 00:00:00 2001 From: Igor Krupenja Date: Wed, 30 Jan 2019 21:48:00 +0200 Subject: [PATCH 042/406] Add support for IINA (#1314) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/iina.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/iina.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 421aa0410..daf42edbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Remove iTunes Scripts (via @dnicolson) - Add support for Sublime Merge (via @krupenja) - Add support for Marta (via @krupenja) +- Add support for IINA (via @krupenja) ## Mackup 0.8.22 diff --git a/README.md b/README.md index 145f04d58..287b6bdbc 100644 --- a/README.md +++ b/README.md @@ -319,6 +319,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [i2cssh](https://github.com/wouterdebie/i2cssh) - [i3](https://i3wm.org/) - [IdeaVim](https://github.com/JetBrains/ideavim) +- [IINA](https://iina.io) - [Inkscape](https://inkscape.org/) - [Insomnia](https://insomnia.rest/) - [IntelliJIDEA](http://www.jetbrains.com/idea/) diff --git a/mackup/applications/iina.cfg b/mackup/applications/iina.cfg new file mode 100644 index 000000000..37675c7a4 --- /dev/null +++ b/mackup/applications/iina.cfg @@ -0,0 +1,6 @@ +[application] +name = IINA + +[configuration_files] +Library/Application Support/com.colliderli.iina/input_conf +Library/Preferences/com.colliderli.iina.plist From 0123b8e07c28de19e230fa72adbdcdd3ef00ba4d Mon Sep 17 00:00:00 2001 From: Igor Krupenja Date: Wed, 30 Jan 2019 23:09:30 +0200 Subject: [PATCH 043/406] Add support for Goldendict (#1315) * Add support for Goldendict * Changed URL for Goldendict --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/goldendict.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/goldendict.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index daf42edbd..aac56a0fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Remove iTunes Scripts (via @dnicolson) - Add support for Sublime Merge (via @krupenja) - Add support for Marta (via @krupenja) +- Add support for Goldendict (via @krupenja) - Add support for IINA (via @krupenja) ## Mackup 0.8.22 diff --git a/README.md b/README.md index 287b6bdbc..b2901bfdc 100644 --- a/README.md +++ b/README.md @@ -295,6 +295,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [GnuPG](https://www.gnupg.org/) (NOTE: includes private keys) - [Go2Shell](http://zipzapmac.com/Go2Shell) - [GoLand](https://www.jetbrains.com/go/) +- [Goldendict](http://goldendict.org/) - [GoShare](https://github.com/dictget/goshare) - [Gradle](http://gradle.org) - [GrandTotal 3](http://www.mediaatelier.com/GrandTotal4/) diff --git a/mackup/applications/goldendict.cfg b/mackup/applications/goldendict.cfg new file mode 100644 index 000000000..26cd6ded0 --- /dev/null +++ b/mackup/applications/goldendict.cfg @@ -0,0 +1,5 @@ +[application] +name = Goldendict + +[configuration_files] +.goldendict/config From 4a81f9e6083eec5acd52a92a51745b396c61a0a3 Mon Sep 17 00:00:00 2001 From: Patrick Schratz Date: Sun, 3 Feb 2019 19:40:07 +0100 Subject: [PATCH 044/406] add support for rofi (#1316) * add support for rofi * clear readme * missing newline --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/rofi.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/rofi.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index aac56a0fb..dbc99a2bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for rofi (via @pat-s) - Add support for deepin-dde-file-manager (via @sUyMur) - Add support for Deepin-dde-dock (via @sUyMur) - Add support for deepin-terminal (via @sUyMur) diff --git a/README.md b/README.md index b2901bfdc..e7f908cd3 100644 --- a/README.md +++ b/README.md @@ -457,6 +457,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Rhythmbox](https://wiki.gnome.org/Apps/Rhythmbox) - [Rime](http://rime.im/) - [Robomongo](http://robomongo.org/) +- [Rofi](https://github.com/DaveDavenport/rofi) - [Royal TSX](http://www.royaltsx.com/ts/osx/features) - [RStudio](https://www.rstudio.com/) - [rTorrent](http://libtorrent.rakshasa.no/) diff --git a/mackup/applications/rofi.cfg b/mackup/applications/rofi.cfg new file mode 100644 index 000000000..0fa49324b --- /dev/null +++ b/mackup/applications/rofi.cfg @@ -0,0 +1,5 @@ +[application] +name = rofi + +[configuration_files] +.config/rofi/config.rasi From 985d6036ed862f5ffb69dd0ccc25c71d4e4a531f Mon Sep 17 00:00:00 2001 From: Wu Haotian Date: Tue, 5 Feb 2019 12:40:22 +0800 Subject: [PATCH 045/406] Improve support for fish(sync fish conf.d folder) (#1319) --- CHANGELOG.md | 1 + mackup/applications/fish.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbc99a2bf..1636c2284 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Add support for Marta (via @krupenja) - Add support for Goldendict (via @krupenja) - Add support for IINA (via @krupenja) +- Improve support for fish (via @whtsky) ## Mackup 0.8.22 diff --git a/mackup/applications/fish.cfg b/mackup/applications/fish.cfg index c25b21b3f..4225a2778 100644 --- a/mackup/applications/fish.cfg +++ b/mackup/applications/fish.cfg @@ -3,5 +3,6 @@ name = Fish [configuration_files] .config/fish/config.fish +.config/fish/conf.d .config/fish/functions .config/fish/completions From ba8b05bf6104162641ca559c17ee53b553deaaeb Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 11 Feb 2019 17:08:27 -0500 Subject: [PATCH 046/406] Including .wget-hsts file (#1321) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Including .wget-hsts file > By default, Wget stores its HSTS database in ~/.wget-hsts. You can use ‘--hsts-file’ to override this. Wget will use the supplied file as the HSTS database. Such file must conform to the correct HSTS database format used by Wget. If Wget cannot parse the provided file, the behaviour is unspecified. https://www.gnu.org/software/wget/manual/html_node/HTTPS-_0028SSL_002fTLS_0029-Options.html * Update CHANGELOG.md --- CHANGELOG.md | 1 + mackup/applications/wget.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1636c2284..d59609736 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ - Add support for Goldendict (via @krupenja) - Add support for IINA (via @krupenja) - Improve support for fish (via @whtsky) +- Improve support for weget (via @paxperscientiam) ## Mackup 0.8.22 diff --git a/mackup/applications/wget.cfg b/mackup/applications/wget.cfg index 4dadfd835..0cd9f9ebd 100644 --- a/mackup/applications/wget.cfg +++ b/mackup/applications/wget.cfg @@ -3,3 +3,4 @@ name = Wget [configuration_files] .wgetrc +.wget-hsts From 091af2b22ab9eeec454b406be403797ee8da93cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9=D0=B2=28a=D1=95=D1=82=CE=B9en=29=20L?= Date: Tue, 26 Feb 2019 18:22:07 +0100 Subject: [PATCH 047/406] add conf for zabbix-cli (#1325) * add conf for zabbix-cli * contrib details * Update zabbix-cli.cfg --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/zabbix-cli.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/zabbix-cli.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index d59609736..399bf691b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - Add support for IINA (via @krupenja) - Improve support for fish (via @whtsky) - Improve support for weget (via @paxperscientiam) +- Add support for zabbix-cli (via @dzogrim) ## Mackup 0.8.22 diff --git a/README.md b/README.md index e7f908cd3..71f5a6c22 100644 --- a/README.md +++ b/README.md @@ -570,6 +570,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Xonsh](https://xon.sh) - [XtraFinder](http://www.trankynam.com/xtrafinder/) - [Yummy FTP](http://www.yummysoftware.com/) +- [zabbix-cli](https://github.com/usit-gd/zabbix-cli) - [zathura](https://pwmt.org/projects/zathura/) - [Zsh](http://zsh.sourceforge.net/) - [Übersicht](http://tracesof.net/uebersicht/) diff --git a/mackup/applications/zabbix-cli.cfg b/mackup/applications/zabbix-cli.cfg new file mode 100644 index 000000000..d56507057 --- /dev/null +++ b/mackup/applications/zabbix-cli.cfg @@ -0,0 +1,5 @@ +[application] +name = Zabbix CLI + +[configuration_files] +.zabbix-cli/zabbix-cli.conf From d9506554349908dc4140e831945738a25e659643 Mon Sep 17 00:00:00 2001 From: Luke Askew Date: Sun, 3 Mar 2019 12:46:21 -0700 Subject: [PATCH 048/406] Add support for eqMac2 (#1327) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/eqmac-2.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/eqmac-2.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 399bf691b..3719f4a85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ - Improve support for fish (via @whtsky) - Improve support for weget (via @paxperscientiam) - Add support for zabbix-cli (via @dzogrim) +- Add support for eqMac2 (via @lukeaskew) ## Mackup 0.8.22 diff --git a/README.md b/README.md index 71f5a6c22..07e2db167 100644 --- a/README.md +++ b/README.md @@ -260,6 +260,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Emacs](http://www.gnu.org/software/emacs/) - [Enjoyable](https://yukkurigames.com/enjoyable/) - [Environmental Station Alpha](http://www.hempuli.com/esa/) +- [eqMac2](https://bitgapp.com/eqmac/) - [ESLint](https://eslint.org/) - [Exercism](http://exercism.io/) - [ExpanDrive](http://www.expandrive.com/) diff --git a/mackup/applications/eqmac-2.cfg b/mackup/applications/eqmac-2.cfg new file mode 100644 index 000000000..ab20cc548 --- /dev/null +++ b/mackup/applications/eqmac-2.cfg @@ -0,0 +1,5 @@ +[application] +name = eqMac2 + +[configuration_files] +Library/Preferences/com.bitgapp.eqMac2.plist From fbc59ec19190127ce0914985e12e92376319abc0 Mon Sep 17 00:00:00 2001 From: Luke Askew Date: Sun, 3 Mar 2019 19:12:46 -0700 Subject: [PATCH 049/406] Add support for ForkLift 3 (#1328) --- CHANGELOG.md | 1 + README.md | 2 +- mackup/applications/forklift-2.cfg | 5 ----- mackup/applications/forklift.cfg | 7 +++++++ 4 files changed, 9 insertions(+), 6 deletions(-) delete mode 100644 mackup/applications/forklift-2.cfg create mode 100644 mackup/applications/forklift.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 3719f4a85..aeb2759b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ - Improve support for fish (via @whtsky) - Improve support for weget (via @paxperscientiam) - Add support for zabbix-cli (via @dzogrim) +- Add support for ForkLift 3 (via @lukeaskew) - Add support for eqMac2 (via @lukeaskew) ## Mackup 0.8.22 diff --git a/README.md b/README.md index 07e2db167..bcd3f54e8 100644 --- a/README.md +++ b/README.md @@ -277,7 +277,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Fontconfig](https://www.freedesktop.org/wiki/Software/fontconfig/) - [FontExplorer X](http://www.fontexplorerx.com/) - [Forge](http://www.slightlymagic.net/wiki/Forge) -- [ForkLift 2](http://www.binarynights.com/forklift/) +- [ForkLift](http://www.binarynights.com/forklift/) - [Franz](https://meetfranz.com) - [Gas Mask](https://github.com/2ndalpha/gasmask/) - [gdb](https://www.gnu.org/software/gdb/) diff --git a/mackup/applications/forklift-2.cfg b/mackup/applications/forklift-2.cfg deleted file mode 100644 index 0cd4e3b68..000000000 --- a/mackup/applications/forklift-2.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[application] -name = ForkLift 2 - -[configuration_files] -Library/Preferences/com.binarynights.ForkLift2.plist diff --git a/mackup/applications/forklift.cfg b/mackup/applications/forklift.cfg new file mode 100644 index 000000000..1f19638ca --- /dev/null +++ b/mackup/applications/forklift.cfg @@ -0,0 +1,7 @@ +[application] +name = ForkLift + +[configuration_files] +Library/Preferences/com.binarynights.ForkLift2.plist +Library/Preferences/com.binarynights.ForkLift-3.plist +Library/Application Support/ForkLift/Favorites/Favorites.json From 255e14e27028591bb699ba4b35a9d83adefc7abd Mon Sep 17 00:00:00 2001 From: Daisuke Nashiro Date: Sat, 9 Mar 2019 04:16:04 +0900 Subject: [PATCH 050/406] Add support for Fisher (#1333) --- CHANGELOG.md | 1 + README.md | 4 ++-- mackup/applications/{fisherman.cfg => fisher.cfg} | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename mackup/applications/{fisherman.cfg => fisher.cfg} (77%) diff --git a/CHANGELOG.md b/CHANGELOG.md index aeb2759b2..4b3899696 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ - Add support for zabbix-cli (via @dzogrim) - Add support for ForkLift 3 (via @lukeaskew) - Add support for eqMac2 (via @lukeaskew) +- Add support for Fisher (via @nashirox) ## Mackup 0.8.22 diff --git a/README.md b/README.md index bcd3f54e8..dfc4a81a4 100644 --- a/README.md +++ b/README.md @@ -270,8 +270,8 @@ See the [README](doc/README.md) file in the doc directory for more info. - [fastlane](https://fastlane.tools) - [Feeds](http://www.feedsapp.com/) - [FileZilla](https://filezilla-project.org/) -- [Fish](http://ridiculousfish.com/shell/) -- [Fisherman](http://fisherman.sh/) +- [Fish](http://fishshell.com/) +- [Fisher](https://github.com/jorgebucaran/fisher) - [FlexGet](http://flexget.com/) - [Flux](https://justgetflux.com/) - [Fontconfig](https://www.freedesktop.org/wiki/Software/fontconfig/) diff --git a/mackup/applications/fisherman.cfg b/mackup/applications/fisher.cfg similarity index 77% rename from mackup/applications/fisherman.cfg rename to mackup/applications/fisher.cfg index e3e1db0a2..782bc0f71 100644 --- a/mackup/applications/fisherman.cfg +++ b/mackup/applications/fisher.cfg @@ -1,5 +1,5 @@ [application] -name = Fisherman +name = Fisher [configuration_files] .config/fish/fishfile From eab315484f488bacbd3c705d2cfaf71c9f14ca31 Mon Sep 17 00:00:00 2001 From: Aleksandr Lossenko <29657+egze@users.noreply.github.com> Date: Fri, 8 Mar 2019 20:17:02 +0100 Subject: [PATCH 051/406] Fix TextMate com.macromates.textmate.plist (#1332) * remove com.macromates.textmate.plist * update CHANGELOG --- CHANGELOG.md | 1 + mackup/applications/textmate.cfg | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b3899696..66c4cb752 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Remove problematic com.macromates.textmate.plist file for TextMate (via @egze) - Add support for rofi (via @pat-s) - Add support for deepin-dde-file-manager (via @sUyMur) - Add support for Deepin-dde-dock (via @sUyMur) diff --git a/mackup/applications/textmate.cfg b/mackup/applications/textmate.cfg index 614688fec..6a5b65cd9 100644 --- a/mackup/applications/textmate.cfg +++ b/mackup/applications/textmate.cfg @@ -6,6 +6,5 @@ Library/Application Support/TextMate/Bundles Library/Application Support/TextMate/PlugIns Library/Application Support/TextMate/Pristine Copy Library/Application Support/TextMate/Managed/Bundles -Library/Preferences/com.macromates.textmate.plist Library/Preferences/com.macromates.textmate.latex_config.plist .tm_properties From cce4075b278aaa3ac006e0fee8518a04637acadb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BF=8A=E9=81=A5?= Date: Tue, 12 Mar 2019 02:23:34 +0800 Subject: [PATCH 052/406] Added support for PhpStorm 2018.3 (#1335) --- CHANGELOG.md | 1 + mackup/applications/phpstorm.cfg | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66c4cb752..55126aba1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ - Add support for ForkLift 3 (via @lukeaskew) - Add support for eqMac2 (via @lukeaskew) - Add support for Fisher (via @nashirox) +- Add support for PhpStorm 2018.3 (via @baijunyao) ## Mackup 0.8.22 diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg index ba0b7cd34..cf5586274 100644 --- a/mackup/applications/phpstorm.cfg +++ b/mackup/applications/phpstorm.cfg @@ -3,6 +3,8 @@ name = PhpStorm [configuration_files] Library/Preferences/com.jetbrains.PhpStorm.plist +Library/Application Support/PhpStorm2018.3 +Library/Preferences/PhpStorm2018.3 Library/Application Support/PhpStorm2018.2 Library/Preferences/PhpStorm2018.2 Library/Application Support/PhpStorm2018.1 From 9a7dfe783981e84b67d62684f5c711e98b466c20 Mon Sep 17 00:00:00 2001 From: Martin Madsen Date: Tue, 19 Mar 2019 09:46:43 +1000 Subject: [PATCH 053/406] Fix pluralization in README (#1338) --- doc/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README.md b/doc/README.md index cba9ebe83..05bd4bb4d 100644 --- a/doc/README.md +++ b/doc/README.md @@ -108,7 +108,7 @@ directory = .config/mackup ## Applications -### Only sync one or two application +### Only sync one or two applications In your home folder, create a file named `.mackup.cfg` and add the application names to allow in the `[applications_to_sync]` section, one by line. From 1ef82c6aca97d0bb167c3f1ece8b8129e75df4c9 Mon Sep 17 00:00:00 2001 From: Alexander Tipugin Date: Tue, 19 Mar 2019 02:48:35 +0300 Subject: [PATCH 054/406] Add support for Focus (#1339) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/focus.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/focus.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 55126aba1..709747bea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Add support for eqMac2 (via @lukeaskew) - Add support for Fisher (via @nashirox) - Add support for PhpStorm 2018.3 (via @baijunyao) +- Add support for Focus (via @atipugin) ## Mackup 0.8.22 diff --git a/README.md b/README.md index dfc4a81a4..0b5f66edd 100644 --- a/README.md +++ b/README.md @@ -274,6 +274,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Fisher](https://github.com/jorgebucaran/fisher) - [FlexGet](http://flexget.com/) - [Flux](https://justgetflux.com/) +- [Focus](https://heyfocus.com) - [Fontconfig](https://www.freedesktop.org/wiki/Software/fontconfig/) - [FontExplorer X](http://www.fontexplorerx.com/) - [Forge](http://www.slightlymagic.net/wiki/Forge) diff --git a/mackup/applications/focus.cfg b/mackup/applications/focus.cfg new file mode 100644 index 000000000..7116482a1 --- /dev/null +++ b/mackup/applications/focus.cfg @@ -0,0 +1,5 @@ +[application] +name = Focus + +[configuration_files] +Library/Application Support/Focus/default.cfg From aa1d1d2e9234adad08b52f0674bb3a9dcad1e134 Mon Sep 17 00:00:00 2001 From: donkeyfish Date: Tue, 19 Mar 2019 19:14:50 +0100 Subject: [PATCH 055/406] Vim add after (#1336) * Added .vim/after directory. * Added .vim/after in changelog --- CHANGELOG.md | 1 + mackup/applications/vim.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 709747bea..1e60b89ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Improve support for Vim, add .vim/after directory - Remove problematic com.macromates.textmate.plist file for TextMate (via @egze) - Add support for rofi (via @pat-s) - Add support for deepin-dde-file-manager (via @sUyMur) diff --git a/mackup/applications/vim.cfg b/mackup/applications/vim.cfg index ad816d025..4ce2ba59b 100644 --- a/mackup/applications/vim.cfg +++ b/mackup/applications/vim.cfg @@ -6,6 +6,7 @@ name = Vim .gvimrc.after .gvimrc.before .vim/autoload +.vim/after .vim/colors .vim/doc .vim/ftdetect From ee72feb1559f5ddba98e1a26c42e7b1c39ea5f35 Mon Sep 17 00:00:00 2001 From: Mark Chitty Date: Fri, 22 Mar 2019 16:00:10 +0000 Subject: [PATCH 056/406] Add support for Choosy (choosyosx.com) (#1340) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/choosy.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/choosy.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e60b89ec..8ec5d9f56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ - Add support for Fisher (via @nashirox) - Add support for PhpStorm 2018.3 (via @baijunyao) - Add support for Focus (via @atipugin) +- Add support for Choosy (via @markchitty) ## Mackup 0.8.22 diff --git a/README.md b/README.md index 0b5f66edd..613a73e19 100644 --- a/README.md +++ b/README.md @@ -211,6 +211,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Cheat](https://github.com/chrisallenlane/cheat) - [Chef](https://www.chef.io/chef/) - [Chicken](http://sourceforge.net/projects/chicken/) +- [Choosy](https://www.choosyosx.com/) - [chunkwm](https://github.com/koekeishiya/chunkwm) - [Cider](https://github.com/msanders/cider) - [Clasp](https://github.com/google/clasp) diff --git a/mackup/applications/choosy.cfg b/mackup/applications/choosy.cfg new file mode 100644 index 000000000..d0ddbcf14 --- /dev/null +++ b/mackup/applications/choosy.cfg @@ -0,0 +1,5 @@ +[application] +name = Choosy + +[configuration_files] +Library/Application Support/Choosy/behaviours.plist From 9f77c62b1119a329786adc9508bea82f2295babe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BF=8A=E9=81=A5?= Date: Mon, 1 Apr 2019 22:54:24 +0800 Subject: [PATCH 057/406] Added support for PhpStorm 2019.1 (#1342) --- CHANGELOG.md | 1 + mackup/applications/phpstorm.cfg | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ec5d9f56..16eb21492 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ - Add support for PhpStorm 2018.3 (via @baijunyao) - Add support for Focus (via @atipugin) - Add support for Choosy (via @markchitty) +- Add support for PhpStorm 2019.1 (via @baijunyao) ## Mackup 0.8.22 diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg index cf5586274..a8673d4eb 100644 --- a/mackup/applications/phpstorm.cfg +++ b/mackup/applications/phpstorm.cfg @@ -3,6 +3,8 @@ name = PhpStorm [configuration_files] Library/Preferences/com.jetbrains.PhpStorm.plist +Library/Application Support/PhpStorm2019.1 +Library/Preferences/PhpStorm2019.1 Library/Application Support/PhpStorm2018.3 Library/Preferences/PhpStorm2018.3 Library/Application Support/PhpStorm2018.2 From 0083c78341a6be739ef02012f124c700c8361414 Mon Sep 17 00:00:00 2001 From: Dj3ross <24573750+Dj3ross@users.noreply.github.com> Date: Mon, 1 Apr 2019 18:32:06 +0200 Subject: [PATCH 058/406] Update support for Microsoft Remote Desktop 10 (#1344) --- CHANGELOG.md | 1 + README.md | 2 +- mackup/applications/microsoft-remote-desktop.cfg | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16eb21492..59458f6c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ - Add support for PhpStorm 2018.3 (via @baijunyao) - Add support for Focus (via @atipugin) - Add support for Choosy (via @markchitty) +- Update support for Microsoft Remote Desktop 10 - Add support for PhpStorm 2019.1 (via @baijunyao) ## Mackup 0.8.22 diff --git a/README.md b/README.md index 613a73e19..d19aa7916 100644 --- a/README.md +++ b/README.md @@ -387,7 +387,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Messages](http://www.apple.com/osx/apps/#messages) - [Micro](https://github.com/zyedidia/micro) - [Microsoft Azure CLI](https://github.com/Azure/azure-xplat-cli) -- [Microsoft Remote Desktop](https://itunes.apple.com/us/app/microsoft-remote-desktop/id715768417?mt=12&ls=1) +- [Microsoft Remote Desktop](https://itunes.apple.com/us/app/microsoft-remote-desktop-10/id1295203466) - [MonoDevelop](http://www.monodevelop.com) - [Moom](http://manytricks.com/moom/) - [Mou](http://25.io/mou/) diff --git a/mackup/applications/microsoft-remote-desktop.cfg b/mackup/applications/microsoft-remote-desktop.cfg index f68255870..afa584b04 100644 --- a/mackup/applications/microsoft-remote-desktop.cfg +++ b/mackup/applications/microsoft-remote-desktop.cfg @@ -2,4 +2,4 @@ name = Microsoft Remote Desktop [configuration_files] -Library/Containers/com.microsoft.rdc.mac/Data/Library/Preferences/com.microsoft.rdc.mac.plist +Library/Containers/com.microsoft.rdc.macos/Data/Library/Preferences/com.microsoft.rdc.macos.plist From 6217378283d6238a93732c43c73819a231c0a711 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 2 Apr 2019 09:10:55 -0700 Subject: [PATCH 059/406] Mackup 0.8.23 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59458f6c1..8b1aef942 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.23 + - Improve support for Vim, add .vim/after directory - Remove problematic com.macromates.textmate.plist file for TextMate (via @egze) - Add support for rofi (via @pat-s) diff --git a/mackup/constants.py b/mackup/constants.py index 96a796de9..2e7f7bee6 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.22' +VERSION = '0.8.23' # Support platforms PLATFORM_DARWIN = 'Darwin' From 5dbaae95b4a1242d5a72176a6354e5364dfc4407 Mon Sep 17 00:00:00 2001 From: Grigorii Horos Date: Wed, 3 Apr 2019 19:03:11 +0300 Subject: [PATCH 060/406] Add support for Visual Studio Code OSS and Insiders (#1346) * Add support for Visual Studio Code OSS and Insiders * Fix link for Visual Studio Code OSS --- README.md | 3 ++- mackup/applications/vscode-insiders.cfg | 11 +++++++++-- mackup/applications/vscode-oss.cfg | 12 ++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 mackup/applications/vscode-oss.cfg diff --git a/README.md b/README.md index d19aa7916..2a2b12dd7 100644 --- a/README.md +++ b/README.md @@ -549,8 +549,9 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Vim](http://www.vim.org/) - [Vimperator](http://www.vimperator.org/vimperator) - [Viscosity](http://www.sparklabs.com/viscosity/) +- [Visual Studio Code](https://code.visualstudio.com/) - [Visual Studio Code - Insiders](https://code.visualstudio.com/insiders) -- [Visual Studio Code](https://code.visualstudio.com) +- [Visual Studio Code - OSS](https://github.com/Microsoft/vscode) - [Visual Studio for Mac](https://www.visualstudio.com/vs/visual-studio-mac/) - [VLC](http://www.videolan.org/) - [Volt](https://github.com/vim-volt/volt) diff --git a/mackup/applications/vscode-insiders.cfg b/mackup/applications/vscode-insiders.cfg index 7bdc5f0e4..bac845151 100644 --- a/mackup/applications/vscode-insiders.cfg +++ b/mackup/applications/vscode-insiders.cfg @@ -1,5 +1,12 @@ [application] -name = Visual Studio Code - Insiders +name = Visual Studio Code Insiders [configuration_files] -Library/Application Support/Code - Insiders/User +Library/Application Support/Code - Insiders/User/snippets +Library/Application Support/Code - Insiders/User/keybindings.json +Library/Application Support/Code - Insiders/User/settings.json + +# Linux Files +.config/Code - Insiders/User/snippets +.config/Code - Insiders/User/keybindings.json +.config/Code - Insiders/User/settings.json diff --git a/mackup/applications/vscode-oss.cfg b/mackup/applications/vscode-oss.cfg new file mode 100644 index 000000000..8e64f9c9f --- /dev/null +++ b/mackup/applications/vscode-oss.cfg @@ -0,0 +1,12 @@ +[application] +name = Visual Studio Code Open Source Edition + +[configuration_files] +Library/Application Support/Code - OSS/User/snippets +Library/Application Support/Code - OSS/User/keybindings.json +Library/Application Support/Code - OSS/User/settings.json + +# Linux Files +.config/Code - OSS/User/snippets +.config/Code - OSS/User/keybindings.json +.config/Code - OSS/User/settings.json From 789266c0508f85efa29242e087b676ccd4e9046b Mon Sep 17 00:00:00 2001 From: Guilhem Lettron Date: Wed, 3 Apr 2019 18:04:52 +0200 Subject: [PATCH 061/406] Update snapcraft (#1347) * Use python version instead of git describe * Add snapcraft badge --- README.md | 1 + snap/snapcraft.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2a2b12dd7..fc2e5cef8 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ Keep your application settings in sync. [![Circle CI](https://circleci.com/gh/lra/mackup.svg?style=shield)](https://circleci.com/gh/lra/mackup) +[![snapcraft](https://snapcraft.io/mackup/badge.svg)](https://snapcraft.io/mackup) ## Table of content diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index a5e148567..03908ef44 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: mackup version: git -version-script: "git describe --tags" +version-script: "python -c \"from mackup.constants import VERSION; print(VERSION)\"" summary: Keep your application settings in sync description: | Back ups your application settings in a safe directory (e.g. Dropbox). From e7714b450b73713c40f93ed64356c2b0afa666d5 Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Wed, 10 Apr 2019 19:04:35 +0200 Subject: [PATCH 062/406] Revert "Remove support for iTunes Scripts (#1311)" (#1349) This reverts commit 99d4abf7d97444da1d028bd08f81c3ee3f1bfc17. --- CHANGELOG.md | 1 - README.md | 1 + mackup/applications/itunesscripts.cfg | 5 +++++ 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 mackup/applications/itunesscripts.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b1aef942..5f9d6841c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,6 @@ - Add support for WordGrinder (via @mutantant) - Fix support for Adobe Illustrator CC2019 (v23) - remove `bundle` directory from vim config (via @cocobear) -- Remove iTunes Scripts (via @dnicolson) - Add support for Sublime Merge (via @krupenja) - Add support for Marta (via @krupenja) - Add support for Goldendict (via @krupenja) diff --git a/README.md b/README.md index fc2e5cef8..3833a4d46 100644 --- a/README.md +++ b/README.md @@ -579,6 +579,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [zathura](https://pwmt.org/projects/zathura/) - [Zsh](http://zsh.sourceforge.net/) - [Übersicht](http://tracesof.net/uebersicht/) +- iTunes Applescripts ## Can you support application X diff --git a/mackup/applications/itunesscripts.cfg b/mackup/applications/itunesscripts.cfg new file mode 100644 index 000000000..913b11617 --- /dev/null +++ b/mackup/applications/itunesscripts.cfg @@ -0,0 +1,5 @@ +[application] +name = iTunesScripts + +[configuration_files] +Library/iTunes/Scripts From 989eef3a43b2c632785738ec2aa0af252ce50209 Mon Sep 17 00:00:00 2001 From: utegental Date: Mon, 15 Apr 2019 11:56:33 +0600 Subject: [PATCH 063/406] Intelij idea2019.1 support (#1351) * Added support for IntelliJIdea 2019.1 * newline * typo --- CHANGELOG.md | 1 + mackup/applications/intellijidea.cfg | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f9d6841c..eb9d658df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ - Add support for Choosy (via @markchitty) - Update support for Microsoft Remote Desktop 10 - Add support for PhpStorm 2019.1 (via @baijunyao) +- Add support for IntelijIdea2019.1 (via @utegental) ## Mackup 0.8.22 diff --git a/mackup/applications/intellijidea.cfg b/mackup/applications/intellijidea.cfg index 11922bf27..41a135bb1 100644 --- a/mackup/applications/intellijidea.cfg +++ b/mackup/applications/intellijidea.cfg @@ -49,3 +49,9 @@ IdeaIC2018.3/config/ Library/Preferences/IntelliJIdea2018.3 Library/Application Support/IntelliJIdea2018.3 IntelliJIdea2018.3/config/ +Library/Preferences/IdeaIC2019.1 +Library/Application Support/IdeaIC2019.1 +IdeaIC2019.1/config/ +Library/Preferences/IntelliJIdea2019.1 +Library/Application Support/IntelliJIdea2019.1 +IntelliJIdea2019.1/config/ From de95475971c19c3a8d20299b0c275b4564c67067 Mon Sep 17 00:00:00 2001 From: Grigorii Horos Date: Mon, 22 Apr 2019 01:20:06 +0300 Subject: [PATCH 064/406] Add VSCodium and Verdaccio (#1354) * Add VSCodium and Verdaccio * Fix urls --- README.md | 2 ++ mackup/applications/verdaccio.cfg | 5 +++++ mackup/applications/vscodium.cfg | 12 ++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 mackup/applications/verdaccio.cfg create mode 100644 mackup/applications/vscodium.cfg diff --git a/README.md b/README.md index 3833a4d46..859abdcbe 100644 --- a/README.md +++ b/README.md @@ -546,6 +546,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [uTorrent](http://www.utorrent.com/) - [ulauncher](https://ulauncher.io/) - [Ventrilo](http://www.ventrilo.com/) +- [Verdaccio](https://verdaccio.org/) - [Versions](http://www.versionsapp.com) - [Vim](http://www.vim.org/) - [Vimperator](http://www.vimperator.org/vimperator) @@ -553,6 +554,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Visual Studio Code](https://code.visualstudio.com/) - [Visual Studio Code - Insiders](https://code.visualstudio.com/insiders) - [Visual Studio Code - OSS](https://github.com/Microsoft/vscode) +- [VSCodium](https://vscodium.com/) - [Visual Studio for Mac](https://www.visualstudio.com/vs/visual-studio-mac/) - [VLC](http://www.videolan.org/) - [Volt](https://github.com/vim-volt/volt) diff --git a/mackup/applications/verdaccio.cfg b/mackup/applications/verdaccio.cfg new file mode 100644 index 000000000..7e481f4ab --- /dev/null +++ b/mackup/applications/verdaccio.cfg @@ -0,0 +1,5 @@ +[application] +name = Verdaccio + +[configuration_files] +.config/verdaccio/config.yaml diff --git a/mackup/applications/vscodium.cfg b/mackup/applications/vscodium.cfg new file mode 100644 index 000000000..272ec445d --- /dev/null +++ b/mackup/applications/vscodium.cfg @@ -0,0 +1,12 @@ +[application] +name = VSCodium + +[configuration_files] +Library/Application Support/VSCodium/User/snippets +Library/Application Support/VSCodium/User/keybindings.json +Library/Application Support/VSCodium/User/settings.json + +# Linux Files +.config/VSCodium/User/snippets +.config/VSCodium/User/keybindings.json +.config/VSCodium/User/settings.json From efedbc8bccb73600e9bacbb305328f6c351474bf Mon Sep 17 00:00:00 2001 From: Harald Wartig Date: Mon, 29 Apr 2019 02:43:30 +0200 Subject: [PATCH 065/406] Also sync ~/.config/fish/fish_variables . (#1357) This way configuration settings taken using the `fish_config` tool will be synced as well. --- mackup/applications/fish.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/fish.cfg b/mackup/applications/fish.cfg index 4225a2778..562975c98 100644 --- a/mackup/applications/fish.cfg +++ b/mackup/applications/fish.cfg @@ -4,5 +4,6 @@ name = Fish [configuration_files] .config/fish/config.fish .config/fish/conf.d +.config/fish/fish_variables .config/fish/functions .config/fish/completions From ed0b5626b033f232868900bfd5108df448873725 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 29 Apr 2019 11:01:08 -0700 Subject: [PATCH 066/406] Prevent users to use Mackup's storage directory to store their files. (#1359) * Don't allow CUSTOM_APPS_DIR as a storage directory Fix #1358 * Add changelog --- CHANGELOG.md | 2 ++ mackup/config.py | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb9d658df..f5fc5af95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Prevent users to use Mackup's storage directory to store their files. + ## Mackup 0.8.23 - Improve support for Vim, add .vim/after directory diff --git a/mackup/config.py b/mackup/config.py index 0c448544a..0b14c792f 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -3,7 +3,8 @@ import os import os.path -from .constants import (MACKUP_BACKUP_PATH, +from .constants import (CUSTOM_APPS_DIR, + MACKUP_BACKUP_PATH, MACKUP_CONFIG_FILE, ENGINE_DROPBOX, ENGINE_GDRIVE, @@ -228,6 +229,10 @@ def _parse_directory(self): """ if self._parser.has_option('storage', 'directory'): directory = self._parser.get('storage', 'directory') + # Don't allow CUSTOM_APPS_DIR as a storage directory + if directory == CUSTOM_APPS_DIR: + raise ConfigError("{} cannot be used as a storage directory." + .format(CUSTOM_APPS_DIR)) else: directory = MACKUP_BACKUP_PATH From 98f4d6867bc3e93ed0284cf78468e0b7226284f2 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 2 May 2019 09:37:09 -0700 Subject: [PATCH 067/406] Remove trailing slashes (#1361) --- CHANGELOG.md | 1 + mackup/applications/intellijidea.cfg | 34 ++++++++++++++-------------- mackup/applications/taskwarrior.cfg | 3 +-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5fc5af95..22c794b00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Prevent users to use Mackup's storage directory to store their files. +- Fix a few broken application support. ## Mackup 0.8.23 diff --git a/mackup/applications/intellijidea.cfg b/mackup/applications/intellijidea.cfg index 41a135bb1..588ec20a8 100644 --- a/mackup/applications/intellijidea.cfg +++ b/mackup/applications/intellijidea.cfg @@ -2,56 +2,56 @@ name = IntelliJ IDEA [configuration_files] -.IntelliJIdea12/config/ +.IntelliJIdea12/config Library/Application Support/IntelliJIdea12 Library/Preferences/IntelliJIdea12 -.IntelliJIdea13/config/ +.IntelliJIdea13/config Library/Application Support/IntelliJIdea13 Library/Preferences/IntelliJIdea13 -.IntelliJIdea14/config/ +.IntelliJIdea14/config Library/Application Support/IntelliJIdea14 Library/Preferences/IntelliJIdea14 -.IntelliJIdea15/config/ +.IntelliJIdea15/config Library/Application Support/IntelliJIdea15 Library/Preferences/IntelliJIdea15 -IntelliJIdea2016.1/config/ +IntelliJIdea2016.1/config Library/Application Support/IntelliJIdea2016.1 Library/Preferences/IntelliJIdea2016.1 Library/Application Support/IdeaIC2016.1 Library/Preferences/IdeaIC2016.1 Library/Preferences/IntelliJIdea2016.2 Library/Application Support/IntelliJIdea2016.2 -IntelliJIdea2016.2/config/ +IntelliJIdea2016.2/config Library/Preferences/IntelliJIdea2016.3 Library/Application Support/IntelliJIdea2016.3 -IntelliJIdea2016.3/config/ +IntelliJIdea2016.3/config Library/Preferences/IntelliJIdea2017.1 Library/Application Support/IntelliJIdea2017.1 -IntelliJIdea2017.1/config/ +IntelliJIdea2017.1/config Library/Preferences/IntelliJIdea2017.2 Library/Application Support/IntelliJIdea2017.2 -IntelliJIdea2017.2/config/ +IntelliJIdea2017.2/config Library/Preferences/IntelliJIdea2017.3 Library/Application Support/IntelliJIdea2017.3 -IntelliJIdea2017.3/config/ +IntelliJIdea2017.3/config Library/Preferences/IntelliJIdea2018.1 Library/Application Support/IntelliJIdea2018.1 -IntelliJIdea2018.1/config/ +IntelliJIdea2018.1/config Library/Preferences/IdeaIC2018.2 Library/Application Support/IdeaIC2018.2 -IdeaIC2018.2/config/ +IdeaIC2018.2/config Library/Preferences/IntelliJIdea2018.2 Library/Application Support/IntelliJIdea2018.2 -IntelliJIdea2018.2/config/ +IntelliJIdea2018.2/config Library/Preferences/IdeaIC2018.3 Library/Application Support/IdeaIC2018.3 -IdeaIC2018.3/config/ +IdeaIC2018.3/config Library/Preferences/IntelliJIdea2018.3 Library/Application Support/IntelliJIdea2018.3 -IntelliJIdea2018.3/config/ +IntelliJIdea2018.3/config Library/Preferences/IdeaIC2019.1 Library/Application Support/IdeaIC2019.1 -IdeaIC2019.1/config/ +IdeaIC2019.1/config Library/Preferences/IntelliJIdea2019.1 Library/Application Support/IntelliJIdea2019.1 -IntelliJIdea2019.1/config/ +IntelliJIdea2019.1/config diff --git a/mackup/applications/taskwarrior.cfg b/mackup/applications/taskwarrior.cfg index dbe1a755a..38df86911 100644 --- a/mackup/applications/taskwarrior.cfg +++ b/mackup/applications/taskwarrior.cfg @@ -9,5 +9,4 @@ name = Taskwarrior ## ## If you'd rather want to sync using mackup, uncomment the following lines. -# .task/ - +# .task From 45e5e713e544f34ba195b9ef4df21b6d0272490c Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 2 May 2019 09:38:32 -0700 Subject: [PATCH 068/406] Mackup 0.8.24 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22c794b00..c2b106099 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.24 + - Prevent users to use Mackup's storage directory to store their files. - Fix a few broken application support. diff --git a/mackup/constants.py b/mackup/constants.py index 2e7f7bee6..cf1b1df94 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.23' +VERSION = '0.8.24' # Support platforms PLATFORM_DARWIN = 'Darwin' From 60c20abfdc3e7a5e32bd923c5b56e9241d8eaf7f Mon Sep 17 00:00:00 2001 From: Pavlos Vinieratos Date: Thu, 9 May 2019 18:19:30 +0200 Subject: [PATCH 069/406] add global git ignore (#1362) based on https://github.com/lra/mackup/pull/926#issuecomment-273964314 --- mackup/applications/git.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/git.cfg b/mackup/applications/git.cfg index fe1358578..59f6437bd 100644 --- a/mackup/applications/git.cfg +++ b/mackup/applications/git.cfg @@ -6,3 +6,4 @@ name = Git [xdg_configuration_files] git/config +git/ignore From e6c96294813bc4b05ad01a6fd3eb3d683fe0ebb7 Mon Sep 17 00:00:00 2001 From: Pavlos Vinieratos Date: Thu, 9 May 2019 18:24:31 +0200 Subject: [PATCH 070/406] include the default ignore file (#1363) --- mackup/applications/eslint.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/eslint.cfg b/mackup/applications/eslint.cfg index ac17092f7..49a5590fe 100644 --- a/mackup/applications/eslint.cfg +++ b/mackup/applications/eslint.cfg @@ -7,3 +7,4 @@ name = ESLint .eslintrc.yml .eslintrc.json .eslintrc +.eslintignore From 0723398b6dc652487b502302eae805718de7bd98 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 9 May 2019 09:24:55 -0700 Subject: [PATCH 071/406] Add missing changelogs --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2b106099..4300d9c4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## WIP +- Added support for git ignore file +- Added default ignore file for eslint + ## Mackup 0.8.24 - Prevent users to use Mackup's storage directory to store their files. From 2c7a99da2e21f1a6cbad1510a3a9a08304142ebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C3=96zg=C3=BCr?= Date: Fri, 10 May 2019 19:29:10 +0300 Subject: [PATCH 072/406] Add .vim/spell folder for custom words (#1365) http://vimdoc.sourceforge.net/htmldoc/options.html#'spellfile' Note that apparently only *.add files are needed, and *.spl files are generated from them. Added the folder since AFAIK there is no support for wildcards yet. --- CHANGELOG.md | 1 + mackup/applications/vim.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4300d9c4a..4ddf7a181 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Added support for git ignore file - Added default ignore file for eslint +- Improve support for Vim, add .vim/spell folder ## Mackup 0.8.24 diff --git a/mackup/applications/vim.cfg b/mackup/applications/vim.cfg index 4ce2ba59b..c5a4af9b5 100644 --- a/mackup/applications/vim.cfg +++ b/mackup/applications/vim.cfg @@ -14,6 +14,7 @@ name = Vim .vim/indent .vim/pack .vim/plugin/settings +.vim/spell .vim/syntax .vim/vimrc .vimrc From bca75da18a904260316dbe4cbeb24b7ca06eb6bd Mon Sep 17 00:00:00 2001 From: Lorenzo Fanchi Date: Fri, 10 May 2019 18:29:39 +0200 Subject: [PATCH 073/406] improve support for little snitch (#1364) --- CHANGELOG.md | 1 + mackup/applications/littlesnitch.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ddf7a181..b19494b57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Improve support for Little Snitch (via @lorenzofanchi) - Added support for git ignore file - Added default ignore file for eslint - Improve support for Vim, add .vim/spell folder diff --git a/mackup/applications/littlesnitch.cfg b/mackup/applications/littlesnitch.cfg index c08c487d8..d3ef2509f 100644 --- a/mackup/applications/littlesnitch.cfg +++ b/mackup/applications/littlesnitch.cfg @@ -6,3 +6,4 @@ Library/Preferences/at.obdev.LittleSnitchNetworkMonitor.plist Library/Application Support/Little Snitch/rules.usr.xpl Library/Application Support/Little Snitch/configuration.xpl Library/Application Support/Little Snitch/configuration.user.xpl +Library/Application Support/Little Snitch/configuration4.user.xpl From 96044964ed80bf5f286030277250c49f8f77f79a Mon Sep 17 00:00:00 2001 From: Lorenzo Fanchi Date: Tue, 14 May 2019 23:30:02 +0200 Subject: [PATCH 074/406] add support for Magnet (#1371) * add support for Magnet * add magnet to README.md --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/magnet.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/magnet.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b19494b57..2076b2c75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Improve support for Little Snitch (via @lorenzofanchi) +- Add support for Magnet (via @lorenzofanchi) - Added support for git ignore file - Added default ignore file for eslint - Improve support for Vim, add .vim/spell folder diff --git a/README.md b/README.md index 859abdcbe..73005bd35 100644 --- a/README.md +++ b/README.md @@ -374,6 +374,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [MacVim](https://github.com/macvim-dev/macvim) - [Magic Launch](https://www.oneperiodic.com/products/magiclaunch/) - [MagicPrefs](http://magicprefs.com/) +- [Magnet](https://magnet.crowdcafe.com/) - [Maid](https://github.com/benjaminoakes/maid/) - [Mailmate](http://freron.com/) - [Mailplane](http://mailplaneapp.com/) diff --git a/mackup/applications/magnet.cfg b/mackup/applications/magnet.cfg new file mode 100644 index 000000000..6fdaba4a7 --- /dev/null +++ b/mackup/applications/magnet.cfg @@ -0,0 +1,5 @@ +[application] +name = Magnet + +[configuration_files] +Library/Preferences/com.crowdcafe.windowmagnet.plist From 5020011a6eed61be0704d3e913309378d2489210 Mon Sep 17 00:00:00 2001 From: Lorenzo Fanchi Date: Tue, 14 May 2019 23:33:35 +0200 Subject: [PATCH 075/406] add support for Multitouch (#1370) * add support for Multitouch * add Multitouch to README.md --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/multitouch.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/multitouch.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 2076b2c75..6ff456e06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Improve support for Little Snitch (via @lorenzofanchi) +- Add support for Multitouch (via @lorenzofanchi) - Add support for Magnet (via @lorenzofanchi) - Added support for git ignore file - Added default ignore file for eslint diff --git a/README.md b/README.md index 73005bd35..a1114107e 100644 --- a/README.md +++ b/README.md @@ -397,6 +397,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [MPlayerX](http://mplayerx.org) - [MPS Youtube](https://github.com/mps-youtube/mps-youtube) - [MPV](https://mpv.io/) +- [Multitouch](https://multitouch.app/) - [MusicBrainz Picard](https://picard.musicbrainz.org/) - [myrepos](https://github.com/joeyh/myrepos) - [MySQL Workbench](https://www.mysql.com/products/workbench/) diff --git a/mackup/applications/multitouch.cfg b/mackup/applications/multitouch.cfg new file mode 100644 index 000000000..2314521b9 --- /dev/null +++ b/mackup/applications/multitouch.cfg @@ -0,0 +1,5 @@ +[application] +name = Multitouch + +[configuration_files] +Library/Preferences/com.brassmonkery.Multitouch.plist From 04aa87bd0d5235e068a2662ee0d7a3afd481b90f Mon Sep 17 00:00:00 2001 From: Lorenzo Fanchi Date: Tue, 14 May 2019 23:35:47 +0200 Subject: [PATCH 076/406] add support for Pock (#1372) * add support for Pock * add Pock to README.md --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/pock.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/pock.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ff456e06..b5af5eaf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Improve support for Little Snitch (via @lorenzofanchi) +- Add support for Pock (via @lorenzofanchi) - Add support for Multitouch (via @lorenzofanchi) - Add support for Magnet (via @lorenzofanchi) - Added support for git ignore file diff --git a/README.md b/README.md index a1114107e..f519b3e4e 100644 --- a/README.md +++ b/README.md @@ -436,6 +436,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Pidgin](https://www.pidgin.im) - [PIP](http://www.pip-installer.org/) - [PixelSnap](https://getpixelsnap.com/) +- [Pock](https://pock.pigigaldi.com) - [Poedit](http://poedit.net/) - [PokerStars](https://www.pokerstars.com/) - [PopClip](http://pilotmoon.com/popclip/) diff --git a/mackup/applications/pock.cfg b/mackup/applications/pock.cfg new file mode 100644 index 000000000..85cf60aed --- /dev/null +++ b/mackup/applications/pock.cfg @@ -0,0 +1,5 @@ +[application] +name = Pock + +[configuration_files] +Library/Preferences/com.pigigaldi.pock.plist From f0ef83b91dc76a8730f85d28482616339e47beee Mon Sep 17 00:00:00 2001 From: Lorenzo Fanchi Date: Tue, 14 May 2019 23:39:41 +0200 Subject: [PATCH 077/406] add support for Shifty (#1368) * add support for Shifty * add Shifty to README.md --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/shifty.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/shifty.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b5af5eaf1..ea11eca04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Improve support for Little Snitch (via @lorenzofanchi) +- Add support for Shifty (via @lorenzofanchi) - Add support for Pock (via @lorenzofanchi) - Add support for Multitouch (via @lorenzofanchi) - Add support for Magnet (via @lorenzofanchi) diff --git a/README.md b/README.md index f519b3e4e..a13c8fd9a 100644 --- a/README.md +++ b/README.md @@ -487,6 +487,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [SelfControl](http://selfcontrolapp.com/) - [Sequel Pro](http://www.sequelpro.com/) - [ShiftIt](https://github.com/fikovnik/ShiftIt) +- [Shifty](https://shifty.natethompson.io/) - [Shimo](https://www.feingeist.io/shimo/) - [ShowyEdge](https://pqrs.org/osx/ShowyEdge/index.html.en) - [SHSH Blobs](https://en.wikipedia.org/wiki/SHSH_blob) diff --git a/mackup/applications/shifty.cfg b/mackup/applications/shifty.cfg new file mode 100644 index 000000000..9773f68c8 --- /dev/null +++ b/mackup/applications/shifty.cfg @@ -0,0 +1,5 @@ +[application] +name = Shifty + +[configuration_files] +Library/Preferences/io.natethompson.Shifty.plist From bd8a0734e4799c874cffc6bdc6108ad1cfac4933 Mon Sep 17 00:00:00 2001 From: Lorenzo Fanchi Date: Wed, 15 May 2019 21:21:54 +0200 Subject: [PATCH 078/406] add support for 2Do (#1377) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/2do.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/2do.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ea11eca04..971167add 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Improve support for Little Snitch (via @lorenzofanchi) +- Add support for 2Do (via @lorenzofanchi) - Add support for Shifty (via @lorenzofanchi) - Add support for Pock (via @lorenzofanchi) - Add support for Multitouch (via @lorenzofanchi) diff --git a/README.md b/README.md index a13c8fd9a..9388944cd 100644 --- a/README.md +++ b/README.md @@ -158,6 +158,7 @@ See the [README](doc/README.md) file in the doc directory for more info. ## Supported Applications - [1Password 4](https://agilebits.com/onepassword) +- [2Do](http://www.2doapp.com/) - [Ack](http://beyondgrep.com/) - [Adium](https://adium.im/) - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) diff --git a/mackup/applications/2do.cfg b/mackup/applications/2do.cfg new file mode 100644 index 000000000..7383989b1 --- /dev/null +++ b/mackup/applications/2do.cfg @@ -0,0 +1,5 @@ +[application] +name = 2Do + +[configuration_files] +Library/Preferences/com.guidedways.TodoMac.plist From 4f34a5781c0f8805fe3c9a6a641ba82d33e715fd Mon Sep 17 00:00:00 2001 From: Lorenzo Fanchi Date: Wed, 15 May 2019 21:24:51 +0200 Subject: [PATCH 079/406] add support for Xee (#1378) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/xee.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/xee.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 971167add..f50d87586 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Improve support for Little Snitch (via @lorenzofanchi) +- Add support for Xee (via @lorenzofanchi) - Add support for 2Do (via @lorenzofanchi) - Add support for Shifty (via @lorenzofanchi) - Add support for Pock (via @lorenzofanchi) diff --git a/README.md b/README.md index 9388944cd..47c94922f 100644 --- a/README.md +++ b/README.md @@ -573,6 +573,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [WordPress WP-CLI](http://wp-cli.org/) - [Workrave](http://www.workrave.org/) - [X11](http://www.x.org/) +- [Xee](https://theunarchiver.com/xee) - [Xamarin Studio](https://xamarin.com/studio) - [XBindKeys](http://www.nongnu.org/xbindkeys/) - [Xchat](http://xchat.org/) diff --git a/mackup/applications/xee.cfg b/mackup/applications/xee.cfg new file mode 100644 index 000000000..92e9fc2aa --- /dev/null +++ b/mackup/applications/xee.cfg @@ -0,0 +1,5 @@ +[application] +name = Xee + +[configuration_files] +Library/Preferences/cx.c3.Xee3.plist From f946bb2cd0a06d89c078549ff68fef88cdc72085 Mon Sep 17 00:00:00 2001 From: Lorenzo Fanchi Date: Thu, 16 May 2019 00:38:40 +0200 Subject: [PATCH 080/406] add support for Secure Pipes (#1376) * add support for Secure Pipes * update rule --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/secure-pipes.cfg | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 mackup/applications/secure-pipes.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index f50d87586..56ad93013 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Improve support for Little Snitch (via @lorenzofanchi) +- Add support for Secure Pipes (via @lorenzofanchi) - Add support for Xee (via @lorenzofanchi) - Add support for 2Do (via @lorenzofanchi) - Add support for Shifty (via @lorenzofanchi) diff --git a/README.md b/README.md index 47c94922f..231ce9dd3 100644 --- a/README.md +++ b/README.md @@ -484,6 +484,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Scrivener](http://www.literatureandlatte.com/scrivener.php) - [Scroll Reverser](https://pilotmoon.com/scrollreverser/) - [SecureCRT](https://www.vandyke.com/products/securecrt/) +- [Secure Pipes](http://www.opoet.com/) - [Seil](https://pqrs.org/osx/karabiner/seil.html.en) - [SelfControl](http://selfcontrolapp.com/) - [Sequel Pro](http://www.sequelpro.com/) diff --git a/mackup/applications/secure-pipes.cfg b/mackup/applications/secure-pipes.cfg new file mode 100644 index 000000000..7df111447 --- /dev/null +++ b/mackup/applications/secure-pipes.cfg @@ -0,0 +1,8 @@ +[application] +name = Secure Pipes + +[configuration_files] +Library/Preferences/net.edgeservices.connections.plist +Library/Preferences/net.edgeservices.Secure-Pipes.plist +Library/Preferences/net.edgeservices.sp-config.plist +Library/Application Support/Secure Pipes From 92a402a593cd09ed0128c90b1ec85032b4da352f Mon Sep 17 00:00:00 2001 From: Lorenzo Fanchi Date: Fri, 17 May 2019 21:53:43 +0200 Subject: [PATCH 081/406] add support for Colorslurp (#1379) * add support for ColorSlurp * add additional config file --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/colorslurp.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/colorslurp.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 56ad93013..ded25795a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Improve support for Little Snitch (via @lorenzofanchi) +- Add support for ColorSlurp (via @lorenzofanchi) - Add support for Secure Pipes (via @lorenzofanchi) - Add support for Xee (via @lorenzofanchi) - Add support for 2Do (via @lorenzofanchi) diff --git a/README.md b/README.md index 231ce9dd3..6a400b844 100644 --- a/README.md +++ b/README.md @@ -225,6 +225,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Coda 2](http://panic.com/coda/) - [Colloquy](http://colloquy.info/) - [ColorSchemer Studio 2](http://www.colorschemer.com/osx_info.php) +- [ColorSlurp](http://colorslurp.com/) - [ColorSync](https://en.wikipedia.org/wiki/ColorSync) - [Composer](https://getcomposer.org/) - [Concentrate](http://www.getconcentrating.com/) diff --git a/mackup/applications/colorslurp.cfg b/mackup/applications/colorslurp.cfg new file mode 100644 index 000000000..f6a0e733f --- /dev/null +++ b/mackup/applications/colorslurp.cfg @@ -0,0 +1,6 @@ +[application] +name = ColorSlurp + +[configuration_files] +Library/Preferences/com.IdeaPunch.ColorSlurp.plist +Library/Containers/com.IdeaPunch.ColorSlurp/Data/Library/Application Support/default.realm From f9f6d5bb939bbff1bcd7804fecdfd14654d387b2 Mon Sep 17 00:00:00 2001 From: Lorenzo Fanchi Date: Fri, 17 May 2019 22:06:37 +0200 Subject: [PATCH 082/406] improve support for Photoshop CC 2019 (#1380) --- CHANGELOG.md | 1 + mackup/applications/photoshop.cfg | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ded25795a..e30a47306 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Improve support for Little Snitch (via @lorenzofanchi) +- Improve support for Photoshop CC 2019 (via @lorenzofanchi) - Add support for ColorSlurp (via @lorenzofanchi) - Add support for Secure Pipes (via @lorenzofanchi) - Add support for Xee (via @lorenzofanchi) diff --git a/mackup/applications/photoshop.cfg b/mackup/applications/photoshop.cfg index e596e10f7..aea0ac7fd 100644 --- a/mackup/applications/photoshop.cfg +++ b/mackup/applications/photoshop.cfg @@ -6,8 +6,10 @@ Library/Application Support/Adobe/Adobe Photoshop CC 2013/Presets Library/Application Support/Adobe/Adobe Photoshop CC 2014/Presets Library/Application Support/Adobe/Adobe Photoshop CC 2015/Presets Library/Application Support/Adobe/Adobe Photoshop CC 2015.5/Presets +Library/Application Support/Adobe/Adobe Photoshop CC 2019/Presets Library/Preferences/Adobe Photoshop CC 2013 Settings Library/Preferences/Adobe Photoshop CC 2014 Settings Library/Preferences/Adobe Photoshop CC 2015 Settings Library/Preferences/Adobe Photoshop CC 2015.5 Settings +Library/Preferences/Adobe Photoshop CC 2019 Settings Library/Preferences/com.adobe.Photoshop.plist From f434fe82dd00d67f345d4f6a9c0fa377956a94a0 Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Thu, 23 May 2019 00:45:56 +0200 Subject: [PATCH 083/406] Add support for PixelSnap 2 (#1381) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/pixelsnap2.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/pixelsnap2.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e30a47306..943b0740b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Added support for git ignore file - Added default ignore file for eslint - Improve support for Vim, add .vim/spell folder +- Add support for PixelSnap 2 (via @dnicolson) ## Mackup 0.8.24 diff --git a/README.md b/README.md index 6a400b844..95ce4d434 100644 --- a/README.md +++ b/README.md @@ -438,6 +438,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Pidgin](https://www.pidgin.im) - [PIP](http://www.pip-installer.org/) - [PixelSnap](https://getpixelsnap.com/) +- [PixelSnap 2](https://getpixelsnap.com/) - [Pock](https://pock.pigigaldi.com) - [Poedit](http://poedit.net/) - [PokerStars](https://www.pokerstars.com/) diff --git a/mackup/applications/pixelsnap2.cfg b/mackup/applications/pixelsnap2.cfg new file mode 100644 index 000000000..54d91f75c --- /dev/null +++ b/mackup/applications/pixelsnap2.cfg @@ -0,0 +1,5 @@ +[application] +name = PixelSnap 2 + +[configuration_files] +Library/Preferences/pl.maketheweb.pixelsnap2.plist From aea6ec37af798d95ab7006e5e3a9c53976fa1348 Mon Sep 17 00:00:00 2001 From: README Bot <35302948+codetriage-readme-bot@users.noreply.github.com> Date: Tue, 4 Jun 2019 13:44:26 -0500 Subject: [PATCH 084/406] Add CodeTriage badge to lra/mackup (#1385) Adds a badge showing the number of people helping this repo on CodeTriage. [![Open Source Helpers](https://www.codetriage.com/lra/mackup/badges/users.svg)](https://www.codetriage.com/lra/mackup) ## What is CodeTriage? CodeTriage is an Open Source app that is designed to make contributing to Open Source projects easier. It works by sending subscribers a few open issues in their inbox. If subscribers get busy, there is an algorithm that backs off issue load so they do not get overwhelmed [Read more about the CodeTriage project](https://www.codetriage.com/what). ## Why am I getting this PR? Your project was picked by the human, @schneems. They selected it from the projects submitted to https://www.codetriage.com and hand edited the PR. How did your project get added to [CodeTriage](https://www.codetriage.com/what)? Roughly almost 3 years ago, [ChristianBagley](https://github.com/ChristianBagley) added this project to CodeTriage in order to start contributing. Since then, 9 people have subscribed to help this repo. ## What does adding a badge accomplish? Adding a badge invites people to help contribute to your project. It also lets developers know that others are invested in the longterm success and maintainability of the project. You can see an example of a CodeTriage badge on these popular OSS READMEs: - [![Email clients like GMAIL do not render SVG images](https://www.codetriage.com/rails/rails/badges/users.svg)](https://www.codetriage.com/rails/rails) https://github.com/rails/rails - [![Email clients like GMAIL do not render SVG images](https://www.codetriage.com/crystal-lang/crystal/badges/users.svg)](https://www.codetriage.com/crystal-lang/crystal) https://github.com/crystal-lang/crystal ## Have a question or comment? While I am a bot, this PR was manually reviewed and monitored by a human - @schneems. My job is writing commit messages and handling PR logistics. If you have any questions, you can reply back to this PR and they will be answered by @schneems. If you do not want a badge right now, no worries, close the PR, you will not hear from me again. Thanks for making your project Open Source! Any feedback is greatly appreciated. --- CONTRIBUTING.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 82ec8a596..d7f4e1465 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,6 +5,11 @@ You can: - Add or improve the support of an application (Check the [TODO][TODO] and [TOFIX][TOFIX] tasks and pick one) - Improve the Mackup codebase +- You can triage issues which may include reproducing bug reports or asking for + vital information, such as version numbers or reproduction instructions. If + you would like to start triaging issues, one easy way to get started is to + [subscribe to mackup on CodeTriage](https://www.codetriage.com/lra/mackup). + [![Open Source Helpers][CODETRIAGE-IMG]][CODETRIAGE] To speed up Pull Request (PR) approval and merger into Mackup, please follow these guidelines: @@ -27,3 +32,5 @@ Thank you for your contribution! [TODO]: https://github.com/lra/mackup/labels/TODO [TOFIX]: https://github.com/lra/mackup/labels/TOFIX +[CODETRIAGE]: https://www.codetriage.com/lra/mackup +[CODETRIAGE-IMG]: https://www.codetriage.com/lra/mackup/badges/users.svg From 4d2b39390ba4b7e97bcab130f086ae4e088b5e1b Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 5 Jun 2019 12:51:58 -0700 Subject: [PATCH 085/406] Create FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000000000..83102876b --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +github: [lra] From 968651890567ab44b240273f2b96ba4d81f9054b Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 5 Jun 2019 12:54:03 -0700 Subject: [PATCH 086/406] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 83102876b..1e4500235 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,3 +1,3 @@ # These are supported funding model platforms -github: [lra] +github: lra From 16cc85a4725c95db6ac6031f54223fe390fe5ee1 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 5 Jun 2019 12:56:11 -0700 Subject: [PATCH 087/406] Remove sponsoring stuff --- .github/FUNDING.yml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 1e4500235..000000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,3 +0,0 @@ -# These are supported funding model platforms - -github: lra From acad5d455d4ec6ccfac7907a8cf061454490f293 Mon Sep 17 00:00:00 2001 From: mbdmbd Date: Sun, 14 Jul 2019 05:31:45 +1000 Subject: [PATCH 088/406] Add support for yabai (#1397) * Adding yabai configuration Yabai (https://github.com/koekeishiya/yabai) has replaced chunkwm. Adding it to the list of apps. * Supplemental edits as per contribute doc --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/yabai.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/yabai.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 943b0740b..5339cee6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for yabai (via @mbdmbd) - Improve support for Little Snitch (via @lorenzofanchi) - Improve support for Photoshop CC 2019 (via @lorenzofanchi) - Add support for ColorSlurp (via @lorenzofanchi) diff --git a/README.md b/README.md index 95ce4d434..77c2c9a7c 100644 --- a/README.md +++ b/README.md @@ -585,6 +585,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [XLD](http://tmkk.undo.jp/xld/) - [Xonsh](https://xon.sh) - [XtraFinder](http://www.trankynam.com/xtrafinder/) +- [yabai](https://github.com/koekeishiya/yabai) - [Yummy FTP](http://www.yummysoftware.com/) - [zabbix-cli](https://github.com/usit-gd/zabbix-cli) - [zathura](https://pwmt.org/projects/zathura/) diff --git a/mackup/applications/yabai.cfg b/mackup/applications/yabai.cfg new file mode 100644 index 000000000..c4542196d --- /dev/null +++ b/mackup/applications/yabai.cfg @@ -0,0 +1,5 @@ +[application] +name = yabai + +[configuration_files] +.yabairc From c86ef62d8e99fad07a6ce0a1e2eef321593164e5 Mon Sep 17 00:00:00 2001 From: Chris <7539871+paxperscientiam@users.noreply.github.com> Date: Sat, 13 Jul 2019 15:33:09 -0400 Subject: [PATCH 089/406] add PDFjam support (#1395) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/pdfjam.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/pdfjam.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5339cee6e..eaaef45dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Added default ignore file for eslint - Improve support for Vim, add .vim/spell folder - Add support for PixelSnap 2 (via @dnicolson) +- Add support for PDFjam (via @paxperscientiam) ## Mackup 0.8.24 diff --git a/README.md b/README.md index 77c2c9a7c..e40375178 100644 --- a/README.md +++ b/README.md @@ -429,6 +429,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Pass](http://www.passwordstore.org/) - [Pastebot](http://tapbots.com/software/pastebot/) - [Path Finder](http://www.cocoatech.com/pathfinder/) +- [PDFjam](https://warwick.ac.uk/fac/sci/statistics/staff/academic-research/firth/software/pdfjam/) - [Pear](http://pear.php.net/) - [Pentadactyl](http://5digits.org/pentadactyl/) - [Perl](https://www.perl.org/) diff --git a/mackup/applications/pdfjam.cfg b/mackup/applications/pdfjam.cfg new file mode 100644 index 000000000..45388a368 --- /dev/null +++ b/mackup/applications/pdfjam.cfg @@ -0,0 +1,5 @@ +[application] +name = PDFjam + +[configuration_files] +.pdfjam.conf From 72b7fd0e0496c889a5ddea265b3495db19c9331b Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Sat, 13 Jul 2019 21:36:40 +0200 Subject: [PATCH 090/406] Add AppCleaner SmartDelete (#1392) --- mackup/applications/appcleaner.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/appcleaner.cfg b/mackup/applications/appcleaner.cfg index 05d29b66b..90bc5190e 100644 --- a/mackup/applications/appcleaner.cfg +++ b/mackup/applications/appcleaner.cfg @@ -3,3 +3,4 @@ name = AppCleaner [configuration_files] Library/Preferences/net.freemacsoft.AppCleaner.plist +Library/Preferences/net.freemacsoft.AppCleaner-SmartDelete.plist From bcbf1a1f506f5c01c0d175ea144b35586f62bc55 Mon Sep 17 00:00:00 2001 From: Gabriel Chamon Araujo Date: Sat, 13 Jul 2019 18:23:01 -0300 Subject: [PATCH 091/406] added mycli support (#1366) * added myclirc support * added mycli reference to CHANGELOG.md and README.md * fixed mycli order in applications --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/mycli.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100755 mackup/applications/mycli.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index eaaef45dd..d0a243e4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Added support for git ignore file - Added default ignore file for eslint - Improve support for Vim, add .vim/spell folder +- Add support for mycli - Add support for PixelSnap 2 (via @dnicolson) - Add support for PDFjam (via @paxperscientiam) diff --git a/README.md b/README.md index e40375178..e55ee34b2 100644 --- a/README.md +++ b/README.md @@ -401,6 +401,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [MPV](https://mpv.io/) - [Multitouch](https://multitouch.app/) - [MusicBrainz Picard](https://picard.musicbrainz.org/) +- [mycli](https://www.mycli.net/) - [myrepos](https://github.com/joeyh/myrepos) - [MySQL Workbench](https://www.mysql.com/products/workbench/) - [MySQL](http://www.mysql.com/) diff --git a/mackup/applications/mycli.cfg b/mackup/applications/mycli.cfg new file mode 100755 index 000000000..693c4ed77 --- /dev/null +++ b/mackup/applications/mycli.cfg @@ -0,0 +1,5 @@ +[application] +name = mycli + +[configuration_files] +.myclirc From 4ce3c7bfa5fa8c8c615a56866de32efb97875e80 Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Sun, 14 Jul 2019 01:25:00 +0200 Subject: [PATCH 092/406] Cleanup iTunes scripts (#1388) --- README.md | 2 +- mackup/applications/{itunesscripts.cfg => itunes-scripts.cfg} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename mackup/applications/{itunesscripts.cfg => itunes-scripts.cfg} (73%) diff --git a/README.md b/README.md index e55ee34b2..8307d53d5 100644 --- a/README.md +++ b/README.md @@ -336,6 +336,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Itsycal](https://github.com/sfsam/Itsycal) - [iTerm2](https://www.iterm2.com/) - [iTermocil](https://github.com/TomAnthony/itermocil) +- [iTunes Scripts](https://www.apple.com/) - [Janus](https://github.com/carlhuda/janus) - [Jitouch](http://www.jitouch.com/) - [jrnl](http://maebert.github.io/jrnl/) @@ -593,7 +594,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [zathura](https://pwmt.org/projects/zathura/) - [Zsh](http://zsh.sourceforge.net/) - [Übersicht](http://tracesof.net/uebersicht/) -- iTunes Applescripts ## Can you support application X diff --git a/mackup/applications/itunesscripts.cfg b/mackup/applications/itunes-scripts.cfg similarity index 73% rename from mackup/applications/itunesscripts.cfg rename to mackup/applications/itunes-scripts.cfg index 913b11617..d56bb8968 100644 --- a/mackup/applications/itunesscripts.cfg +++ b/mackup/applications/itunes-scripts.cfg @@ -1,5 +1,5 @@ [application] -name = iTunesScripts +name = iTunes Scripts [configuration_files] Library/iTunes/Scripts From c99e1745781b14ff1988bcbcf94290da7ef30046 Mon Sep 17 00:00:00 2001 From: Nero Date: Sun, 14 Jul 2019 00:25:38 +0100 Subject: [PATCH 093/406] Added support for Datagrip 2019.1 (#1391) --- mackup/applications/datagrip.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/datagrip.cfg b/mackup/applications/datagrip.cfg index 31f95d786..b9b9cbaa0 100644 --- a/mackup/applications/datagrip.cfg +++ b/mackup/applications/datagrip.cfg @@ -10,3 +10,5 @@ Library/Application Support/DataGrip2018.2 Library/Preferences/DataGrip2018.2 Library/Application Support/DataGrip2018.3 Library/Preferences/DataGrip2018.3 +Library/Application Support/DataGrip2019.1 +Library/Preferences/DataGrip2019.1 From d7be1dbff434c068cff422c28f692cb9d15d3ae9 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 13 Jul 2019 18:12:22 -0700 Subject: [PATCH 094/406] mackup show (#1402) * Add support for mackup show Solves #1401 * Explicit python version in CI * Don't use pyenv anymore * new commit for CCI * Attempt to fix CCI * Bring back pyenv, can't find pip bins without it --- .circleci/config.yml | 70 ++++++++++++++++++++++---------------------- mackup/appsdb.py | 4 +-- mackup/main.py | 21 ++++++++++--- 3 files changed, 54 insertions(+), 41 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2df88d55f..82f015412 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ -version: 2 -jobs: +version: 2.1 - nose-2.7: +jobs: + nose-2_7: docker: - image: python:2.7 steps: @@ -9,7 +9,7 @@ jobs: - run: pip install -r requirements.txt - run: make test - nose-3.4: + nose-3_4: docker: - image: python:3.4 steps: @@ -17,7 +17,7 @@ jobs: - run: pip install -r requirements.txt - run: make test - nose-3.5: + nose-3_5: docker: - image: python:3.5 steps: @@ -25,7 +25,7 @@ jobs: - run: pip install -r requirements.txt - run: make test - nose-3.6: + nose-3_6: docker: - image: python:3.6 steps: @@ -33,15 +33,15 @@ jobs: - run: pip install -r requirements.txt - run: make test - nose: + nose-3_7: docker: - - image: python + - image: python:3.7 steps: - checkout - run: pip install -r requirements.txt - run: make test - install-2.7: + install-2_7: docker: - image: python:2.7 steps: @@ -49,7 +49,7 @@ jobs: - run: python setup.py install - run: mackup --help - install-3.4: + install-3_4: docker: - image: python:3.4 steps: @@ -57,7 +57,7 @@ jobs: - run: python setup.py install - run: mackup --help - install-3.5: + install-3_5: docker: - image: python:3.5 steps: @@ -65,7 +65,7 @@ jobs: - run: python setup.py install - run: mackup --help - install-3.6: + install-3_6: docker: - image: python:3.6 steps: @@ -73,15 +73,15 @@ jobs: - run: python setup.py install - run: mackup --help - install: + install-3_7: docker: - - image: python + - image: python:3.7 steps: - checkout - run: python setup.py install - run: mackup --help - flake8-2.7: + flake8-2_7: docker: - image: python:2.7 steps: @@ -89,7 +89,7 @@ jobs: - run: pip install flake8 - run: flake8 - flake8-3.4: + flake8-3_4: docker: - image: python:3.4 steps: @@ -97,7 +97,7 @@ jobs: - run: pip install flake8 - run: flake8 - flake8-3.5: + flake8-3_5: docker: - image: python:3.5 steps: @@ -105,7 +105,7 @@ jobs: - run: pip install flake8 - run: flake8 - flake8-3.6: + flake8-3_6: docker: - image: python:3.6 steps: @@ -113,9 +113,9 @@ jobs: - run: pip install flake8 - run: flake8 - flake8: + flake8-3_7: docker: - - image: python + - image: python:3.7 steps: - checkout - run: pip install flake8 @@ -132,19 +132,19 @@ workflows: version: 2 mackup: jobs: - - nose-2.7 - - nose-3.4 - - nose-3.5 - - nose-3.6 - - nose - - install-2.7 - - install-3.4 - - install-3.5 - - install-3.6 - - install - - flake8-2.7 - - flake8-3.4 - - flake8-3.5 - - flake8-3.6 - - flake8 + - nose-2_7 + - nose-3_4 + - nose-3_5 + - nose-3_6 + - nose-3_7 + - install-2_7 + - install-3_4 + - install-3_5 + - install-3_6 + - install-3_7 + - flake8-2_7 + - flake8-3_4 + - flake8-3_5 + - flake8-3_6 + - flake8-3_7 - mdl diff --git a/mackup/appsdb.py b/mackup/appsdb.py index 7e1b81d36..88df5fb07 100644 --- a/mackup/appsdb.py +++ b/mackup/appsdb.py @@ -79,7 +79,7 @@ def get_config_files(): Return the application configuration files. Return a list of configuration files describing the apps supported by - Mackup. The files return are absolute full path to those files. + Mackup. The files returned are absolute full path to those files. e.g. /usr/lib/mackup/applications/bash.cfg Only one config file per application should be returned, custom config @@ -139,7 +139,7 @@ def get_files(self, name): Returns: set of str. """ - return self.apps[name]['configuration_files'] + return sorted(self.apps[name]['configuration_files']) def get_app_names(self): """ diff --git a/mackup/main.py b/mackup/main.py index a712aba28..fc6428a88 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -1,12 +1,13 @@ """Mackup. Keep your application settings in sync. -Copyright (C) 2013-2015 Laurent Raufaste +Copyright (C) 2013-2019 Laurent Raufaste Usage: mackup list mackup [options] backup mackup [options] restore + mackup show mackup [options] uninstall mackup (-h | --help) mackup --version @@ -21,13 +22,12 @@ Modes of action: 1. list: display a list of all supported applications. 2. backup: sync your conf files to your synced storage, use this the 1st time - you use Mackup. (Note that by default this will sync private keys used by - GnuPG.) + you use Mackup. 3. restore: link the conf files already in your synced storage on your system, use it on any new system you use. 4. uninstall: reset everything as it was before using Mackup. -By default, Mackup syncs all application data (except for private keys) via +By default, Mackup syncs all application data via Dropbox, but may be configured to exclude applications or use a different backend with a .mackup.cfg file. @@ -40,6 +40,7 @@ from .constants import MACKUP_APP_NAME, VERSION from .mackup import Mackup from . import utils +import sys class ColorFormatCodes: @@ -174,5 +175,17 @@ def printAppHeader(app_name): .format(len(app_db.get_app_names()), VERSION)) print(output) + elif args['show']: + mckp.check_for_usable_environment() + app_name = args[''] + + # Make sure the app exists + if app_name not in app_db.get_app_names(): + sys.exit("Unsupported application: {}".format(app_name)) + print("Name: {}".format(app_db.get_name(app_name))) + print("Configuration files:") + for file in app_db.get_files(app_name): + print(" - {}".format(file)) + # Delete the tmp folder mckp.clean_temp_folder() From 477a46021d93534a3521ab4928586696ad726aa9 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 13 Jul 2019 18:13:30 -0700 Subject: [PATCH 095/406] Mackup 0.8.25 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0a243e4d..04c4026cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.25 + - Add support for yabai (via @mbdmbd) - Improve support for Little Snitch (via @lorenzofanchi) - Improve support for Photoshop CC 2019 (via @lorenzofanchi) diff --git a/mackup/constants.py b/mackup/constants.py index cf1b1df94..ad5d18e5e 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.24' +VERSION = '0.8.25' # Support platforms PLATFORM_DARWIN = 'Darwin' From e25920969dbd97d1fd722684747853eb02ffe520 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 28 Jul 2019 14:45:59 -0700 Subject: [PATCH 096/406] Don't return a sorted list, it should be a set (#1412) * Don't return a sorted list, it should be a set * Add changelog --- CHANGELOG.md | 2 ++ mackup/appsdb.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04c4026cb..485ce9631 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Hotfix, Mackup could not run in most scenarios + ## Mackup 0.8.25 - Add support for yabai (via @mbdmbd) diff --git a/mackup/appsdb.py b/mackup/appsdb.py index 88df5fb07..01e881a20 100644 --- a/mackup/appsdb.py +++ b/mackup/appsdb.py @@ -139,7 +139,7 @@ def get_files(self, name): Returns: set of str. """ - return sorted(self.apps[name]['configuration_files']) + return self.apps[name]['configuration_files'] def get_app_names(self): """ From 41ec564662d52dbc919ada9f21532c27e52b295d Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 28 Jul 2019 14:48:02 -0700 Subject: [PATCH 097/406] Mackup 0.8.26 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 485ce9631..03f93ab1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.26 + - Hotfix, Mackup could not run in most scenarios ## Mackup 0.8.25 diff --git a/mackup/constants.py b/mackup/constants.py index ad5d18e5e..69f7ce788 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.25' +VERSION = '0.8.26' # Support platforms PLATFORM_DARWIN = 'Darwin' From 91de4c5635a9a4996e3fae2aab63df1fbc551c0b Mon Sep 17 00:00:00 2001 From: Calum Brodie Date: Sat, 10 Aug 2019 23:51:43 +0100 Subject: [PATCH 098/406] chore: Added PhpStorm 2019.2 to existing (#1421) --- mackup/applications/phpstorm.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg index a8673d4eb..87c6d071f 100644 --- a/mackup/applications/phpstorm.cfg +++ b/mackup/applications/phpstorm.cfg @@ -3,6 +3,8 @@ name = PhpStorm [configuration_files] Library/Preferences/com.jetbrains.PhpStorm.plist +Library/Application Support/PhpStorm2019.2 +Library/Preferences/PhpStorm2019.2 Library/Application Support/PhpStorm2019.1 Library/Preferences/PhpStorm2019.1 Library/Application Support/PhpStorm2018.3 From 940bba382c49225b6b6323a73dc816a2a65fe5f5 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 10 Aug 2019 15:54:25 -0700 Subject: [PATCH 099/406] Missing changelog --- CHANGELOG.md | 2 ++ mackup/applications/phpstorm.cfg | 62 ++++++++++++++++---------------- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03f93ab1c..28a680d65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Add support for PhpStorm 2019.2 + ## Mackup 0.8.26 - Hotfix, Mackup could not run in most scenarios diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg index 87c6d071f..c491c2ea6 100644 --- a/mackup/applications/phpstorm.cfg +++ b/mackup/applications/phpstorm.cfg @@ -2,38 +2,38 @@ name = PhpStorm [configuration_files] -Library/Preferences/com.jetbrains.PhpStorm.plist -Library/Application Support/PhpStorm2019.2 -Library/Preferences/PhpStorm2019.2 -Library/Application Support/PhpStorm2019.1 -Library/Preferences/PhpStorm2019.1 -Library/Application Support/PhpStorm2018.3 -Library/Preferences/PhpStorm2018.3 -Library/Application Support/PhpStorm2018.2 -Library/Preferences/PhpStorm2018.2 -Library/Application Support/PhpStorm2018.1 -Library/Preferences/PhpStorm2018.1 -Library/Application Support/PhpStorm2017.3 -Library/Preferences/PhpStorm2017.3 -Library/Application Support/PhpStorm2017.2 -Library/Preferences/PhpStorm2017.2 -Library/Application Support/PhpStorm2017.1 -Library/Preferences/PhpStorm2017.1 -Library/Application Support/PhpStorm2016.3 -Library/Preferences/PhpStorm2016.3 -Library/Application Support/PhpStorm2016.2 -Library/Preferences/PhpStorm2016.2 Library/Application Support/PhpStorm2016.1 -Library/Preferences/PhpStorm2016.1 +Library/Application Support/PhpStorm2016.2 +Library/Application Support/PhpStorm2016.3 +Library/Application Support/PhpStorm2017.1 +Library/Application Support/PhpStorm2017.2 +Library/Application Support/PhpStorm2017.3 +Library/Application Support/PhpStorm2018.1 +Library/Application Support/PhpStorm2018.2 +Library/Application Support/PhpStorm2018.3 +Library/Application Support/PhpStorm2019.1 +Library/Application Support/PhpStorm2019.2 Library/Application Support/WebIde100 -Library/Preferences/WebIde100 -Library/Application Support/WebIde95 -Library/Preferences/WebIde95 -Library/Application Support/WebIde90 -Library/Preferences/WebIde90 -Library/Application Support/WebIde80 -Library/Preferences/WebIde80 -Library/Application Support/WebIde70 -Library/Preferences/WebIde70 Library/Application Support/WebIde60 +Library/Application Support/WebIde70 +Library/Application Support/WebIde80 +Library/Application Support/WebIde90 +Library/Application Support/WebIde95 +Library/Preferences/com.jetbrains.PhpStorm.plist +Library/Preferences/PhpStorm2016.1 +Library/Preferences/PhpStorm2016.2 +Library/Preferences/PhpStorm2016.3 +Library/Preferences/PhpStorm2017.1 +Library/Preferences/PhpStorm2017.2 +Library/Preferences/PhpStorm2017.3 +Library/Preferences/PhpStorm2018.1 +Library/Preferences/PhpStorm2018.2 +Library/Preferences/PhpStorm2018.3 +Library/Preferences/PhpStorm2019.1 +Library/Preferences/PhpStorm2019.2 +Library/Preferences/WebIde100 Library/Preferences/WebIde60 +Library/Preferences/WebIde70 +Library/Preferences/WebIde80 +Library/Preferences/WebIde90 +Library/Preferences/WebIde95 From 472f5d84dd4d4d25c263004c11b61b14a9d6046c Mon Sep 17 00:00:00 2001 From: Rafael Gil Date: Sat, 10 Aug 2019 19:03:33 -0400 Subject: [PATCH 100/406] Added support for dejal time out (#1406) * - add timeout to test * - added information to changelog and readme * missing newline * move changelog entry under WIP section --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/timeout.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/timeout.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 28a680d65..b0b8d95e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Added support for Dejal Time Out - Add support for PhpStorm 2019.2 ## Mackup 0.8.26 diff --git a/README.md b/README.md index 8307d53d5..ee163c1a0 100644 --- a/README.md +++ b/README.md @@ -539,6 +539,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Textual](http://www.codeux.com/textual/) - [Tig](https://github.com/jonas/tig) - [Tilix](https://github.com/gnunn1/tilix) +- [Timeout](https://www.dejal.com/timeout/) - [tint2](https://code.google.com/p/tint2/) - [TinyFugue](http://tinyfugue.sourceforge.net) - [Tmux](http://tmux.sourceforge.net/) diff --git a/mackup/applications/timeout.cfg b/mackup/applications/timeout.cfg new file mode 100644 index 000000000..095e8575b --- /dev/null +++ b/mackup/applications/timeout.cfg @@ -0,0 +1,5 @@ +[application] +name = TimeOut + +[configuration_files] +Library/Group Containers/6Z7QW53WB6.com.dejal.timeout From c02a0610faa222c606b96532e9f9d214fafd2b78 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 11 Aug 2019 23:49:32 -0700 Subject: [PATCH 101/406] Try pipenv (#1424) * Try pipenv * Run make commands in the pipenv shell * Remove support for python 3.4 Latest requests can't be installed on it, and pip is deprecated on it too: `DEPRECATION: Python 3.4 support has been deprecated. pip 19.1 will be the last one supporting it. Please upgrade your Python as Python 3.4 won't be maintained after March 2019 (cf PEP 429).` * Add black * make black * Removr flake8 * Update CHANGELOG.md --- .circleci/config.yml | 87 ++++--------------- CHANGELOG.md | 2 + Makefile | 4 +- Pipfile | 15 ++++ Pipfile.lock | 190 ++++++++++++++++++++++++++++++++++++++++++ doc/develop.md | 29 +++++++ mackup/application.py | 145 ++++++++++++++++++-------------- mackup/appsdb.py | 67 ++++++++------- mackup/config.py | 111 +++++++++++++----------- mackup/constants.py | 28 +++---- mackup/mackup.py | 29 ++++--- mackup/main.py | 95 ++++++++++----------- mackup/utils.py | 90 ++++++++++---------- requirements.txt | 7 -- setup.py | 46 +++++----- tests/config_tests.py | 166 +++++++++++++++++------------------- tests/main_tests.py | 5 +- tests/utils_test.py | 52 ++++++------ 18 files changed, 686 insertions(+), 482 deletions(-) create mode 100644 Pipfile create mode 100644 Pipfile.lock create mode 100644 doc/develop.md delete mode 100644 requirements.txt diff --git a/.circleci/config.yml b/.circleci/config.yml index 82f015412..30db08861 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,15 +6,7 @@ jobs: - image: python:2.7 steps: - checkout - - run: pip install -r requirements.txt - - run: make test - - nose-3_4: - docker: - - image: python:3.4 - steps: - - checkout - - run: pip install -r requirements.txt + - run: pip install docopt six nose - run: make test nose-3_5: @@ -22,24 +14,27 @@ jobs: - image: python:3.5 steps: - checkout - - run: pip install -r requirements.txt - - run: make test + - run: pip install pipenv + - run: pipenv install -d + - run: pipenv run make test nose-3_6: docker: - image: python:3.6 steps: - checkout - - run: pip install -r requirements.txt - - run: make test + - run: pip install pipenv + - run: pipenv install -d + - run: pipenv run make test nose-3_7: docker: - image: python:3.7 steps: - checkout - - run: pip install -r requirements.txt - - run: make test + - run: pip install pipenv + - run: pipenv install -d + - run: pipenv run make test install-2_7: docker: @@ -49,14 +44,6 @@ jobs: - run: python setup.py install - run: mackup --help - install-3_4: - docker: - - image: python:3.4 - steps: - - checkout - - run: python setup.py install - - run: mackup --help - install-3_5: docker: - image: python:3.5 @@ -81,70 +68,32 @@ jobs: - run: python setup.py install - run: mackup --help - flake8-2_7: - docker: - - image: python:2.7 - steps: - - checkout - - run: pip install flake8 - - run: flake8 - - flake8-3_4: - docker: - - image: python:3.4 - steps: - - checkout - - run: pip install flake8 - - run: flake8 - - flake8-3_5: - docker: - - image: python:3.5 - steps: - - checkout - - run: pip install flake8 - - run: flake8 - - flake8-3_6: - docker: - - image: python:3.6 - steps: - - checkout - - run: pip install flake8 - - run: flake8 - - flake8-3_7: + mdl: docker: - - image: python:3.7 + - image: rsrchboy/mdl steps: - checkout - - run: pip install flake8 - - run: flake8 + - run: mdl . - mdl: + black: docker: - - image: rsrchboy/mdl + - image: python steps: - checkout - - run: mdl . + - run: pip install black + - run: black --check --target-version py27 . workflows: version: 2 mackup: jobs: - nose-2_7 - - nose-3_4 - nose-3_5 - nose-3_6 - nose-3_7 - install-2_7 - - install-3_4 - install-3_5 - install-3_6 - install-3_7 - - flake8-2_7 - - flake8-3_4 - - flake8-3_5 - - flake8-3_6 - - flake8-3_7 - mdl + - black diff --git a/CHANGELOG.md b/CHANGELOG.md index b0b8d95e2..c28210d27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ - Added support for Dejal Time Out - Add support for PhpStorm 2019.2 +- Migrated build system to pipenv +- Replaced flake8 with black to enforce code formatting ## Mackup 0.8.26 diff --git a/Makefile b/Makefile index 09f13bb3b..90c6de65a 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,6 @@ undevelop: lint: # Install mdl with "gem install mdl" mdl . - flake8 test: nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup @@ -19,3 +18,6 @@ clean: release: clean python setup.py sdist twine upload dist/* + +black: + black --target-version py27 . diff --git a/Pipfile b/Pipfile new file mode 100644 index 000000000..000429f63 --- /dev/null +++ b/Pipfile @@ -0,0 +1,15 @@ +[[source]] +name = "pypi" +url = "https://pypi.org/simple" +verify_ssl = true + +[packages] +docopt = "*" +six = "*" + +[dev-packages] +# Black is still a pre-release. Replaced with `brew install black` for now. +# black = "*" +coverage = "*" +nose = "*" +twine = "*" diff --git a/Pipfile.lock b/Pipfile.lock new file mode 100644 index 000000000..c0b5dcdd9 --- /dev/null +++ b/Pipfile.lock @@ -0,0 +1,190 @@ +{ + "_meta": { + "hash": { + "sha256": "b7c480e641440c1617f3beb17e1085abc0bcbbaa937da6f7ffe8fa50f2eeb2b1" + }, + "pipfile-spec": 6, + "requires": {}, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] + }, + "default": { + "docopt": { + "hashes": [ + "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491" + ], + "index": "pypi", + "version": "==0.6.2" + }, + "six": { + "hashes": [ + "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", + "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" + ], + "index": "pypi", + "version": "==1.12.0" + } + }, + "develop": { + "bleach": { + "hashes": [ + "sha256:213336e49e102af26d9cde77dd2d0397afabc5a6bf2fed985dc35b5d1e285a16", + "sha256:3fdf7f77adcf649c9911387df51254b813185e32b2c6619f690b593a617e19fa" + ], + "version": "==3.1.0" + }, + "certifi": { + "hashes": [ + "sha256:046832c04d4e752f37383b628bc601a7ea7211496b4638f6514d0e5b9acc4939", + "sha256:945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695" + ], + "version": "==2019.6.16" + }, + "chardet": { + "hashes": [ + "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae", + "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691" + ], + "version": "==3.0.4" + }, + "coverage": { + "hashes": [ + "sha256:08907593569fe59baca0bf152c43f3863201efb6113ecb38ce7e97ce339805a6", + "sha256:0be0f1ed45fc0c185cfd4ecc19a1d6532d72f86a2bac9de7e24541febad72650", + "sha256:141f08ed3c4b1847015e2cd62ec06d35e67a3ac185c26f7635f4406b90afa9c5", + "sha256:19e4df788a0581238e9390c85a7a09af39c7b539b29f25c89209e6c3e371270d", + "sha256:23cc09ed395b03424d1ae30dcc292615c1372bfba7141eb85e11e50efaa6b351", + "sha256:245388cda02af78276b479f299bbf3783ef0a6a6273037d7c60dc73b8d8d7755", + "sha256:331cb5115673a20fb131dadd22f5bcaf7677ef758741312bee4937d71a14b2ef", + "sha256:386e2e4090f0bc5df274e720105c342263423e77ee8826002dcffe0c9533dbca", + "sha256:3a794ce50daee01c74a494919d5ebdc23d58873747fa0e288318728533a3e1ca", + "sha256:60851187677b24c6085248f0a0b9b98d49cba7ecc7ec60ba6b9d2e5574ac1ee9", + "sha256:63a9a5fc43b58735f65ed63d2cf43508f462dc49857da70b8980ad78d41d52fc", + "sha256:6b62544bb68106e3f00b21c8930e83e584fdca005d4fffd29bb39fb3ffa03cb5", + "sha256:6ba744056423ef8d450cf627289166da65903885272055fb4b5e113137cfa14f", + "sha256:7494b0b0274c5072bddbfd5b4a6c6f18fbbe1ab1d22a41e99cd2d00c8f96ecfe", + "sha256:826f32b9547c8091679ff292a82aca9c7b9650f9fda3e2ca6bf2ac905b7ce888", + "sha256:93715dffbcd0678057f947f496484e906bf9509f5c1c38fc9ba3922893cda5f5", + "sha256:9a334d6c83dfeadae576b4d633a71620d40d1c379129d587faa42ee3e2a85cce", + "sha256:af7ed8a8aa6957aac47b4268631fa1df984643f07ef00acd374e456364b373f5", + "sha256:bf0a7aed7f5521c7ca67febd57db473af4762b9622254291fbcbb8cd0ba5e33e", + "sha256:bf1ef9eb901113a9805287e090452c05547578eaab1b62e4ad456fcc049a9b7e", + "sha256:c0afd27bc0e307a1ffc04ca5ec010a290e49e3afbe841c5cafc5c5a80ecd81c9", + "sha256:dd579709a87092c6dbee09d1b7cfa81831040705ffa12a1b248935274aee0437", + "sha256:df6712284b2e44a065097846488f66840445eb987eb81b3cc6e4149e7b6982e1", + "sha256:e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c", + "sha256:e2ede7c1d45e65e209d6093b762e98e8318ddeff95317d07a27a2140b80cfd24", + "sha256:e4ef9c164eb55123c62411f5936b5c2e521b12356037b6e1c2617cef45523d47", + "sha256:eca2b7343524e7ba246cab8ff00cab47a2d6d54ada3b02772e908a45675722e2", + "sha256:eee64c616adeff7db37cc37da4180a3a5b6177f5c46b187894e633f088fb5b28", + "sha256:ef824cad1f980d27f26166f86856efe11eff9912c4fed97d3804820d43fa550c", + "sha256:efc89291bd5a08855829a3c522df16d856455297cf35ae827a37edac45f466a7", + "sha256:fa964bae817babece5aa2e8c1af841bebb6d0b9add8e637548809d040443fee0", + "sha256:ff37757e068ae606659c28c3bd0d923f9d29a85de79bf25b2b34b148473b5025" + ], + "index": "pypi", + "version": "==4.5.4" + }, + "docutils": { + "hashes": [ + "sha256:6c4f696463b79f1fb8ba0c594b63840ebd41f059e92b31957c46b74a4599b6d0", + "sha256:9e4d7ecfc600058e07ba661411a2b7de2fd0fafa17d1a7f7361cd47b1175c827", + "sha256:a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99" + ], + "version": "==0.15.2" + }, + "idna": { + "hashes": [ + "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", + "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c" + ], + "version": "==2.8" + }, + "nose": { + "hashes": [ + "sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac", + "sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a", + "sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98" + ], + "index": "pypi", + "version": "==1.3.7" + }, + "pkginfo": { + "hashes": [ + "sha256:7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb", + "sha256:a6d9e40ca61ad3ebd0b72fbadd4fba16e4c0e4df0428c041e01e06eb6ee71f32" + ], + "version": "==1.5.0.1" + }, + "pygments": { + "hashes": [ + "sha256:71e430bc85c88a430f000ac1d9b331d2407f681d6f6aec95e8bcfbc3df5b0127", + "sha256:881c4c157e45f30af185c1ffe8d549d48ac9127433f2c380c24b84572ad66297" + ], + "version": "==2.4.2" + }, + "readme-renderer": { + "hashes": [ + "sha256:bb16f55b259f27f75f640acf5e00cf897845a8b3e4731b5c1a436e4b8529202f", + "sha256:c8532b79afc0375a85f10433eca157d6b50f7d6990f337fa498c96cd4bfc203d" + ], + "version": "==24.0" + }, + "requests": { + "hashes": [ + "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4", + "sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31" + ], + "version": "==2.22.0" + }, + "requests-toolbelt": { + "hashes": [ + "sha256:380606e1d10dc85c3bd47bf5a6095f815ec007be7a8b69c878507068df059e6f", + "sha256:968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0" + ], + "version": "==0.9.1" + }, + "six": { + "hashes": [ + "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", + "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" + ], + "index": "pypi", + "version": "==1.12.0" + }, + "tqdm": { + "hashes": [ + "sha256:1dc82f87a8726602fa7177a091b5e8691d6523138a8f7acd08e58088f51e389f", + "sha256:47220a4f2aeebbc74b0ab317584264ea44c745e1fd5ff316b675cd0aff8afad8" + ], + "version": "==4.33.0" + }, + "twine": { + "hashes": [ + "sha256:0fb0bfa3df4f62076cab5def36b1a71a2e4acb4d1fa5c97475b048117b1a6446", + "sha256:d6c29c933ecfc74e9b1d9fa13aa1f87c5d5770e119f5a4ce032092f0ff5b14dc" + ], + "index": "pypi", + "version": "==1.13.0" + }, + "urllib3": { + "hashes": [ + "sha256:b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1", + "sha256:dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232" + ], + "version": "==1.25.3" + }, + "webencodings": { + "hashes": [ + "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78", + "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923" + ], + "version": "==0.5.1" + } + } +} diff --git a/doc/develop.md b/doc/develop.md new file mode 100644 index 000000000..bdfb175b6 --- /dev/null +++ b/doc/develop.md @@ -0,0 +1,29 @@ +# Develop + +```sh +# Install a recent non-system python +brew install python + +# Install pyenv to be able to easily switch Python versions +brew install pyenv + +# Install the package and virtualenv manager +brew install pipenv + +# Install the most recent Python +pyenv install 3.7.4 + +# Setup local dev +cd .../mackup +pyenv local 3.7.4 +pipenv install +pipenv shell +make develop + +# You can now edit files and see the impact of your changes +mackup --version +nosetests + +# Cleanup +make undevelop +``` diff --git a/mackup/application.py b/mackup/application.py index e0a78c3f4..be1726b00 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -40,8 +40,10 @@ def getFilepaths(self, filename): Returns: home_filepath, mackup_filepath (str, str) """ - return (os.path.join(os.environ['HOME'], filename), - os.path.join(self.mackup.mackup_folder, filename)) + return ( + os.path.join(os.environ["HOME"], filename), + os.path.join(self.mackup.mackup_folder, filename), + ) def backup(self): """ @@ -65,19 +67,20 @@ def backup(self): (home_filepath, mackup_filepath) = self.getFilepaths(filename) # If the file exists and is not already a link pointing to Mackup - if ((os.path.isfile(home_filepath) or - os.path.isdir(home_filepath)) and - not (os.path.islink(home_filepath) and - (os.path.isfile(mackup_filepath) or - os.path.isdir(mackup_filepath)) and - os.path.samefile(home_filepath, - mackup_filepath))): + if (os.path.isfile(home_filepath) or os.path.isdir(home_filepath)) and not ( + os.path.islink(home_filepath) + and (os.path.isfile(mackup_filepath) or os.path.isdir(mackup_filepath)) + and os.path.samefile(home_filepath, mackup_filepath) + ): if self.verbose: - print("Backing up\n {}\n to\n {} ..." - .format(home_filepath, mackup_filepath)) + print ( + "Backing up\n {}\n to\n {} ...".format( + home_filepath, mackup_filepath + ) + ) else: - print("Backing up {} ...".format(filename)) + print ("Backing up {} ...".format(filename)) if self.dry_run: continue @@ -87,20 +90,20 @@ def backup(self): # Name it right if os.path.isfile(mackup_filepath): - file_type = 'file' + file_type = "file" elif os.path.isdir(mackup_filepath): - file_type = 'folder' + file_type = "folder" elif os.path.islink(mackup_filepath): - file_type = 'link' + file_type = "link" else: - raise ValueError("Unsupported file: {}" - .format(mackup_filepath)) + raise ValueError("Unsupported file: {}".format(mackup_filepath)) # Ask the user if he really want to replace it - if utils.confirm("A {} named {} already exists in the" - " backup.\nAre you sure that you want to" - " replace it ?" - .format(file_type, mackup_filepath)): + if utils.confirm( + "A {} named {} already exists in the" + " backup.\nAre you sure that you want to" + " replace it ?".format(file_type, mackup_filepath) + ): # Delete the file in Mackup utils.delete(mackup_filepath) # Copy the file @@ -118,16 +121,23 @@ def backup(self): utils.link(mackup_filepath, home_filepath) elif self.verbose: if os.path.exists(home_filepath): - print("Doing nothing\n {}\n " - "is already backed up to\n {}" - .format(home_filepath, mackup_filepath)) + print ( + "Doing nothing\n {}\n " + "is already backed up to\n {}".format( + home_filepath, mackup_filepath + ) + ) elif os.path.islink(home_filepath): - print("Doing nothing\n {}\n " - "is a broken link, you might want to fix it." - .format(home_filepath)) + print ( + "Doing nothing\n {}\n " + "is a broken link, you might want to fix it.".format( + home_filepath + ) + ) else: - print("Doing nothing\n {}\n does not exist" - .format(home_filepath)) + print ( + "Doing nothing\n {}\n does not exist".format(home_filepath) + ) def restore(self): """ @@ -150,20 +160,25 @@ def restore(self): # If the file exists and is not already pointing to the mackup file # and the folder makes sense on the current platform (Don't sync # any subfolder of ~/Library on GNU/Linux) - file_or_dir_exists = (os.path.isfile(mackup_filepath) or - os.path.isdir(mackup_filepath)) - pointing_to_mackup = (os.path.islink(home_filepath) and - os.path.exists(mackup_filepath) and - os.path.samefile(mackup_filepath, - home_filepath)) + file_or_dir_exists = os.path.isfile(mackup_filepath) or os.path.isdir( + mackup_filepath + ) + pointing_to_mackup = ( + os.path.islink(home_filepath) + and os.path.exists(mackup_filepath) + and os.path.samefile(mackup_filepath, home_filepath) + ) supported = utils.can_file_be_synced_on_current_platform(filename) if file_or_dir_exists and not pointing_to_mackup and supported: if self.verbose: - print("Restoring\n linking {}\n to {} ..." - .format(home_filepath, mackup_filepath)) + print ( + "Restoring\n linking {}\n to {} ...".format( + home_filepath, mackup_filepath + ) + ) else: - print("Restoring {} ...".format(filename)) + print ("Restoring {} ...".format(filename)) if self.dry_run: continue @@ -172,34 +187,41 @@ def restore(self): if os.path.exists(home_filepath): # Name it right if os.path.isfile(home_filepath): - file_type = 'file' + file_type = "file" elif os.path.isdir(home_filepath): - file_type = 'folder' + file_type = "folder" elif os.path.islink(home_filepath): - file_type = 'link' + file_type = "link" else: - raise ValueError("Unsupported file: {}" - .format(mackup_filepath)) + raise ValueError("Unsupported file: {}".format(mackup_filepath)) - if utils.confirm("You already have a {} named {} in your" - " home.\nDo you want to replace it with" - " your backup ?" - .format(file_type, filename)): + if utils.confirm( + "You already have a {} named {} in your" + " home.\nDo you want to replace it with" + " your backup ?".format(file_type, filename) + ): utils.delete(home_filepath) utils.link(mackup_filepath, home_filepath) else: utils.link(mackup_filepath, home_filepath) elif self.verbose: if os.path.exists(home_filepath): - print("Doing nothing\n {}\n already linked by\n {}" - .format(mackup_filepath, home_filepath)) + print ( + "Doing nothing\n {}\n already linked by\n {}".format( + mackup_filepath, home_filepath + ) + ) elif os.path.islink(home_filepath): - print("Doing nothing\n {}\n " - "is a broken link, you might want to fix it." - .format(home_filepath)) + print ( + "Doing nothing\n {}\n " + "is a broken link, you might want to fix it.".format( + home_filepath + ) + ) else: - print("Doing nothing\n {}\n does not exist" - .format(mackup_filepath)) + print ( + "Doing nothing\n {}\n does not exist".format(mackup_filepath) + ) def uninstall(self): """ @@ -221,15 +243,17 @@ def uninstall(self): (home_filepath, mackup_filepath) = self.getFilepaths(filename) # If the mackup file exists - if (os.path.isfile(mackup_filepath) or - os.path.isdir(mackup_filepath)): + if os.path.isfile(mackup_filepath) or os.path.isdir(mackup_filepath): # Check if there is a corresponding file in the home folder if os.path.exists(home_filepath): if self.verbose: - print("Reverting {}\n at {} ..." - .format(mackup_filepath, home_filepath)) + print ( + "Reverting {}\n at {} ...".format( + mackup_filepath, home_filepath + ) + ) else: - print("Reverting {} ...".format(filename)) + print ("Reverting {} ...".format(filename)) if self.dry_run: continue @@ -241,5 +265,4 @@ def uninstall(self): # Copy the Dropbox file to the home folder utils.copy(mackup_filepath, home_filepath) elif self.verbose: - print("Doing nothing, {} does not exist" - .format(mackup_filepath)) + print ("Doing nothing, {} does not exist".format(mackup_filepath)) diff --git a/mackup/appsdb.py b/mackup/appsdb.py index 01e881a20..638ff40f4 100644 --- a/mackup/appsdb.py +++ b/mackup/appsdb.py @@ -35,43 +35,44 @@ def __init__(self): # Get the filename without the directory name filename = os.path.basename(config_file) # The app name is the cfg filename with the extension - app_name = filename[:-len('.cfg')] + app_name = filename[: -len(".cfg")] # Start building a dict for this app self.apps[app_name] = dict() # Add the fancy name for the app, for display purpose - app_pretty_name = config.get('application', 'name') - self.apps[app_name]['name'] = app_pretty_name + app_pretty_name = config.get("application", "name") + self.apps[app_name]["name"] = app_pretty_name # Add the configuration files to sync - self.apps[app_name]['configuration_files'] = set() - if config.has_section('configuration_files'): - for path in config.options('configuration_files'): - if path.startswith('/'): - raise ValueError('Unsupported absolute path: {}' - .format(path)) - self.apps[app_name]['configuration_files'].add(path) + self.apps[app_name]["configuration_files"] = set() + if config.has_section("configuration_files"): + for path in config.options("configuration_files"): + if path.startswith("/"): + raise ValueError( + "Unsupported absolute path: {}".format(path) + ) + self.apps[app_name]["configuration_files"].add(path) # Add the XDG configuration files to sync - home = os.path.expanduser('~/') + home = os.path.expanduser("~/") failobj = "{}.config".format(home) - xdg_config_home = os.environ.get('XDG_CONFIG_HOME', failobj) + xdg_config_home = os.environ.get("XDG_CONFIG_HOME", failobj) if not xdg_config_home.startswith(home): - raise ValueError('$XDG_CONFIG_HOME: {} must be ' - 'somewhere within your home ' - 'directory: {}' - .format(xdg_config_home, home)) - if config.has_section('xdg_configuration_files'): - for path in config.options('xdg_configuration_files'): - if path.startswith('/'): - raise ValueError('Unsupported absolute path: ' - '{}' - .format(path)) + raise ValueError( + "$XDG_CONFIG_HOME: {} must be " + "somewhere within your home " + "directory: {}".format(xdg_config_home, home) + ) + if config.has_section("xdg_configuration_files"): + for path in config.options("xdg_configuration_files"): + if path.startswith("/"): + raise ValueError( + "Unsupported absolute path: " "{}".format(path) + ) path = os.path.join(xdg_config_home, path) - path = path.replace(home, '') - (self.apps[app_name]['configuration_files'] - .add(path)) + path = path.replace(home, "") + (self.apps[app_name]["configuration_files"].add(path)) @staticmethod def get_config_files(): @@ -89,9 +90,8 @@ def get_config_files(): set of strings. """ # Configure the config parser - apps_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), - APPS_DIR) - custom_apps_dir = os.path.join(os.environ['HOME'], CUSTOM_APPS_DIR) + apps_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), APPS_DIR) + custom_apps_dir = os.path.join(os.environ["HOME"], CUSTOM_APPS_DIR) # List of stock application config files config_files = set() @@ -102,9 +102,8 @@ def get_config_files(): # Get the list of custom application config files first if os.path.isdir(custom_apps_dir): for filename in os.listdir(custom_apps_dir): - if filename.endswith('.cfg'): - config_files.add(os.path.join(custom_apps_dir, - filename)) + if filename.endswith(".cfg"): + config_files.add(os.path.join(custom_apps_dir, filename)) # Also add it to the set of custom apps, so that we don't # add the stock config for the same app too custom_files.add(filename) @@ -112,7 +111,7 @@ def get_config_files(): # Add the default provided app config files, but only if those are not # customized, as we don't want to overwrite custom app config. for filename in os.listdir(apps_dir): - if filename.endswith('.cfg') and filename not in custom_files: + if filename.endswith(".cfg") and filename not in custom_files: config_files.add(os.path.join(apps_dir, filename)) return config_files @@ -127,7 +126,7 @@ def get_name(self, name): Returns: str """ - return self.apps[name]['name'] + return self.apps[name]["name"] def get_files(self, name): """ @@ -139,7 +138,7 @@ def get_files(self, name): Returns: set of str. """ - return self.apps[name]['configuration_files'] + return self.apps[name]["configuration_files"] def get_app_names(self): """ diff --git a/mackup/config.py b/mackup/config.py index 0b14c792f..f8497e815 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -3,22 +3,27 @@ import os import os.path -from .constants import (CUSTOM_APPS_DIR, - MACKUP_BACKUP_PATH, - MACKUP_CONFIG_FILE, - ENGINE_DROPBOX, - ENGINE_GDRIVE, - ENGINE_COPY, - ENGINE_ICLOUD, - ENGINE_BOX, - ENGINE_FS) - -from .utils import (error, - get_dropbox_folder_location, - get_copy_folder_location, - get_google_drive_folder_location, - get_icloud_folder_location, - get_box_folder_location) +from .constants import ( + CUSTOM_APPS_DIR, + MACKUP_BACKUP_PATH, + MACKUP_CONFIG_FILE, + ENGINE_DROPBOX, + ENGINE_GDRIVE, + ENGINE_COPY, + ENGINE_ICLOUD, + ENGINE_BOX, + ENGINE_FS, +) + +from .utils import ( + error, + get_dropbox_folder_location, + get_copy_folder_location, + get_google_drive_folder_location, + get_icloud_folder_location, + get_box_folder_location, +) + try: import configparser except ImportError: @@ -146,28 +151,29 @@ def _setup_parser(self, filename=None): filename = MACKUP_CONFIG_FILE parser = configparser.SafeConfigParser(allow_no_value=True) - parser.read(os.path.join(os.path.join(os.environ['HOME'], filename))) + parser.read(os.path.join(os.path.join(os.environ["HOME"], filename))) return parser def _warn_on_old_config(self): """Warn the user if an old config format is detected.""" # Is an old setion is in the config file ? - old_sections = ['Allowed Applications', 'Ignored Applications'] + old_sections = ["Allowed Applications", "Ignored Applications"] for old_section in old_sections: if self._parser.has_section(old_section): - error("Old config file detected. Aborting.\n" - "\n" - "An old section (e.g. [Allowed Applications]" - " or [Ignored Applications] has been detected" - " in your {} file.\n" - "I'd rather do nothing than do something you" - " do not want me to do.\n" - "\n" - "Please read the up to date documentation on" - " and migrate" - " your configuration file." - .format(MACKUP_CONFIG_FILE)) + error( + "Old config file detected. Aborting.\n" + "\n" + "An old section (e.g. [Allowed Applications]" + " or [Ignored Applications] has been detected" + " in your {} file.\n" + "I'd rather do nothing than do something you" + " do not want me to do.\n" + "\n" + "Please read the up to date documentation on" + " and migrate" + " your configuration file.".format(MACKUP_CONFIG_FILE) + ) def _parse_engine(self): """ @@ -176,20 +182,22 @@ def _parse_engine(self): Returns: str """ - if self._parser.has_option('storage', 'engine'): - engine = str(self._parser.get('storage', 'engine')) + if self._parser.has_option("storage", "engine"): + engine = str(self._parser.get("storage", "engine")) else: engine = ENGINE_DROPBOX assert isinstance(engine, str) - if engine not in [ENGINE_DROPBOX, - ENGINE_GDRIVE, - ENGINE_COPY, - ENGINE_ICLOUD, - ENGINE_BOX, - ENGINE_FS]: - raise ConfigError('Unknown storage engine: {}'.format(engine)) + if engine not in [ + ENGINE_DROPBOX, + ENGINE_GDRIVE, + ENGINE_COPY, + ENGINE_ICLOUD, + ENGINE_BOX, + ENGINE_FS, + ]: + raise ConfigError("Unknown storage engine: {}".format(engine)) return str(engine) @@ -211,12 +219,14 @@ def _parse_path(self): elif self.engine == ENGINE_BOX: path = get_box_folder_location() elif self.engine == ENGINE_FS: - if self._parser.has_option('storage', 'path'): - cfg_path = self._parser.get('storage', 'path') - path = os.path.join(os.environ['HOME'], cfg_path) + if self._parser.has_option("storage", "path"): + cfg_path = self._parser.get("storage", "path") + path = os.path.join(os.environ["HOME"], cfg_path) else: - raise ConfigError("The required 'path' can't be found while" - " the 'file_system' engine is used.") + raise ConfigError( + "The required 'path' can't be found while" + " the 'file_system' engine is used." + ) return str(path) @@ -227,12 +237,13 @@ def _parse_directory(self): Returns: str """ - if self._parser.has_option('storage', 'directory'): - directory = self._parser.get('storage', 'directory') + if self._parser.has_option("storage", "directory"): + directory = self._parser.get("storage", "directory") # Don't allow CUSTOM_APPS_DIR as a storage directory if directory == CUSTOM_APPS_DIR: - raise ConfigError("{} cannot be used as a storage directory." - .format(CUSTOM_APPS_DIR)) + raise ConfigError( + "{} cannot be used as a storage directory.".format(CUSTOM_APPS_DIR) + ) else: directory = MACKUP_BACKUP_PATH @@ -249,7 +260,7 @@ def _parse_apps_to_ignore(self): apps_to_ignore = set() # Is the "[applications_to_ignore]" in the cfg file ? - section_title = 'applications_to_ignore' + section_title = "applications_to_ignore" if self._parser.has_section(section_title): apps_to_ignore = set(self._parser.options(section_title)) @@ -266,7 +277,7 @@ def _parse_apps_to_sync(self): apps_to_sync = set() # Is the "[applications_to_sync]" section in the cfg file ? - section_title = 'applications_to_sync' + section_title = "applications_to_sync" if self._parser.has_section(section_title): apps_to_sync = set(self._parser.options(section_title)) diff --git a/mackup/constants.py b/mackup/constants.py index 69f7ce788..40f60445c 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,30 +1,30 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.26' +VERSION = "0.8.26" # Support platforms -PLATFORM_DARWIN = 'Darwin' -PLATFORM_LINUX = 'Linux' +PLATFORM_DARWIN = "Darwin" +PLATFORM_LINUX = "Linux" # Directory containing the application configs -APPS_DIR = 'applications' +APPS_DIR = "applications" # Mackup application name -MACKUP_APP_NAME = 'mackup' +MACKUP_APP_NAME = "mackup" # Default Mackup backup path where it stores its files in Dropbox -MACKUP_BACKUP_PATH = 'Mackup' +MACKUP_BACKUP_PATH = "Mackup" # Mackup config file -MACKUP_CONFIG_FILE = '.mackup.cfg' +MACKUP_CONFIG_FILE = ".mackup.cfg" # Directory that can contains user defined app configs -CUSTOM_APPS_DIR = '.mackup' +CUSTOM_APPS_DIR = ".mackup" # Supported engines -ENGINE_BOX = 'box' -ENGINE_COPY = 'copy' -ENGINE_DROPBOX = 'dropbox' -ENGINE_FS = 'file_system' -ENGINE_GDRIVE = 'google_drive' -ENGINE_ICLOUD = 'icloud' +ENGINE_BOX = "box" +ENGINE_COPY = "copy" +ENGINE_DROPBOX = "dropbox" +ENGINE_FS = "file_system" +ENGINE_GDRIVE = "google_drive" +ENGINE_ICLOUD = "icloud" diff --git a/mackup/mackup.py b/mackup/mackup.py index f0d5c1040..4a5300059 100644 --- a/mackup/mackup.py +++ b/mackup/mackup.py @@ -30,13 +30,16 @@ def check_for_usable_environment(self): """Check if the current env is usable and has everything's required.""" # Do not let the user run Mackup as root if os.geteuid() == 0: - utils.error("Running Mackup as a superuser is useless and" - " dangerous. Don't do it!") + utils.error( + "Running Mackup as a superuser is useless and" + " dangerous. Don't do it!" + ) # Do we have a folder to put the Mackup folder ? if not os.path.isdir(self._config.path): - utils.error("Unable to find the storage folder: {}" - .format(self._config.path)) + utils.error( + "Unable to find the storage folder: {}".format(self._config.path) + ) # Is Sublime Text running ? # if is_process_running('Sublime Text'): @@ -55,10 +58,11 @@ def check_for_usable_restore_env(self): self.check_for_usable_environment() if not os.path.isdir(self.mackup_folder): - utils.error("Unable to find the Mackup folder: {}\n" - "You might want to back up some files or get your" - " storage directory synced first." - .format(self.mackup_folder)) + utils.error( + "Unable to find the Mackup folder: {}\n" + "You might want to back up some files or get your" + " storage directory synced first.".format(self.mackup_folder) + ) def clean_temp_folder(self): """Delete the temp folder and files created while running.""" @@ -67,10 +71,11 @@ def clean_temp_folder(self): def create_mackup_home(self): """If the Mackup home folder does not exist, create it.""" if not os.path.isdir(self.mackup_folder): - if utils.confirm("Mackup needs a directory to store your" - " configuration files\n" - "Do you want to create it now? <{}>" - .format(self.mackup_folder)): + if utils.confirm( + "Mackup needs a directory to store your" + " configuration files\n" + "Do you want to create it now? <{}>".format(self.mackup_folder) + ): os.makedirs(self.mackup_folder) else: utils.error("Mackup can't do anything without a home =(") diff --git a/mackup/main.py b/mackup/main.py index fc6428a88..df4de2d05 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -44,9 +44,9 @@ class ColorFormatCodes: - BLUE = '\033[34m' - BOLD = '\033[1m' - NORMAL = '\033[0m' + BLUE = "\033[34m" + BOLD = "\033[1m" + NORMAL = "\033[0m" def header(str): @@ -67,39 +67,35 @@ def main(): def printAppHeader(app_name): if verbose: - print(("\n{0} {1} {0}").format(header("---"), bold(app_name))) + print (("\n{0} {1} {0}").format(header("---"), bold(app_name))) # If we want to answer mackup with "yes" for each question - if args['--force']: + if args["--force"]: utils.FORCE_YES = True - dry_run = args['--dry-run'] + dry_run = args["--dry-run"] - verbose = args['--verbose'] + verbose = args["--verbose"] - if args['backup']: + if args["backup"]: # Check the env where the command is being run mckp.check_for_usable_backup_env() # Backup each application for app_name in sorted(mckp.get_apps_to_backup()): - app = ApplicationProfile(mckp, - app_db.get_files(app_name), - dry_run, - verbose) + app = ApplicationProfile(mckp, app_db.get_files(app_name), dry_run, verbose) printAppHeader(app_name) app.backup() - elif args['restore']: + elif args["restore"]: # Check the env where the command is being run mckp.check_for_usable_restore_env() # Restore the Mackup config before any other config, as we might need # it to know about custom settings - mackup_app = ApplicationProfile(mckp, - app_db.get_files(MACKUP_APP_NAME), - dry_run, - verbose) + mackup_app = ApplicationProfile( + mckp, app_db.get_files(MACKUP_APP_NAME), dry_run, verbose + ) printAppHeader(MACKUP_APP_NAME) mackup_app.restore() @@ -114,23 +110,23 @@ def printAppHeader(app_name): app_names.discard(MACKUP_APP_NAME) for app_name in sorted(app_names): - app = ApplicationProfile(mckp, - app_db.get_files(app_name), - dry_run, - verbose) + app = ApplicationProfile(mckp, app_db.get_files(app_name), dry_run, verbose) printAppHeader(app_name) app.restore() - elif args['uninstall']: + elif args["uninstall"]: # Check the env where the command is being run mckp.check_for_usable_restore_env() if dry_run or ( - utils.confirm("You are going to uninstall Mackup.\n" - "Every configuration file, setting and dotfile" - " managed by Mackup will be unlinked and moved back" - " to their original place, in your home folder.\n" - "Are you sure ?")): + utils.confirm( + "You are going to uninstall Mackup.\n" + "Every configuration file, setting and dotfile" + " managed by Mackup will be unlinked and moved back" + " to their original place, in your home folder.\n" + "Are you sure ?" + ) + ): # Uninstall the apps except Mackup, which we'll uninstall last, to # keep the settings as long as possible @@ -138,19 +134,17 @@ def printAppHeader(app_name): app_names.discard(MACKUP_APP_NAME) for app_name in sorted(app_names): - app = ApplicationProfile(mckp, - app_db.get_files(app_name), - dry_run, - verbose) + app = ApplicationProfile( + mckp, app_db.get_files(app_name), dry_run, verbose + ) printAppHeader(app_name) app.uninstall() # Restore the Mackup config before any other config, as we might # need it to know about custom settings - mackup_app = ApplicationProfile(mckp, - app_db.get_files(MACKUP_APP_NAME), - dry_run, - verbose) + mackup_app = ApplicationProfile( + mckp, app_db.get_files(MACKUP_APP_NAME), dry_run, verbose + ) mackup_app.uninstall() # Delete the Mackup folder in Dropbox @@ -158,34 +152,37 @@ def printAppHeader(app_name): # uninstalled yet # delete(mckp.mackup_folder) - print("\n" - "All your files have been put back into place. You can now" - " safely uninstall Mackup.\n" - "\n" - "Thanks for using Mackup !") + print ( + "\n" + "All your files have been put back into place. You can now" + " safely uninstall Mackup.\n" + "\n" + "Thanks for using Mackup !" + ) - elif args['list']: + elif args["list"]: # Display the list of supported applications mckp.check_for_usable_environment() output = "Supported applications:\n" for app_name in sorted(app_db.get_app_names()): output += " - {}\n".format(app_name) output += "\n" - output += ("{} applications supported in Mackup v{}" - .format(len(app_db.get_app_names()), VERSION)) - print(output) + output += "{} applications supported in Mackup v{}".format( + len(app_db.get_app_names()), VERSION + ) + print (output) - elif args['show']: + elif args["show"]: mckp.check_for_usable_environment() - app_name = args[''] + app_name = args[""] # Make sure the app exists if app_name not in app_db.get_app_names(): sys.exit("Unsupported application: {}".format(app_name)) - print("Name: {}".format(app_db.get_name(app_name))) - print("Configuration files:") + print ("Name: {}".format(app_db.get_name(app_name))) + print ("Configuration files:") for file in app_db.get_files(app_name): - print(" - {}".format(file)) + print (" - {}".format(file)) # Delete the tmp folder mckp.clean_temp_folder() diff --git a/mackup/utils.py b/mackup/utils.py index c3b485aa7..d3ade259d 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -31,12 +31,12 @@ def confirm(question): return True while True: - answer = input(question + ' ').lower() + answer = input(question + " ").lower() - if answer == 'yes' or answer == 'y': + if answer == "yes" or answer == "y": confirmed = True break - if answer == 'no' or answer == 'n': + if answer == "no" or answer == "n": confirmed = False break @@ -185,8 +185,8 @@ def error(message): Args: message(str): The message to display. """ - fail = '\033[91m' - end = '\033[0m' + fail = "\033[91m" + end = "\033[0m" sys.exit(fail + "Error: {}".format(message) + end) @@ -197,9 +197,9 @@ def get_dropbox_folder_location(): Returns: (str) Full path to the current Dropbox folder """ - host_db_path = os.path.join(os.environ['HOME'], '.dropbox/host.db') + host_db_path = os.path.join(os.environ["HOME"], ".dropbox/host.db") try: - with open(host_db_path, 'r') as f_hostdb: + with open(host_db_path, "r") as f_hostdb: data = f_hostdb.read().split() except IOError: error("Unable to find your Dropbox install =(") @@ -215,24 +215,26 @@ def get_google_drive_folder_location(): Returns: (str) Full path to the current Google Drive folder """ - gdrive_db_path = 'Library/Application Support/Google/Drive/sync_config.db' - yosemite_gdrive_db_path = ('Library/Application Support/Google/Drive/' - 'user_default/sync_config.db') - yosemite_gdrive_db = os.path.join(os.environ['HOME'], - yosemite_gdrive_db_path) + gdrive_db_path = "Library/Application Support/Google/Drive/sync_config.db" + yosemite_gdrive_db_path = ( + "Library/Application Support/Google/Drive/" "user_default/sync_config.db" + ) + yosemite_gdrive_db = os.path.join(os.environ["HOME"], yosemite_gdrive_db_path) if os.path.isfile(yosemite_gdrive_db): gdrive_db_path = yosemite_gdrive_db googledrive_home = None - gdrive_db = os.path.join(os.environ['HOME'], gdrive_db_path) + gdrive_db = os.path.join(os.environ["HOME"], gdrive_db_path) if os.path.isfile(gdrive_db): con = sqlite3.connect(gdrive_db) if con: cur = con.cursor() - query = ("SELECT data_value " - "FROM data " - "WHERE entry_key = 'local_sync_root_path';") + query = ( + "SELECT data_value " + "FROM data " + "WHERE entry_key = 'local_sync_root_path';" + ) cur.execute(query) data = cur.fetchone() googledrive_home = str(data[0]) @@ -251,13 +253,12 @@ def get_box_folder_location(): Returns: (str) Full path to the current Box folder """ - box_prefs_path = ('Library/Application Support/Box/Box Sync/' - 'sync_root_folder.txt') + box_prefs_path = "Library/Application Support/Box/Box Sync/" "sync_root_folder.txt" box_home = None - box_prefs = os.path.join(os.environ['HOME'], box_prefs_path) + box_prefs = os.path.join(os.environ["HOME"], box_prefs_path) try: - with open(box_prefs, 'r') as sync_path: + with open(box_prefs, "r") as sync_path: data = sync_path.read() box_home = data except IOError: @@ -273,18 +274,16 @@ def get_copy_folder_location(): Returns: (str) Full path to the current Copy folder """ - copy_settings_path = 'Library/Application Support/Copy Agent/config.db' + copy_settings_path = "Library/Application Support/Copy Agent/config.db" copy_home = None - copy_settings = os.path.join(os.environ['HOME'], copy_settings_path) + copy_settings = os.path.join(os.environ["HOME"], copy_settings_path) if os.path.isfile(copy_settings): database = sqlite3.connect(copy_settings) if database: cur = database.cursor() - query = ("SELECT value " - "FROM config2 " - "WHERE option = 'csmRootPath';") + query = "SELECT value " "FROM config2 " "WHERE option = 'csmRootPath';" cur.execute(query) data = cur.fetchone() copy_home = str(data[0]) @@ -303,12 +302,12 @@ def get_icloud_folder_location(): Returns: (str) Full path to the iCloud Drive folder. """ - yosemite_icloud_path = '~/Library/Mobile Documents/com~apple~CloudDocs/' + yosemite_icloud_path = "~/Library/Mobile Documents/com~apple~CloudDocs/" icloud_home = os.path.expanduser(yosemite_icloud_path) if not os.path.isdir(icloud_home): - error('Unable to find your iCloud Drive =(') + error("Unable to find your iCloud Drive =(") return str(icloud_home) @@ -326,10 +325,9 @@ def is_process_running(process_name): is_running = False # On systems with pgrep, check if the given process is running - if os.path.isfile('/usr/bin/pgrep'): - dev_null = open(os.devnull, 'wb') - returncode = subprocess.call(['/usr/bin/pgrep', process_name], - stdout=dev_null) + if os.path.isfile("/usr/bin/pgrep"): + dev_null = open(os.devnull, "wb") + returncode = subprocess.call(["/usr/bin/pgrep", process_name], stdout=dev_null) is_running = bool(returncode == 0) return is_running @@ -347,12 +345,12 @@ def remove_acl(path): recursively. """ # Some files have ACLs, let's remove them recursively - if (platform.system() == constants.PLATFORM_DARWIN and - os.path.isfile('/bin/chmod')): - subprocess.call(['/bin/chmod', '-R', '-N', path]) - elif ((platform.system() == constants.PLATFORM_LINUX) and - os.path.isfile('/bin/setfacl')): - subprocess.call(['/bin/setfacl', '-R', '-b', path]) + if platform.system() == constants.PLATFORM_DARWIN and os.path.isfile("/bin/chmod"): + subprocess.call(["/bin/chmod", "-R", "-N", path]) + elif (platform.system() == constants.PLATFORM_LINUX) and os.path.isfile( + "/bin/setfacl" + ): + subprocess.call(["/bin/setfacl", "-R", "-b", path]) def remove_immutable_attribute(path): @@ -368,12 +366,14 @@ def remove_immutable_attribute(path): attribute for, recursively. """ # Some files have ACLs, let's remove them recursively - if ((platform.system() == constants.PLATFORM_DARWIN) and - os.path.isfile('/usr/bin/chflags')): - subprocess.call(['/usr/bin/chflags', '-R', 'nouchg', path]) - elif (platform.system() == constants.PLATFORM_LINUX and - os.path.isfile('/usr/bin/chattr')): - subprocess.call(['/usr/bin/chattr', '-R', '-i', path]) + if (platform.system() == constants.PLATFORM_DARWIN) and os.path.isfile( + "/usr/bin/chflags" + ): + subprocess.call(["/usr/bin/chflags", "-R", "nouchg", path]) + elif platform.system() == constants.PLATFORM_LINUX and os.path.isfile( + "/usr/bin/chattr" + ): + subprocess.call(["/usr/bin/chattr", "-R", "-i", path]) def can_file_be_synced_on_current_platform(path): @@ -397,12 +397,12 @@ def can_file_be_synced_on_current_platform(path): can_be_synced = True # If the given path is relative, prepend home - fullpath = os.path.join(os.environ['HOME'], path) + fullpath = os.path.join(os.environ["HOME"], path) # Compute the ~/Library path on OS X # End it with a slash because we are looking for this specific folder and # not any file/folder named LibrarySomething - library_path = os.path.join(os.environ['HOME'], 'Library/') + library_path = os.path.join(os.environ["HOME"], "Library/") if platform.system() == constants.PLATFORM_LINUX: if fullpath.startswith(library_path): diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index e4c375a7e..000000000 --- a/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -# Needed to run the tests -# Run "pip install -r requirements.txt" then "make test" -nose -flake8 -docopt -six -coverage diff --git a/setup.py b/setup.py index cfd89666f..8870e2acb 100644 --- a/setup.py +++ b/setup.py @@ -4,31 +4,29 @@ setup( - name='mackup', + name="mackup", version=VERSION, - author='Laurent Raufaste', - author_email='analogue@glop.org', - url='https://github.com/lra/mackup', - description='Keep your application settings in sync (OS X/Linux)', - keywords='configuration config dotfiles sync backup dropbox gdrive box', - license='GPLv3', - packages=['mackup'], - install_requires=['docopt', 'six'], - entry_points={ - 'console_scripts': [ - 'mackup=mackup.main:main', - ], - }, - package_data={'mackup': ['applications/*.cfg']}, + author="Laurent Raufaste", + author_email="analogue@glop.org", + url="https://github.com/lra/mackup", + description="Keep your application settings in sync (OS X/Linux)", + keywords="configuration config dotfiles sync backup dropbox gdrive box", + license="GPLv3", + packages=["mackup"], + install_requires=["docopt", "six"], + entry_points={"console_scripts": ["mackup=mackup.main:main"]}, + package_data={"mackup": ["applications/*.cfg"]}, classifiers=[ - 'Development Status :: 4 - Beta', - 'Environment :: Console', - 'Intended Audience :: End Users/Desktop', - ('License :: OSI Approved :: ' - 'GNU General Public License v3 or later (GPLv3+)'), - 'Natural Language :: English', - 'Operating System :: POSIX', - 'Programming Language :: Python', - 'Topic :: Utilities', + "Development Status :: 4 - Beta", + "Environment :: Console", + "Intended Audience :: End Users/Desktop", + ( + "License :: OSI Approved :: " + "GNU General Public License v3 or later (GPLv3+)" + ), + "Natural Language :: English", + "Operating System :: POSIX", + "Programming Language :: Python", + "Topic :: Utilities", ], ) diff --git a/tests/config_tests.py b/tests/config_tests.py index dd363c27e..43d9b727f 100644 --- a/tests/config_tests.py +++ b/tests/config_tests.py @@ -1,20 +1,21 @@ import unittest import os.path -from mackup.constants import (ENGINE_DROPBOX, - ENGINE_GDRIVE, - ENGINE_COPY, - ENGINE_ICLOUD, - ENGINE_BOX, - ENGINE_FS) +from mackup.constants import ( + ENGINE_DROPBOX, + ENGINE_GDRIVE, + ENGINE_COPY, + ENGINE_ICLOUD, + ENGINE_BOX, + ENGINE_FS, +) from mackup.config import Config, ConfigError class TestConfig(unittest.TestCase): - def setUp(self): realpath = os.path.dirname(os.path.realpath(__file__)) - os.environ['HOME'] = os.path.join(realpath, 'fixtures') + os.environ["HOME"] = os.path.join(realpath, "fixtures") def test_config_no_config(self): cfg = Config() @@ -24,242 +25,229 @@ def test_config_no_config(self): assert cfg.engine == ENGINE_DROPBOX assert isinstance(cfg.path, str) - print(cfg.path) - assert cfg.path == '/home/some_user/Dropbox' + print (cfg.path) + assert cfg.path == "/home/some_user/Dropbox" assert isinstance(cfg.directory, str) - assert cfg.directory == u'Mackup' + assert cfg.directory == u"Mackup" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath == u'/home/some_user/Dropbox/Mackup' + assert cfg.fullpath == u"/home/some_user/Dropbox/Mackup" assert cfg.apps_to_ignore == set() assert cfg.apps_to_sync == set() def test_config_empty(self): - cfg = Config('mackup-empty.cfg') + cfg = Config("mackup-empty.cfg") assert isinstance(cfg.engine, str) assert cfg.engine == ENGINE_DROPBOX assert isinstance(cfg.path, str) - assert cfg.path == u'/home/some_user/Dropbox' + assert cfg.path == u"/home/some_user/Dropbox" assert isinstance(cfg.directory, str) - assert cfg.directory == u'Mackup' + assert cfg.directory == u"Mackup" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath == u'/home/some_user/Dropbox/Mackup' + assert cfg.fullpath == u"/home/some_user/Dropbox/Mackup" assert cfg.apps_to_ignore == set() assert cfg.apps_to_sync == set() def test_config_engine_dropbox(self): - cfg = Config('mackup-engine-dropbox.cfg') + cfg = Config("mackup-engine-dropbox.cfg") assert isinstance(cfg.engine, str) assert cfg.engine == ENGINE_DROPBOX assert isinstance(cfg.path, str) - assert cfg.path == u'/home/some_user/Dropbox' + assert cfg.path == u"/home/some_user/Dropbox" assert isinstance(cfg.directory, str) - assert cfg.directory == u'some_weirld_name' + assert cfg.directory == u"some_weirld_name" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath == u'/home/some_user/Dropbox/some_weirld_name' + assert cfg.fullpath == u"/home/some_user/Dropbox/some_weirld_name" assert cfg.apps_to_ignore == set() assert cfg.apps_to_sync == set() def test_config_engine_filesystem_absolute(self): - cfg = Config('mackup-engine-file_system-absolute.cfg') + cfg = Config("mackup-engine-file_system-absolute.cfg") assert isinstance(cfg.engine, str) assert cfg.engine == ENGINE_FS assert isinstance(cfg.path, str) - assert cfg.path == u'/some/absolute/folder' + assert cfg.path == u"/some/absolute/folder" assert isinstance(cfg.directory, str) - assert cfg.directory == u'custom_folder' + assert cfg.directory == u"custom_folder" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath == u'/some/absolute/folder/custom_folder' + assert cfg.fullpath == u"/some/absolute/folder/custom_folder" - assert cfg.apps_to_ignore == set(['subversion', 'sequel-pro']) + assert cfg.apps_to_ignore == set(["subversion", "sequel-pro"]) assert cfg.apps_to_sync == set() def test_config_engine_filesystem(self): - cfg = Config('mackup-engine-file_system.cfg') + cfg = Config("mackup-engine-file_system.cfg") assert isinstance(cfg.engine, str) assert cfg.engine == ENGINE_FS assert isinstance(cfg.path, str) - assert cfg.path.endswith(os.path.join(os.environ[u'HOME'], - u'some/relative/folder')) + assert cfg.path.endswith( + os.path.join(os.environ[u"HOME"], u"some/relative/folder") + ) assert isinstance(cfg.directory, str) - assert cfg.directory == u'Mackup' + assert cfg.directory == u"Mackup" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath == os.path.join(os.environ[u'HOME'], - u'some/relative/folder', - u'Mackup') + assert cfg.fullpath == os.path.join( + os.environ[u"HOME"], u"some/relative/folder", u"Mackup" + ) assert cfg.apps_to_ignore == set() - assert cfg.apps_to_sync == set(['sabnzbd', 'sublime-text-3', 'x11']) + assert cfg.apps_to_sync == set(["sabnzbd", "sublime-text-3", "x11"]) def test_config_engine_google_drive(self): - cfg = Config('mackup-engine-google_drive.cfg') + cfg = Config("mackup-engine-google_drive.cfg") assert isinstance(cfg.engine, str) assert cfg.engine == ENGINE_GDRIVE assert isinstance(cfg.path, str) - assert cfg.path == u'/Users/whatever/Google Drive' + assert cfg.path == u"/Users/whatever/Google Drive" assert isinstance(cfg.directory, str) - assert cfg.directory == u'Mackup' + assert cfg.directory == u"Mackup" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath.endswith(u'/Google Drive/Mackup') + assert cfg.fullpath.endswith(u"/Google Drive/Mackup") - assert cfg.apps_to_ignore == set(['subversion', - 'sequel-pro', - 'sabnzbd']) - assert cfg.apps_to_sync == set(['sublime-text-3', 'x11', 'sabnzbd']) + assert cfg.apps_to_ignore == set(["subversion", "sequel-pro", "sabnzbd"]) + assert cfg.apps_to_sync == set(["sublime-text-3", "x11", "sabnzbd"]) def test_config_engine_copy(self): - cfg = Config('mackup-engine-copy.cfg') + cfg = Config("mackup-engine-copy.cfg") assert isinstance(cfg.engine, str) assert cfg.engine == ENGINE_COPY assert isinstance(cfg.path, str) - assert cfg.path == u'/Users/someuser/Copy' + assert cfg.path == u"/Users/someuser/Copy" assert isinstance(cfg.directory, str) - assert cfg.directory == u'Mackup' + assert cfg.directory == u"Mackup" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath.endswith(u'/Copy/Mackup') + assert cfg.fullpath.endswith(u"/Copy/Mackup") - assert cfg.apps_to_ignore == set(['subversion', - 'sequel-pro', - 'sabnzbd']) - assert cfg.apps_to_sync == set(['sublime-text-3', 'x11', 'sabnzbd']) + assert cfg.apps_to_ignore == set(["subversion", "sequel-pro", "sabnzbd"]) + assert cfg.apps_to_sync == set(["sublime-text-3", "x11", "sabnzbd"]) def test_config_engine_icloud(self): - cfg = Config('mackup-engine-icloud.cfg') + cfg = Config("mackup-engine-icloud.cfg") assert isinstance(cfg.engine, str) assert cfg.engine == ENGINE_ICLOUD assert isinstance(cfg.path, str) assert cfg.path == os.path.expanduser( - '~/Library/Mobile Documents/com~apple~CloudDocs/') + "~/Library/Mobile Documents/com~apple~CloudDocs/" + ) assert isinstance(cfg.directory, str) - assert cfg.directory == u'Mackup' + assert cfg.directory == u"Mackup" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath.endswith(u'/com~apple~CloudDocs/Mackup') + assert cfg.fullpath.endswith(u"/com~apple~CloudDocs/Mackup") - assert cfg.apps_to_ignore == set(['subversion', - 'sequel-pro', - 'sabnzbd']) - assert cfg.apps_to_sync == set(['sublime-text-3', 'x11', 'sabnzbd']) + assert cfg.apps_to_ignore == set(["subversion", "sequel-pro", "sabnzbd"]) + assert cfg.apps_to_sync == set(["sublime-text-3", "x11", "sabnzbd"]) def test_config_engine_box(self): - cfg = Config('mackup-engine-box.cfg') + cfg = Config("mackup-engine-box.cfg") assert isinstance(cfg.engine, str) assert cfg.engine == ENGINE_BOX assert isinstance(cfg.path, str) - assert cfg.path == u'/Users/whatever/Box Sync' + assert cfg.path == u"/Users/whatever/Box Sync" assert isinstance(cfg.directory, str) - assert cfg.directory == u'some_weirder_name' + assert cfg.directory == u"some_weirder_name" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath == u'/Users/whatever/Box Sync/some_weirder_name' + assert cfg.fullpath == u"/Users/whatever/Box Sync/some_weirder_name" assert cfg.apps_to_ignore == set() assert cfg.apps_to_sync == set() def test_config_engine_filesystem_no_path(self): with self.assertRaises(ConfigError): - Config('mackup-engine-file_system-no_path.cfg') + Config("mackup-engine-file_system-no_path.cfg") def test_config_engine_unknown(self): with self.assertRaises(ConfigError): - Config('mackup-engine-unknown.cfg') + Config("mackup-engine-unknown.cfg") def test_config_apps_to_ignore(self): - cfg = Config('mackup-apps_to_ignore.cfg') + cfg = Config("mackup-apps_to_ignore.cfg") assert isinstance(cfg.engine, str) assert cfg.engine == ENGINE_DROPBOX assert isinstance(cfg.path, str) - assert cfg.path == '/home/some_user/Dropbox' + assert cfg.path == "/home/some_user/Dropbox" assert isinstance(cfg.directory, str) - assert cfg.directory == u'Mackup' + assert cfg.directory == u"Mackup" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath == u'/home/some_user/Dropbox/Mackup' + assert cfg.fullpath == u"/home/some_user/Dropbox/Mackup" - assert cfg.apps_to_ignore == set(['subversion', - 'sequel-pro', - 'sabnzbd']) + assert cfg.apps_to_ignore == set(["subversion", "sequel-pro", "sabnzbd"]) assert cfg.apps_to_sync == set() def test_config_apps_to_sync(self): - cfg = Config('mackup-apps_to_sync.cfg') + cfg = Config("mackup-apps_to_sync.cfg") assert isinstance(cfg.engine, str) assert cfg.engine == ENGINE_DROPBOX assert isinstance(cfg.path, str) - assert cfg.path == u'/home/some_user/Dropbox' + assert cfg.path == u"/home/some_user/Dropbox" assert isinstance(cfg.directory, str) - assert cfg.directory == u'Mackup' + assert cfg.directory == u"Mackup" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath == u'/home/some_user/Dropbox/Mackup' + assert cfg.fullpath == u"/home/some_user/Dropbox/Mackup" assert cfg.apps_to_ignore == set() - assert cfg.apps_to_sync == set(['sabnzbd', - 'sublime-text-3', - 'x11']) + assert cfg.apps_to_sync == set(["sabnzbd", "sublime-text-3", "x11"]) def test_config_apps_to_ignore_and_sync(self): - cfg = Config('mackup-apps_to_ignore_and_sync.cfg') + cfg = Config("mackup-apps_to_ignore_and_sync.cfg") assert isinstance(cfg.engine, str) assert cfg.engine == ENGINE_DROPBOX assert isinstance(cfg.path, str) - assert cfg.path == u'/home/some_user/Dropbox' + assert cfg.path == u"/home/some_user/Dropbox" assert isinstance(cfg.directory, str) - assert cfg.directory == u'Mackup' + assert cfg.directory == u"Mackup" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath == u'/home/some_user/Dropbox/Mackup' + assert cfg.fullpath == u"/home/some_user/Dropbox/Mackup" - assert cfg.apps_to_ignore == set(['subversion', - 'sequel-pro', - 'sabnzbd']) - assert cfg.apps_to_sync == set(['sabnzbd', - 'sublime-text-3', - 'x11', - 'vim']) + assert cfg.apps_to_ignore == set(["subversion", "sequel-pro", "sabnzbd"]) + assert cfg.apps_to_sync == set(["sabnzbd", "sublime-text-3", "x11", "vim"]) def test_config_old_config(self): - self.assertRaises(SystemExit, Config, 'mackup-old-config.cfg') + self.assertRaises(SystemExit, Config, "mackup-old-config.cfg") diff --git a/tests/main_tests.py b/tests/main_tests.py index 5474cc6de..288443975 100644 --- a/tests/main_tests.py +++ b/tests/main_tests.py @@ -3,9 +3,8 @@ class TestMain(unittest.TestCase): - def test_main_header(self): - assert main.header('blah') == '\033[34mblah\033[0m' + assert main.header("blah") == "\033[34mblah\033[0m" def test_main_bold(self): - assert main.bold('blah') == '\033[1mblah\033[0m' + assert main.bold("blah") == "\033[1mblah\033[0m" diff --git a/tests/utils_test.py b/tests/utils_test.py index d962bd4e4..bcd1622f5 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -16,27 +16,29 @@ def convert_to_octal(file_name): class TestMackup(unittest.TestCase): - def test_confirm_yes(self): # Override the input used in utils def custom_input(_): - return 'Yes' + return "Yes" + utils.input = custom_input - assert utils.confirm('Answer Yes to this question') + assert utils.confirm("Answer Yes to this question") def test_confirm_no(self): # Override the input used in utils def custom_input(_): - return 'No' + return "No" + utils.input = custom_input - assert not utils.confirm('Answer No to this question') + assert not utils.confirm("Answer No to this question") def test_confirm_typo(self): # Override the input used in utils def custom_input(_): - return 'No' + return "No" + utils.input = custom_input - assert not utils.confirm('Answer garbage to this question') + assert not utils.confirm("Answer garbage to this question") def test_delete_file(self): # Create a tmp file @@ -152,10 +154,9 @@ def test_copy_file_to_dir(self): # Set the destination filename srcpath_basename = os.path.basename(srcpath) - dstfile = os.path.join(dstpath, - 'subfolder', - srcpath_basename, - os.path.basename(srcfile)) + dstfile = os.path.join( + dstpath, "subfolder", srcpath_basename, os.path.basename(srcfile) + ) # Make sure the source file and destination folder exist and the # destination file doesn't yet exist assert os.path.isdir(srcpath) @@ -189,9 +190,7 @@ def test_copy_dir(self): # Set the destination filename srcpath_basename = os.path.basename(srcpath) - dstfile = os.path.join(dstpath, - srcpath_basename, - os.path.basename(srcfile)) + dstfile = os.path.join(dstpath, srcpath_basename, os.path.basename(srcfile)) # Make sure the source file and destination folder exist and the # destination file doesn't yet exist assert os.path.isdir(srcpath) @@ -284,28 +283,33 @@ def test_failed_backup_location(self): """ # Hack to make our home folder some temporary folder temp_home = tempfile.mkdtemp() - utils.os.environ['HOME'] = temp_home + utils.os.environ["HOME"] = temp_home # Check for the missing Dropbox folder assert not os.path.exists(os.path.join(temp_home, ".dropbox/host.db")) self.assertRaises(SystemExit, utils.get_dropbox_folder_location) # Check for the missing Google Drive folder - assert not os.path.exists(os.path.join( - temp_home, - "Library/Application Support/Google/Drive/sync_config.db")) + assert not os.path.exists( + os.path.join( + temp_home, "Library/Application Support/Google/Drive/sync_config.db" + ) + ) self.assertRaises(SystemExit, utils.get_google_drive_folder_location) # Check for the missing Box folder - assert not os.path.exists(os.path.join( - temp_home, - "Library/Application Support/Box/Box Sync/sync_root_folder.txt")) + assert not os.path.exists( + os.path.join( + temp_home, + "Library/Application Support/Box/Box Sync/sync_root_folder.txt", + ) + ) self.assertRaises(SystemExit, utils.get_box_folder_location) # Check for the missing Copy Folder - assert not os.path.exists(os.path.join( - temp_home, - "Library/Application Support/Copy Agent/config.db")) + assert not os.path.exists( + os.path.join(temp_home, "Library/Application Support/Copy Agent/config.db") + ) self.assertRaises(SystemExit, utils.get_copy_folder_location) def test_is_process_running(self): From a0822728b57acfc7ff3452af91090f8bfe82c217 Mon Sep 17 00:00:00 2001 From: Chris <7539871+paxperscientiam@users.noreply.github.com> Date: Sun, 25 Aug 2019 18:16:59 -0400 Subject: [PATCH 102/406] feature: support for gimp (#1437) * feature: support for gimp * added possible missing references --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/gimp.cfg | 52 ++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 mackup/applications/gimp.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index c28210d27..b3020861a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Add support for PhpStorm 2019.2 - Migrated build system to pipenv - Replaced flake8 with black to enforce code formatting +- Added partial support for Gimp (via @paxperscientiam) ## Mackup 0.8.26 diff --git a/README.md b/README.md index ee163c1a0..ae2d04776 100644 --- a/README.md +++ b/README.md @@ -290,6 +290,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [GeekTool](http://projects.tynsoe.org/en/geektool/) - [GHCi](https://wiki.haskell.org/GHC/GHCi) - [Ghostwriter](https://wereturtle.github.io/ghostwriter/) +- [Gimp](https://www.gimp.org/) - [Git Hooks](https://github.com/icefox/git-hooks) - [Git](http://git-scm.com/) - [Gitbox](http://gitboxapp.com/) diff --git a/mackup/applications/gimp.cfg b/mackup/applications/gimp.cfg new file mode 100644 index 000000000..f224e5085 --- /dev/null +++ b/mackup/applications/gimp.cfg @@ -0,0 +1,52 @@ +[application] +name = gimp + +[configuration_files] +.gimp/colorrc +.gimp/contextrc +.gimp/controllerrc +.gimp/devicerc +.gimp/dockrc +.gimp/gimprc +.gimp/gtkrc +.gimp/menurc +.gimp/parasiterc +.gimp/pluginrc +.gimp/profilerc +.gimp/sessionrc +.gimp/templaterc +.gimp/themerc +.gimp/toolrc +.gimp/unitrc +Library/Application Support/GIMP/2.8/colorrc +Library/Application Support/GIMP/2.8/contextrc +Library/Application Support/GIMP/2.8/controllerrc +Library/Application Support/GIMP/2.8/devicerc +Library/Application Support/GIMP/2.8/dockrc +Library/Application Support/GIMP/2.8/gimprc +Library/Application Support/GIMP/2.8/gtkrc +Library/Application Support/GIMP/2.8/menurc +Library/Application Support/GIMP/2.8/parasiterc +Library/Application Support/GIMP/2.8/pluginrc +Library/Application Support/GIMP/2.8/profilerc +Library/Application Support/GIMP/2.8/sessionrc +Library/Application Support/GIMP/2.8/templaterc +Library/Application Support/GIMP/2.8/themerc +Library/Application Support/GIMP/2.8/toolrc +Library/Application Support/GIMP/2.8/unitrc +Library/Application Support/GIMP/2.10/colorrc +Library/Application Support/GIMP/2.10/contextrc +Library/Application Support/GIMP/2.10/controllerrc +Library/Application Support/GIMP/2.10/devicerc +Library/Application Support/GIMP/2.10/dockrc +Library/Application Support/GIMP/2.10/gimprc +Library/Application Support/GIMP/2.10/gtkrc +Library/Application Support/GIMP/2.10/menurc +Library/Application Support/GIMP/2.10/parasiterc +Library/Application Support/GIMP/2.10/pluginrc +Library/Application Support/GIMP/2.10/profilerc +Library/Application Support/GIMP/2.10/sessionrc +Library/Application Support/GIMP/2.10/templaterc +Library/Application Support/GIMP/2.10/themerc +Library/Application Support/GIMP/2.10/toolrc +Library/Application Support/GIMP/2.10/unitrc From 8e64538ffed62bd95c8541ebf4994148ac8dbfe9 Mon Sep 17 00:00:00 2001 From: Chris <7539871+paxperscientiam@users.noreply.github.com> Date: Sun, 25 Aug 2019 18:20:56 -0400 Subject: [PATCH 103/406] added support for pnpm (#1435) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/pnpm.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/pnpm.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b3020861a..a3ec00258 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Add support for PhpStorm 2019.2 - Migrated build system to pipenv - Replaced flake8 with black to enforce code formatting +- Added support for pnpm (@via paxperscientiam) - Added partial support for Gimp (via @paxperscientiam) ## Mackup 0.8.26 diff --git a/README.md b/README.md index ae2d04776..f195fba46 100644 --- a/README.md +++ b/README.md @@ -443,6 +443,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [PIP](http://www.pip-installer.org/) - [PixelSnap](https://getpixelsnap.com/) - [PixelSnap 2](https://getpixelsnap.com/) +- [Pnpm](https://pnpm.js.org/) - [Pock](https://pock.pigigaldi.com) - [Poedit](http://poedit.net/) - [PokerStars](https://www.pokerstars.com/) diff --git a/mackup/applications/pnpm.cfg b/mackup/applications/pnpm.cfg new file mode 100644 index 000000000..b64fb2fd1 --- /dev/null +++ b/mackup/applications/pnpm.cfg @@ -0,0 +1,6 @@ +[application] +name = pnpm + +[configuration_files] +.pnpm/global_pnpmfile.js +.pnpm-store/2/store.json From ef5c4fd59115360e662ce8b4fcc819218088d6c6 Mon Sep 17 00:00:00 2001 From: Nero Date: Sun, 25 Aug 2019 23:39:00 +0100 Subject: [PATCH 104/406] add support for datagrip 2019.2 (#1431) There doesent seem to be a new Library/Application Support/ folder for datagrip 2019.2 so i have only added the lib/preferences folder --- mackup/applications/datagrip.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/datagrip.cfg b/mackup/applications/datagrip.cfg index b9b9cbaa0..d2f3441a0 100644 --- a/mackup/applications/datagrip.cfg +++ b/mackup/applications/datagrip.cfg @@ -12,3 +12,4 @@ Library/Application Support/DataGrip2018.3 Library/Preferences/DataGrip2018.3 Library/Application Support/DataGrip2019.1 Library/Preferences/DataGrip2019.1 +Library/Preferences/DataGrip2019.2 From 95a526f51b43b84780a83a3bf7f83a1ad2e07a2e Mon Sep 17 00:00:00 2001 From: Josh Medeski Date: Sun, 25 Aug 2019 17:40:21 -0500 Subject: [PATCH 105/406] Add support for SpaceLauncher (#1430) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/spacelauncher.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/spacelauncher.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index a3ec00258..6d5d28eb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Added support for SpaceLauncher (via @joshmedeski) - Added support for Dejal Time Out - Add support for PhpStorm 2019.2 - Migrated build system to pipenv diff --git a/README.md b/README.md index f195fba46..0fd4e5c2b 100644 --- a/README.md +++ b/README.md @@ -513,6 +513,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Smooth Mouse](http://smoothmouse.com/) - [Soulver](http://www.acqualia.com/soulver/) - [SourceTree](https://www.sourcetreeapp.com/) +- [SpaceLauncher](https://spacelauncherapp.com/) - [Spacemacs](https://github.com/syl20bnr/spacemacs) - [Spark](http://www.shadowlab.org/softwares/spark.php) - [Spectacle](https://www.spectacleapp.com/) diff --git a/mackup/applications/spacelauncher.cfg b/mackup/applications/spacelauncher.cfg new file mode 100644 index 000000000..97519aa9d --- /dev/null +++ b/mackup/applications/spacelauncher.cfg @@ -0,0 +1,5 @@ +[application] +name = SpaceLauncher + +[configuration_files] +Library/Preferences/name.guoc.SpaceLauncher.plist From 7b900583cd6a7cb050e4042e52d64676d405924b Mon Sep 17 00:00:00 2001 From: Manassarn Manoonchai Date: Mon, 26 Aug 2019 05:43:21 +0700 Subject: [PATCH 106/406] Add support for Startupizer2 (#1429) * Add Startupizer2 support * Update readme & changelog * Removing extra newline --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/startupizer2.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/startupizer2.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d5d28eb2..9c455c116 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Add support for PhpStorm 2019.2 - Migrated build system to pipenv - Replaced flake8 with black to enforce code formatting +- Add support for Startupizer2 (via @narze) - Added support for pnpm (@via paxperscientiam) - Added partial support for Gimp (via @paxperscientiam) diff --git a/README.md b/README.md index 0fd4e5c2b..55dc62aa0 100644 --- a/README.md +++ b/README.md @@ -521,6 +521,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Splice](https://splice.com/) - [Spotify Notifications](http://spotify-notifications.citruspi.io/) - [Spotify](https://www.spotify.com/) +- [Startupizer2](http://appledoc.gentlebytes.com/startupizer/) - [Stata](http://www.stata.com/) - [Stay](https://cordlessdog.com/stay/) - [Storyist](http://storyist.com/) diff --git a/mackup/applications/startupizer2.cfg b/mackup/applications/startupizer2.cfg new file mode 100644 index 000000000..cd04c7db0 --- /dev/null +++ b/mackup/applications/startupizer2.cfg @@ -0,0 +1,5 @@ +[application] +name = Startupizer2 + +[configuration_files] +Library/Application Support/Startupizer From 6926130d9805338bbaad7c0caa245c21171f4ab3 Mon Sep 17 00:00:00 2001 From: alekseyp Date: Sun, 25 Aug 2019 18:46:04 -0400 Subject: [PATCH 107/406] Add support for TablePlus (#1426) * Add support for TablePlus * TablePlus * TablePlus --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/tableplus.cfg | 7 +++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/tableplus.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c455c116..933ba1f01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Add support for PhpStorm 2019.2 - Migrated build system to pipenv - Replaced flake8 with black to enforce code formatting +- Add support for TablePlus (via @alekseyp) - Add support for Startupizer2 (via @narze) - Added support for pnpm (@via paxperscientiam) - Added partial support for Gimp (via @paxperscientiam) diff --git a/README.md b/README.md index 55dc62aa0..9111f3cd8 100644 --- a/README.md +++ b/README.md @@ -532,6 +532,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Surge](http://surge.run/manual/) - [Swinsian](http://swinsian.com/) - [T](http://sferik.github.io/t/) +- [TablePlus](https://tableplus.io) - [TaskPaper](http://www.hogbaysoftware.com/products/taskpaper) - [Taskwarrior](http://taskwarrior.org/) - [Teamocil](http://remiprev.github.io/teamocil/) diff --git a/mackup/applications/tableplus.cfg b/mackup/applications/tableplus.cfg new file mode 100644 index 000000000..b35733094 --- /dev/null +++ b/mackup/applications/tableplus.cfg @@ -0,0 +1,7 @@ +[application] +name = TablePlus + +[configuration_files] +Library/Application Support/com.tinyapp.TablePlus/Data +Library/Application Support/com.tinyapp.TablePlus/Plugins +Library/Preferences/com.tinyapp.TablePlus.plist From eace195a9402a315ef3b232690942c96796d8a67 Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Mon, 26 Aug 2019 00:49:28 +0200 Subject: [PATCH 108/406] Add support for ToothFairy scripts (#1428) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/toothfairy.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/toothfairy.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 933ba1f01..584a7bd0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Add support for PhpStorm 2019.2 - Migrated build system to pipenv - Replaced flake8 with black to enforce code formatting +- Add support for ToothFairy scripts (via @dnicolson) - Add support for TablePlus (via @alekseyp) - Add support for Startupizer2 (via @narze) - Added support for pnpm (@via paxperscientiam) diff --git a/README.md b/README.md index 9111f3cd8..d6f34a91b 100644 --- a/README.md +++ b/README.md @@ -551,6 +551,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Tmuxp](https://github.com/tony/tmuxp) - [Tmuxinator](https://github.com/tmuxinator/tmuxinator) - [Todo.txt CLI](http://todotxt.com/) +- [ToothFairy](https://c-command.com/toothfairy/) - [TotalSpaces2](http://totalspaces.binaryage.com/) - [Tower](http://www.git-tower.com/) - [Transmission](http://www.transmissionbt.com/) diff --git a/mackup/applications/toothfairy.cfg b/mackup/applications/toothfairy.cfg new file mode 100644 index 000000000..8afddff75 --- /dev/null +++ b/mackup/applications/toothfairy.cfg @@ -0,0 +1,5 @@ +[application] +name = ToothFairy + +[configuration_files] +Library/Application Scripts/com.robinlu.mac.Tooth-Fairy From 3d49476aa586e2cb4e4ba1bf10e8263ed02bf465 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Aug 2019 15:52:38 -0700 Subject: [PATCH 109/406] QuickActions don't support symlinks (#1438) Fixes #1403 --- mackup/applications/macosx.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/mackup/applications/macosx.cfg b/mackup/applications/macosx.cfg index 516495a12..be006d4f9 100644 --- a/mackup/applications/macosx.cfg +++ b/mackup/applications/macosx.cfg @@ -7,6 +7,5 @@ Library/KeyBindings/DefaultKeyBinding.dict Library/PDF Services Library/Preferences/com.apple.symbolichotkeys.plist Library/Scripts -Library/Services Library/Speech/Speakable Items Library/Workflows From 1be6b6bddbc6652abc80b1e442c47c6294efb378 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Aug 2019 15:56:55 -0700 Subject: [PATCH 110/406] Mackup 0.8.27 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 584a7bd0e..d9348908b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.27 + - Added support for SpaceLauncher (via @joshmedeski) - Added support for Dejal Time Out - Add support for PhpStorm 2019.2 diff --git a/mackup/constants.py b/mackup/constants.py index 40f60445c..f4e7cec41 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = "0.8.26" +VERSION = "0.8.27" # Support platforms PLATFORM_DARWIN = "Darwin" From 23810c49bfd410ae1560fc7cdd18d15730f439f1 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Aug 2019 15:58:26 -0700 Subject: [PATCH 111/406] Add pipenv to make release --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 90c6de65a..7b622e844 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ clean: release: clean python setup.py sdist - twine upload dist/* + pipenv run twine upload dist/* black: black --target-version py27 . From 0c341a1be140828e7097cec6c26853bca0d9ceb3 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Aug 2019 15:59:32 -0700 Subject: [PATCH 112/406] Add pipenv to all Make commands --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7b622e844..1a6c23485 100644 --- a/Makefile +++ b/Makefile @@ -1,22 +1,22 @@ develop: - python setup.py develop + pipenv run python setup.py develop undevelop: - python setup.py develop --uninstall + pipenv run python setup.py develop --uninstall lint: # Install mdl with "gem install mdl" mdl . test: - nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup + pipenv run nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup clean: rm -rf dist/ rm -rf Mackup.egg-info/ release: clean - python setup.py sdist + pipenv run python setup.py sdist pipenv run twine upload dist/* black: From 495eb40421459cee5116f5228abc72f4d5806c27 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Aug 2019 21:29:01 -0700 Subject: [PATCH 113/406] fix master --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 30db08861..963c5ce55 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: steps: - checkout - run: pip install docopt six nose - - run: make test + - run: nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup nose-3_5: docker: @@ -16,7 +16,7 @@ jobs: - checkout - run: pip install pipenv - run: pipenv install -d - - run: pipenv run make test + - run: make test nose-3_6: docker: @@ -25,7 +25,7 @@ jobs: - checkout - run: pip install pipenv - run: pipenv install -d - - run: pipenv run make test + - run: make test nose-3_7: docker: @@ -34,7 +34,7 @@ jobs: - checkout - run: pip install pipenv - run: pipenv install -d - - run: pipenv run make test + - run: make test install-2_7: docker: From 51d3241fb7ea02bd929d1718bbad8d40f729a196 Mon Sep 17 00:00:00 2001 From: Chris <7539871+paxperscientiam@users.noreply.github.com> Date: Mon, 26 Aug 2019 00:30:10 -0400 Subject: [PATCH 114/406] feature: add support for proselint (#1434) * feature: add support for proselint * fix: abide new config prescription --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/proselint.cfg | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 mackup/applications/proselint.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index d9348908b..dea293bd1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Add support for PhpStorm 2019.2 - Migrated build system to pipenv - Replaced flake8 with black to enforce code formatting +- Add support for proselint (via @paxperscienitam) - Add support for ToothFairy scripts (via @dnicolson) - Add support for TablePlus (via @alekseyp) - Add support for Startupizer2 (via @narze) diff --git a/README.md b/README.md index d6f34a91b..f9e0c0ea8 100644 --- a/README.md +++ b/README.md @@ -455,6 +455,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Powerline-shell](https://github.com/b-ryan/powerline-shell) - [Prezto](https://github.com/sorin-ionescu/prezto) - [Processing](https://processing.org/) +- [Proselint](https://github.com/amperser/proselint) - [ProxyChains NG](http://sourceforge.net/projects/proxychains-ng/) - [ProxyChains](http://proxychains.sourceforge.net) - [Punto Switcher](https://punto.yandex.ru/) diff --git a/mackup/applications/proselint.cfg b/mackup/applications/proselint.cfg new file mode 100644 index 000000000..65efb8037 --- /dev/null +++ b/mackup/applications/proselint.cfg @@ -0,0 +1,8 @@ +[application] +name = proselint + +[configuration_files] +.proselintrc + +[xdg_configuration_files] +proselint/config From c250347de49553ef2376505f923c8ac36c4a4f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Hoffs=C3=BCmmer?= Date: Mon, 26 Aug 2019 18:23:13 +0200 Subject: [PATCH 115/406] Add support for Soulver 3 (#1441) --- mackup/applications/soulver.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mackup/applications/soulver.cfg b/mackup/applications/soulver.cfg index 97293f4e8..96b65bf76 100644 --- a/mackup/applications/soulver.cfg +++ b/mackup/applications/soulver.cfg @@ -4,3 +4,6 @@ name = Soulver [configuration_files] Library/Application Support/Soulver Library/Preferences/com.acqualia.soulver.plist +# Soulver 3 +Library/Application Support/Soulver 3 +Library/Preferences/app.soulver.mac.plist From 96289f01434a928eb0a623d83ed84ac02ac5f2f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Hoffs=C3=BCmmer?= Date: Mon, 26 Aug 2019 21:27:24 +0200 Subject: [PATCH 116/406] Add support for latest version of IntelliJ IDEA and PyCharm (#1443) --- mackup/applications/intellijidea.cfg | 4 ++++ mackup/applications/pycharm.cfg | 2 ++ 2 files changed, 6 insertions(+) diff --git a/mackup/applications/intellijidea.cfg b/mackup/applications/intellijidea.cfg index 588ec20a8..66fe98e81 100644 --- a/mackup/applications/intellijidea.cfg +++ b/mackup/applications/intellijidea.cfg @@ -55,3 +55,7 @@ IdeaIC2019.1/config Library/Preferences/IntelliJIdea2019.1 Library/Application Support/IntelliJIdea2019.1 IntelliJIdea2019.1/config +IdeaIC2019.2/config +Library/Preferences/IntelliJIdea2019.2 +Library/Application Support/IntelliJIdea2019.2 +IntelliJIdea2019.2/config diff --git a/mackup/applications/pycharm.cfg b/mackup/applications/pycharm.cfg index edd315e5d..4184f9935 100644 --- a/mackup/applications/pycharm.cfg +++ b/mackup/applications/pycharm.cfg @@ -14,3 +14,5 @@ Library/Application Support/PyCharm2016.1 Library/Application Support/PyCharm2016.2 Library/Preferences/PyCharm2016.1 Library/Preferences/PyCharm2016.2 +Library/Preferences/PyCharm2019.2 +Library/Application Support/PyCharm2019.2 From 3cb6bdf1a3679352feeb1d55c393d6851acc4351 Mon Sep 17 00:00:00 2001 From: Josh Medeski Date: Mon, 26 Aug 2019 20:43:46 -0500 Subject: [PATCH 117/406] Add Bat Application (#1427) * Add Bat Application * Update changelog and readme * Switch to xdg_configuration_file section --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/bat.cfg | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/bat.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index dea293bd1..dd76dcdc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Added support for Bat (via @joshmedeski) + ## Mackup 0.8.27 - Added support for SpaceLauncher (via @joshmedeski) diff --git a/README.md b/README.md index f9e0c0ea8..6e359e757 100644 --- a/README.md +++ b/README.md @@ -191,6 +191,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Bartender](http://www.macbartender.com/) - [Bash it](https://github.com/Bash-it/bash-it) - [Bash](http://www.gnu.org/software/bash/) +- [Bat](https://github.com/sharkdp/bat) - [Bc](https://www.gnu.org/software/bc/) - [Beatport Pro](https://www.beatport.com/desktop) - [BetterSnapTool](http://www.boastr.net/) diff --git a/mackup/applications/bat.cfg b/mackup/applications/bat.cfg new file mode 100644 index 000000000..915e9b915 --- /dev/null +++ b/mackup/applications/bat.cfg @@ -0,0 +1,5 @@ +[application] +name = Bat + +[xdg_configuration_files] +bat/config From b3bf2c93aef55f78e50bf05d4e2491bafe995400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dar=C3=ADo=20Here=C3=B1=C3=BA?= Date: Wed, 18 Sep 2019 00:16:29 -0300 Subject: [PATCH 118/406] Minor proposal on line 06 (#1457) On line 39, maybe: If you choose the `iCloud` storage engine instead, Mackup will figure out where your iCloud is and store your configuration files in it. --- doc/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README.md b/doc/README.md index 05bd4bb4d..e80be8f63 100644 --- a/doc/README.md +++ b/doc/README.md @@ -3,7 +3,7 @@ All the configuration is done in a file named `.mackup.cfg` stored at the root of your home folder. -To configure Mackup, create a file named ´.mackup.cfg´ in your home directory. +To configure Mackup, create a file named `.mackup.cfg` in your home directory. ```bash vi ~/.mackup.cfg From 3f22e2a84282b97bba9ad3ddf5606f2ce3a7b278 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Fri, 1 Nov 2019 11:57:22 -0400 Subject: [PATCH 119/406] Run latest black (#1484) --- mackup/application.py | 28 +++++++++++++--------------- mackup/main.py | 12 ++++++------ tests/config_tests.py | 2 +- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/mackup/application.py b/mackup/application.py index be1726b00..51d319d9c 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -74,13 +74,13 @@ def backup(self): ): if self.verbose: - print ( + print( "Backing up\n {}\n to\n {} ...".format( home_filepath, mackup_filepath ) ) else: - print ("Backing up {} ...".format(filename)) + print("Backing up {} ...".format(filename)) if self.dry_run: continue @@ -121,23 +121,21 @@ def backup(self): utils.link(mackup_filepath, home_filepath) elif self.verbose: if os.path.exists(home_filepath): - print ( + print( "Doing nothing\n {}\n " "is already backed up to\n {}".format( home_filepath, mackup_filepath ) ) elif os.path.islink(home_filepath): - print ( + print( "Doing nothing\n {}\n " "is a broken link, you might want to fix it.".format( home_filepath ) ) else: - print ( - "Doing nothing\n {}\n does not exist".format(home_filepath) - ) + print("Doing nothing\n {}\n does not exist".format(home_filepath)) def restore(self): """ @@ -172,13 +170,13 @@ def restore(self): if file_or_dir_exists and not pointing_to_mackup and supported: if self.verbose: - print ( + print( "Restoring\n linking {}\n to {} ...".format( home_filepath, mackup_filepath ) ) else: - print ("Restoring {} ...".format(filename)) + print("Restoring {} ...".format(filename)) if self.dry_run: continue @@ -206,20 +204,20 @@ def restore(self): utils.link(mackup_filepath, home_filepath) elif self.verbose: if os.path.exists(home_filepath): - print ( + print( "Doing nothing\n {}\n already linked by\n {}".format( mackup_filepath, home_filepath ) ) elif os.path.islink(home_filepath): - print ( + print( "Doing nothing\n {}\n " "is a broken link, you might want to fix it.".format( home_filepath ) ) else: - print ( + print( "Doing nothing\n {}\n does not exist".format(mackup_filepath) ) @@ -247,13 +245,13 @@ def uninstall(self): # Check if there is a corresponding file in the home folder if os.path.exists(home_filepath): if self.verbose: - print ( + print( "Reverting {}\n at {} ...".format( mackup_filepath, home_filepath ) ) else: - print ("Reverting {} ...".format(filename)) + print("Reverting {} ...".format(filename)) if self.dry_run: continue @@ -265,4 +263,4 @@ def uninstall(self): # Copy the Dropbox file to the home folder utils.copy(mackup_filepath, home_filepath) elif self.verbose: - print ("Doing nothing, {} does not exist".format(mackup_filepath)) + print("Doing nothing, {} does not exist".format(mackup_filepath)) diff --git a/mackup/main.py b/mackup/main.py index df4de2d05..bffbd73dc 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -67,7 +67,7 @@ def main(): def printAppHeader(app_name): if verbose: - print (("\n{0} {1} {0}").format(header("---"), bold(app_name))) + print(("\n{0} {1} {0}").format(header("---"), bold(app_name))) # If we want to answer mackup with "yes" for each question if args["--force"]: @@ -152,7 +152,7 @@ def printAppHeader(app_name): # uninstalled yet # delete(mckp.mackup_folder) - print ( + print( "\n" "All your files have been put back into place. You can now" " safely uninstall Mackup.\n" @@ -170,7 +170,7 @@ def printAppHeader(app_name): output += "{} applications supported in Mackup v{}".format( len(app_db.get_app_names()), VERSION ) - print (output) + print(output) elif args["show"]: mckp.check_for_usable_environment() @@ -179,10 +179,10 @@ def printAppHeader(app_name): # Make sure the app exists if app_name not in app_db.get_app_names(): sys.exit("Unsupported application: {}".format(app_name)) - print ("Name: {}".format(app_db.get_name(app_name))) - print ("Configuration files:") + print("Name: {}".format(app_db.get_name(app_name))) + print("Configuration files:") for file in app_db.get_files(app_name): - print (" - {}".format(file)) + print(" - {}".format(file)) # Delete the tmp folder mckp.clean_temp_folder() diff --git a/tests/config_tests.py b/tests/config_tests.py index 43d9b727f..6698376e0 100644 --- a/tests/config_tests.py +++ b/tests/config_tests.py @@ -25,7 +25,7 @@ def test_config_no_config(self): assert cfg.engine == ENGINE_DROPBOX assert isinstance(cfg.path, str) - print (cfg.path) + print(cfg.path) assert cfg.path == "/home/some_user/Dropbox" assert isinstance(cfg.directory, str) From f7b9c129427fbe12d57a58054c71a2a647e0f56c Mon Sep 17 00:00:00 2001 From: Lucas Larson Date: Mon, 4 Nov 2019 10:11:39 -0500 Subject: [PATCH 120/406] Update configuration_merge_guide.md (#1486) Repair link to INSTALL.md --- doc/configuration_merge_guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/configuration_merge_guide.md b/doc/configuration_merge_guide.md index f793e8d49..5e833c34c 100644 --- a/doc/configuration_merge_guide.md +++ b/doc/configuration_merge_guide.md @@ -22,7 +22,7 @@ It will probably save you some pain in the long run. First, pick the app you wish to keep in sync. Then determine which configuration files will be synced for that application by doing the following: -1. [Install Mackup](INSTALL.md) +1. [Install Mackup](./../INSTALL.md) 1. Create a `.mackup.cfg` file in your home directory 1. Add the following two lines to `.mackup.cfg`. Replace **bash** in the example below with the name of your application. From 755095e590deab8f4a2875e36800a021094f683d Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 30 Jan 2020 14:09:38 -0500 Subject: [PATCH 121/406] Update git.cfg (#1518) Add global git attributes --- mackup/applications/git.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/git.cfg b/mackup/applications/git.cfg index 59f6437bd..4bcad4037 100644 --- a/mackup/applications/git.cfg +++ b/mackup/applications/git.cfg @@ -7,3 +7,4 @@ name = Git [xdg_configuration_files] git/config git/ignore +git/attributes From ec9caad276a4302e2f3b16c364907ee074fc967f Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 26 Feb 2020 20:53:22 -0500 Subject: [PATCH 122/406] Upgrade bleach due to security alert (#1528) * Upgrade bleach due to security alert * Remove support for Python 3.5 * Update CHANGELOG.md --- .circleci/config.yml | 19 ------ CHANGELOG.md | 2 + Pipfile.lock | 154 ++++++++++++++++++++++++------------------- 3 files changed, 89 insertions(+), 86 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 963c5ce55..15225830a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,15 +9,6 @@ jobs: - run: pip install docopt six nose - run: nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup - nose-3_5: - docker: - - image: python:3.5 - steps: - - checkout - - run: pip install pipenv - - run: pipenv install -d - - run: make test - nose-3_6: docker: - image: python:3.6 @@ -44,14 +35,6 @@ jobs: - run: python setup.py install - run: mackup --help - install-3_5: - docker: - - image: python:3.5 - steps: - - checkout - - run: python setup.py install - - run: mackup --help - install-3_6: docker: - image: python:3.6 @@ -88,11 +71,9 @@ workflows: mackup: jobs: - nose-2_7 - - nose-3_5 - nose-3_6 - nose-3_7 - install-2_7 - - install-3_5 - install-3_6 - install-3_7 - mdl diff --git a/CHANGELOG.md b/CHANGELOG.md index dd76dcdc9..1aeca6b81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## WIP - Added support for Bat (via @joshmedeski) +- Vulnerability fix +- Removed support for Python 3.5 ## Mackup 0.8.27 diff --git a/Pipfile.lock b/Pipfile.lock index c0b5dcdd9..ac27789f5 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -23,27 +23,27 @@ }, "six": { "hashes": [ - "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", - "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" + "sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a", + "sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c" ], "index": "pypi", - "version": "==1.12.0" + "version": "==1.14.0" } }, "develop": { "bleach": { "hashes": [ - "sha256:213336e49e102af26d9cde77dd2d0397afabc5a6bf2fed985dc35b5d1e285a16", - "sha256:3fdf7f77adcf649c9911387df51254b813185e32b2c6619f690b593a617e19fa" + "sha256:44f69771e2ac81ff30d929d485b7f9919f3ad6d019b6b20c74f3b8687c3f70df", + "sha256:aa8b870d0f46965bac2c073a93444636b0e1ca74e9777e34f03dd494b8a59d48" ], - "version": "==3.1.0" + "version": "==3.1.1" }, "certifi": { "hashes": [ - "sha256:046832c04d4e752f37383b628bc601a7ea7211496b4638f6514d0e5b9acc4939", - "sha256:945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695" + "sha256:017c25db2a153ce562900032d5bc68e9f191e44e9a0f762f373977de9df1fbb3", + "sha256:25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f" ], - "version": "==2019.6.16" + "version": "==2019.11.28" }, "chardet": { "hashes": [ @@ -54,56 +54,69 @@ }, "coverage": { "hashes": [ - "sha256:08907593569fe59baca0bf152c43f3863201efb6113ecb38ce7e97ce339805a6", - "sha256:0be0f1ed45fc0c185cfd4ecc19a1d6532d72f86a2bac9de7e24541febad72650", - "sha256:141f08ed3c4b1847015e2cd62ec06d35e67a3ac185c26f7635f4406b90afa9c5", - "sha256:19e4df788a0581238e9390c85a7a09af39c7b539b29f25c89209e6c3e371270d", - "sha256:23cc09ed395b03424d1ae30dcc292615c1372bfba7141eb85e11e50efaa6b351", - "sha256:245388cda02af78276b479f299bbf3783ef0a6a6273037d7c60dc73b8d8d7755", - "sha256:331cb5115673a20fb131dadd22f5bcaf7677ef758741312bee4937d71a14b2ef", - "sha256:386e2e4090f0bc5df274e720105c342263423e77ee8826002dcffe0c9533dbca", - "sha256:3a794ce50daee01c74a494919d5ebdc23d58873747fa0e288318728533a3e1ca", - "sha256:60851187677b24c6085248f0a0b9b98d49cba7ecc7ec60ba6b9d2e5574ac1ee9", - "sha256:63a9a5fc43b58735f65ed63d2cf43508f462dc49857da70b8980ad78d41d52fc", - "sha256:6b62544bb68106e3f00b21c8930e83e584fdca005d4fffd29bb39fb3ffa03cb5", - "sha256:6ba744056423ef8d450cf627289166da65903885272055fb4b5e113137cfa14f", - "sha256:7494b0b0274c5072bddbfd5b4a6c6f18fbbe1ab1d22a41e99cd2d00c8f96ecfe", - "sha256:826f32b9547c8091679ff292a82aca9c7b9650f9fda3e2ca6bf2ac905b7ce888", - "sha256:93715dffbcd0678057f947f496484e906bf9509f5c1c38fc9ba3922893cda5f5", - "sha256:9a334d6c83dfeadae576b4d633a71620d40d1c379129d587faa42ee3e2a85cce", - "sha256:af7ed8a8aa6957aac47b4268631fa1df984643f07ef00acd374e456364b373f5", - "sha256:bf0a7aed7f5521c7ca67febd57db473af4762b9622254291fbcbb8cd0ba5e33e", - "sha256:bf1ef9eb901113a9805287e090452c05547578eaab1b62e4ad456fcc049a9b7e", - "sha256:c0afd27bc0e307a1ffc04ca5ec010a290e49e3afbe841c5cafc5c5a80ecd81c9", - "sha256:dd579709a87092c6dbee09d1b7cfa81831040705ffa12a1b248935274aee0437", - "sha256:df6712284b2e44a065097846488f66840445eb987eb81b3cc6e4149e7b6982e1", - "sha256:e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c", - "sha256:e2ede7c1d45e65e209d6093b762e98e8318ddeff95317d07a27a2140b80cfd24", - "sha256:e4ef9c164eb55123c62411f5936b5c2e521b12356037b6e1c2617cef45523d47", - "sha256:eca2b7343524e7ba246cab8ff00cab47a2d6d54ada3b02772e908a45675722e2", - "sha256:eee64c616adeff7db37cc37da4180a3a5b6177f5c46b187894e633f088fb5b28", - "sha256:ef824cad1f980d27f26166f86856efe11eff9912c4fed97d3804820d43fa550c", - "sha256:efc89291bd5a08855829a3c522df16d856455297cf35ae827a37edac45f466a7", - "sha256:fa964bae817babece5aa2e8c1af841bebb6d0b9add8e637548809d040443fee0", - "sha256:ff37757e068ae606659c28c3bd0d923f9d29a85de79bf25b2b34b148473b5025" + "sha256:15cf13a6896048d6d947bf7d222f36e4809ab926894beb748fc9caa14605d9c3", + "sha256:1daa3eceed220f9fdb80d5ff950dd95112cd27f70d004c7918ca6dfc6c47054c", + "sha256:1e44a022500d944d42f94df76727ba3fc0a5c0b672c358b61067abb88caee7a0", + "sha256:25dbf1110d70bab68a74b4b9d74f30e99b177cde3388e07cc7272f2168bd1477", + "sha256:3230d1003eec018ad4a472d254991e34241e0bbd513e97a29727c7c2f637bd2a", + "sha256:3dbb72eaeea5763676a1a1efd9b427a048c97c39ed92e13336e726117d0b72bf", + "sha256:5012d3b8d5a500834783689a5d2292fe06ec75dc86ee1ccdad04b6f5bf231691", + "sha256:51bc7710b13a2ae0c726f69756cf7ffd4362f4ac36546e243136187cfcc8aa73", + "sha256:527b4f316e6bf7755082a783726da20671a0cc388b786a64417780b90565b987", + "sha256:722e4557c8039aad9592c6a4213db75da08c2cd9945320220634f637251c3894", + "sha256:76e2057e8ffba5472fd28a3a010431fd9e928885ff480cb278877c6e9943cc2e", + "sha256:77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef", + "sha256:7afad9835e7a651d3551eab18cbc0fdb888f0a6136169fbef0662d9cdc9987cf", + "sha256:9bea19ac2f08672636350f203db89382121c9c2ade85d945953ef3c8cf9d2a68", + "sha256:a8b8ac7876bc3598e43e2603f772d2353d9931709345ad6c1149009fd1bc81b8", + "sha256:b0840b45187699affd4c6588286d429cd79a99d509fe3de0f209594669bb0954", + "sha256:b26aaf69713e5674efbde4d728fb7124e429c9466aeaf5f4a7e9e699b12c9fe2", + "sha256:b63dd43f455ba878e5e9f80ba4f748c0a2156dde6e0e6e690310e24d6e8caf40", + "sha256:be18f4ae5a9e46edae3f329de2191747966a34a3d93046dbdf897319923923bc", + "sha256:c312e57847db2526bc92b9bfa78266bfbaabac3fdcd751df4d062cd4c23e46dc", + "sha256:c60097190fe9dc2b329a0eb03393e2e0829156a589bd732e70794c0dd804258e", + "sha256:c62a2143e1313944bf4a5ab34fd3b4be15367a02e9478b0ce800cb510e3bbb9d", + "sha256:cc1109f54a14d940b8512ee9f1c3975c181bbb200306c6d8b87d93376538782f", + "sha256:cd60f507c125ac0ad83f05803063bed27e50fa903b9c2cfee3f8a6867ca600fc", + "sha256:d513cc3db248e566e07a0da99c230aca3556d9b09ed02f420664e2da97eac301", + "sha256:d649dc0bcace6fcdb446ae02b98798a856593b19b637c1b9af8edadf2b150bea", + "sha256:d7008a6796095a79544f4da1ee49418901961c97ca9e9d44904205ff7d6aa8cb", + "sha256:da93027835164b8223e8e5af2cf902a4c80ed93cb0909417234f4a9df3bcd9af", + "sha256:e69215621707119c6baf99bda014a45b999d37602cb7043d943c76a59b05bf52", + "sha256:ea9525e0fef2de9208250d6c5aeeee0138921057cd67fcef90fbed49c4d62d37", + "sha256:fca1669d464f0c9831fd10be2eef6b86f5ebd76c724d1e0706ebdff86bb4adf0" ], "index": "pypi", - "version": "==4.5.4" + "version": "==5.0.3" }, "docutils": { "hashes": [ - "sha256:6c4f696463b79f1fb8ba0c594b63840ebd41f059e92b31957c46b74a4599b6d0", - "sha256:9e4d7ecfc600058e07ba661411a2b7de2fd0fafa17d1a7f7361cd47b1175c827", - "sha256:a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99" + "sha256:0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af", + "sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc" ], - "version": "==0.15.2" + "version": "==0.16" }, "idna": { "hashes": [ - "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", - "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c" + "sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb", + "sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa" ], - "version": "==2.8" + "version": "==2.9" + }, + "importlib-metadata": { + "hashes": [ + "sha256:06f5b3a99029c7134207dd882428a66992a9de2bef7c2b699b5641f9886c3302", + "sha256:b97607a1a18a5100839aec1dc26a1ea17ee0d93b20b0f008d80a5a050afb200b" + ], + "markers": "python_version < '3.8'", + "version": "==1.5.0" + }, + "keyring": { + "hashes": [ + "sha256:1f393f7466314068961c7e1d508120c092bd71fa54e3d93b76180b526d4abc56", + "sha256:24ae23ab2d6adc59138339e56843e33ec7b0a6b2f06302662477085c6c0aca00" + ], + "version": "==21.1.0" }, "nose": { "hashes": [ @@ -123,10 +136,10 @@ }, "pygments": { "hashes": [ - "sha256:71e430bc85c88a430f000ac1d9b331d2407f681d6f6aec95e8bcfbc3df5b0127", - "sha256:881c4c157e45f30af185c1ffe8d549d48ac9127433f2c380c24b84572ad66297" + "sha256:2a3fe295e54a20164a9df49c75fa58526d3be48e14aceba6d6b1e8ac0bfd6f1b", + "sha256:98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe" ], - "version": "==2.4.2" + "version": "==2.5.2" }, "readme-renderer": { "hashes": [ @@ -137,10 +150,10 @@ }, "requests": { "hashes": [ - "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4", - "sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31" + "sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee", + "sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6" ], - "version": "==2.22.0" + "version": "==2.23.0" }, "requests-toolbelt": { "hashes": [ @@ -151,33 +164,33 @@ }, "six": { "hashes": [ - "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", - "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" + "sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a", + "sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c" ], "index": "pypi", - "version": "==1.12.0" + "version": "==1.14.0" }, "tqdm": { "hashes": [ - "sha256:1dc82f87a8726602fa7177a091b5e8691d6523138a8f7acd08e58088f51e389f", - "sha256:47220a4f2aeebbc74b0ab317584264ea44c745e1fd5ff316b675cd0aff8afad8" + "sha256:0d8b5afb66e23d80433102e9bd8b5c8b65d34c2a2255b2de58d97bd2ea8170fd", + "sha256:f35fb121bafa030bd94e74fcfd44f3c2830039a2ddef7fc87ef1c2d205237b24" ], - "version": "==4.33.0" + "version": "==4.43.0" }, "twine": { "hashes": [ - "sha256:0fb0bfa3df4f62076cab5def36b1a71a2e4acb4d1fa5c97475b048117b1a6446", - "sha256:d6c29c933ecfc74e9b1d9fa13aa1f87c5d5770e119f5a4ce032092f0ff5b14dc" + "sha256:c1af8ca391e43b0a06bbc155f7f67db0bf0d19d284bfc88d1675da497a946124", + "sha256:d561a5e511f70275e5a485a6275ff61851c16ffcb3a95a602189161112d9f160" ], "index": "pypi", - "version": "==1.13.0" + "version": "==3.1.1" }, "urllib3": { "hashes": [ - "sha256:b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1", - "sha256:dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232" + "sha256:2f3db8b19923a873b3e5256dc9c2dedfa883e33d87c690d9c7913e1f40673cdc", + "sha256:87716c2d2a7121198ebcb7ce7cccf6ce5e9ba539041cfbaeecfb641dc0bf6acc" ], - "version": "==1.25.3" + "version": "==1.25.8" }, "webencodings": { "hashes": [ @@ -185,6 +198,13 @@ "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923" ], "version": "==0.5.1" + }, + "zipp": { + "hashes": [ + "sha256:12248a63bbdf7548f89cb4c7cda4681e537031eda29c02ea29674bc6854460c2", + "sha256:7c0f8e91abc0dc07a5068f315c52cb30c66bfbc581e5b50704c8a2f6ebae794a" + ], + "version": "==3.0.0" } } } From 261014714366e69ed85ffd59d5fd64f6f79ddbde Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 26 Feb 2020 20:54:01 -0500 Subject: [PATCH 123/406] Document `XDG_CONFIG_HOME` (#1529) --- doc/README.md | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/doc/README.md b/doc/README.md index e80be8f63..71258b92c 100644 --- a/doc/README.md +++ b/doc/README.md @@ -227,3 +227,46 @@ You can add and test an application by following these steps: - if everything works as expected: - run `make undevelop` to revert to the official version - commit and push the change to your fork and then create the Pulls Request + +### Add support for an application using the XDG directory + +For application storing their configuration under the `~/.config` folder, you +should not hardcode it. The `.config` folder is the default location but it can +be named differently on other users' systems by setting the `XDG_CONFIG_HOME` +environment variable. + +See + +Mackup supports this mechanism and provide a dedicated `xdg_configuration_files` +section for those applications. + +If any path starts with `.config`, remove the `.config` part and move the path +to a dedicated `xdg_configuration_files` section. + +Instead of: + +```ini +[application] +name = Git + +[configuration_files] +.gitconfig +.config/git/config +.config/git/ignore +.config/git/attributes +``` + +Use this: + +```ini +[application] +name = Git + +[configuration_files] +.gitconfig + +[xdg_configuration_files] +git/config +git/ignore +git/attributes +``` From e4e29f617e11e733767976bb6c51881853b18bc1 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 26 Feb 2020 21:06:41 -0500 Subject: [PATCH 124/406] Removed support for the Box storage (#1530) Fixes #807 --- CHANGELOG.md | 1 + README.md | 6 +++++- mackup/config.py | 8 +------- mackup/constants.py | 1 - mackup/utils.py | 21 --------------------- tests/config_tests.py | 19 ------------------- tests/fixtures/mackup-engine-box.cfg | 3 --- tests/utils_test.py | 11 +---------- 8 files changed, 8 insertions(+), 62 deletions(-) delete mode 100644 tests/fixtures/mackup-engine-box.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 1aeca6b81..4909b6c2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Added support for Bat (via @joshmedeski) - Vulnerability fix - Removed support for Python 3.5 +- Removed support for the Box storage ## Mackup 0.8.27 diff --git a/README.md b/README.md index 6e359e757..1b603c83b 100644 --- a/README.md +++ b/README.md @@ -150,11 +150,15 @@ in it stay put, so that any other computer also running Mackup is unaffected. - [Google Drive](https://drive.google.com/) - [Copy](https://www.copy.com/) - [iCloud](http://www.apple.com/icloud/) -- [Box](https://www.box.com) - Anything able to sync a folder (e.g. [Git](http://git-scm.com/)) See the [README](doc/README.md) file in the doc directory for more info. +## Unsupported Storages + +- [Box](https://www.box.com): No longer supported is it ignores dotfiles, see + . + ## Supported Applications - [1Password 4](https://agilebits.com/onepassword) diff --git a/mackup/config.py b/mackup/config.py index f8497e815..ebcf48daa 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -11,7 +11,6 @@ ENGINE_GDRIVE, ENGINE_COPY, ENGINE_ICLOUD, - ENGINE_BOX, ENGINE_FS, ) @@ -21,7 +20,6 @@ get_copy_folder_location, get_google_drive_folder_location, get_icloud_folder_location, - get_box_folder_location, ) try: @@ -70,8 +68,7 @@ def engine(self): """ The engine used by the storage. - ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_COPY, ENGINE_ICLOUD, ENGINE_BOX - or ENGINE_FS. + ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_COPY, ENGINE_ICLOUD or ENGINE_FS. Returns: str @@ -194,7 +191,6 @@ def _parse_engine(self): ENGINE_GDRIVE, ENGINE_COPY, ENGINE_ICLOUD, - ENGINE_BOX, ENGINE_FS, ]: raise ConfigError("Unknown storage engine: {}".format(engine)) @@ -216,8 +212,6 @@ def _parse_path(self): path = get_copy_folder_location() elif self.engine == ENGINE_ICLOUD: path = get_icloud_folder_location() - elif self.engine == ENGINE_BOX: - path = get_box_folder_location() elif self.engine == ENGINE_FS: if self._parser.has_option("storage", "path"): cfg_path = self._parser.get("storage", "path") diff --git a/mackup/constants.py b/mackup/constants.py index f4e7cec41..bcad0513e 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -22,7 +22,6 @@ CUSTOM_APPS_DIR = ".mackup" # Supported engines -ENGINE_BOX = "box" ENGINE_COPY = "copy" ENGINE_DROPBOX = "dropbox" ENGINE_FS = "file_system" diff --git a/mackup/utils.py b/mackup/utils.py index d3ade259d..69e86747c 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -246,27 +246,6 @@ def get_google_drive_folder_location(): return googledrive_home -def get_box_folder_location(): - """ - Try to locate the Box folder. - - Returns: - (str) Full path to the current Box folder - """ - box_prefs_path = "Library/Application Support/Box/Box Sync/" "sync_root_folder.txt" - box_home = None - - box_prefs = os.path.join(os.environ["HOME"], box_prefs_path) - try: - with open(box_prefs, "r") as sync_path: - data = sync_path.read() - box_home = data - except IOError: - error("Unable to find your Box prefs =(") - - return box_home - - def get_copy_folder_location(): """ Try to locate the Copy folder. diff --git a/tests/config_tests.py b/tests/config_tests.py index 6698376e0..6f5bab59d 100644 --- a/tests/config_tests.py +++ b/tests/config_tests.py @@ -6,7 +6,6 @@ ENGINE_GDRIVE, ENGINE_COPY, ENGINE_ICLOUD, - ENGINE_BOX, ENGINE_FS, ) from mackup.config import Config, ConfigError @@ -169,24 +168,6 @@ def test_config_engine_icloud(self): assert cfg.apps_to_ignore == set(["subversion", "sequel-pro", "sabnzbd"]) assert cfg.apps_to_sync == set(["sublime-text-3", "x11", "sabnzbd"]) - def test_config_engine_box(self): - cfg = Config("mackup-engine-box.cfg") - - assert isinstance(cfg.engine, str) - assert cfg.engine == ENGINE_BOX - - assert isinstance(cfg.path, str) - assert cfg.path == u"/Users/whatever/Box Sync" - - assert isinstance(cfg.directory, str) - assert cfg.directory == u"some_weirder_name" - - assert isinstance(cfg.fullpath, str) - assert cfg.fullpath == u"/Users/whatever/Box Sync/some_weirder_name" - - assert cfg.apps_to_ignore == set() - assert cfg.apps_to_sync == set() - def test_config_engine_filesystem_no_path(self): with self.assertRaises(ConfigError): Config("mackup-engine-file_system-no_path.cfg") diff --git a/tests/fixtures/mackup-engine-box.cfg b/tests/fixtures/mackup-engine-box.cfg deleted file mode 100644 index c4b3aa5e6..000000000 --- a/tests/fixtures/mackup-engine-box.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[storage] -engine = box -directory = some_weirder_name diff --git a/tests/utils_test.py b/tests/utils_test.py index bcd1622f5..36b76e2f4 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -279,7 +279,7 @@ def test_error(self): def test_failed_backup_location(self): """ Tests for the error that should occur if the backup folder cannot be - found for Dropbox, Google, Box and Copy + found for Dropbox, Google, and Copy """ # Hack to make our home folder some temporary folder temp_home = tempfile.mkdtemp() @@ -297,15 +297,6 @@ def test_failed_backup_location(self): ) self.assertRaises(SystemExit, utils.get_google_drive_folder_location) - # Check for the missing Box folder - assert not os.path.exists( - os.path.join( - temp_home, - "Library/Application Support/Box/Box Sync/sync_root_folder.txt", - ) - ) - self.assertRaises(SystemExit, utils.get_box_folder_location) - # Check for the missing Copy Folder assert not os.path.exists( os.path.join(temp_home, "Library/Application Support/Copy Agent/config.db") From 72ca9af76d1b351db4755ff10efee20816cab611 Mon Sep 17 00:00:00 2001 From: Petr Bouchal Date: Thu, 27 Feb 2020 03:13:10 +0100 Subject: [PATCH 125/406] update support for RStudio to handle JSON conf file (#1522) * update support for RStudio to handle JSON conf file * Freedesktop standard Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/rstudio.cfg | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4909b6c2d..38527cffc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Added support for Bat (via @joshmedeski) +- Updated support for RStudio, config stored in JSON as of v1.3.776 (via @petrbouchal) - Vulnerability fix - Removed support for Python 3.5 - Removed support for the Box storage diff --git a/mackup/applications/rstudio.cfg b/mackup/applications/rstudio.cfg index 4f9102fc6..e4a338ed9 100644 --- a/mackup/applications/rstudio.cfg +++ b/mackup/applications/rstudio.cfg @@ -4,3 +4,6 @@ name = RStudio [configuration_files] .rstudio-desktop Library/Preferences/org.rstudio.RStudio.plist + +[xdg_configuration_files] +rstudio From 9d61e7d24808eadada9caa3b2b14c39d7e66fd0c Mon Sep 17 00:00:00 2001 From: Ivan Ha Date: Thu, 27 Feb 2020 10:56:48 +0800 Subject: [PATCH 126/406] feat: add support for NoSQLBooster for MongoDB (#1516) * feat: add support for NoSQLBooster for MongoDB * Update CHANGELOG.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/nosqlbooster-for-mongodb.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/nosqlbooster-for-mongodb.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 38527cffc..ad1b9b09d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Added support for Bat (via @joshmedeski) +- Added support for NoSQLBooster for MongoDB (via @ivan-ha) - Updated support for RStudio, config stored in JSON as of v1.3.776 (via @petrbouchal) - Vulnerability fix - Removed support for Python 3.5 diff --git a/README.md b/README.md index 1b603c83b..1cdecd760 100644 --- a/README.md +++ b/README.md @@ -421,6 +421,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [newsbeuter](http://newsbeuter.org/) - [ngrok](https://ngrok.com/) - [Nomacs](http://nomacs.org/) +- [NoSQLBooster for MongoDB](https://www.nosqlbooster.com/) - [npm](https://www.npmjs.com/) - [nvALT](http://brettterpstra.com/projects/nvalt/) - [nvpy](https://github.com/cpbotha/nvpy) diff --git a/mackup/applications/nosqlbooster-for-mongodb.cfg b/mackup/applications/nosqlbooster-for-mongodb.cfg new file mode 100644 index 000000000..bb138e0be --- /dev/null +++ b/mackup/applications/nosqlbooster-for-mongodb.cfg @@ -0,0 +1,5 @@ +[application] +name = NoSQLBooster for MongoDB + +[configuration_files] +Documents/NoSQLBooster From bbe5d9f3f97490edb7f8f5689f113212adb3a887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=81uczy=C5=84ski?= Date: Thu, 27 Feb 2020 04:06:33 +0100 Subject: [PATCH 127/406] chattr: suppress some errors (#1040) * chattr: suppress errors Before this change, remove_immutable_attribute prints errors in case of symlink ("Operation not supported while reading flags") * Update CHANGELOG.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/utils.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad1b9b09d..673475676 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Vulnerability fix - Removed support for Python 3.5 - Removed support for the Box storage +- Fix: suppress errors when handling symlinks (via @doubleloop) ## Mackup 0.8.27 diff --git a/mackup/utils.py b/mackup/utils.py index 69e86747c..61d49eefe 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -352,7 +352,7 @@ def remove_immutable_attribute(path): elif platform.system() == constants.PLATFORM_LINUX and os.path.isfile( "/usr/bin/chattr" ): - subprocess.call(["/usr/bin/chattr", "-R", "-i", path]) + subprocess.call(["/usr/bin/chattr", "-R", "-f", "-i", path]) def can_file_be_synced_on_current_platform(path): From abe13100960da24ba973ea34447bdda168f1ca13 Mon Sep 17 00:00:00 2001 From: mol91 <33281173+mol91@users.noreply.github.com> Date: Thu, 27 Feb 2020 04:08:01 +0100 Subject: [PATCH 128/406] Add PyCharm CE Linux support (#1514) --- mackup/applications/pycharm.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/pycharm.cfg b/mackup/applications/pycharm.cfg index 4184f9935..513b3b652 100644 --- a/mackup/applications/pycharm.cfg +++ b/mackup/applications/pycharm.cfg @@ -16,3 +16,4 @@ Library/Preferences/PyCharm2016.1 Library/Preferences/PyCharm2016.2 Library/Preferences/PyCharm2019.2 Library/Application Support/PyCharm2019.2 +.PyCharmCE2019.3/config From fc338966ab8ba4e4826933800d3058c322b07579 Mon Sep 17 00:00:00 2001 From: mol91 <33281173+mol91@users.noreply.github.com> Date: Thu, 27 Feb 2020 04:08:45 +0100 Subject: [PATCH 129/406] Linux support for PhpStorm config (#1512) --- mackup/applications/phpstorm.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg index c491c2ea6..6d32ccb4c 100644 --- a/mackup/applications/phpstorm.cfg +++ b/mackup/applications/phpstorm.cfg @@ -37,3 +37,15 @@ Library/Preferences/WebIde70 Library/Preferences/WebIde80 Library/Preferences/WebIde90 Library/Preferences/WebIde95 +.PhpStorm2016.1/config +.PhpStorm2016.2/config +.PhpStorm2016.3/config +.PhpStorm2017.1/config +.PhpStorm2017.2/config +.PhpStorm2017.3/config +.PhpStorm2018.1/config +.PhpStorm2018.2/config +.PhpStorm2018.3/config +.PhpStorm2019.1/config +.PhpStorm2019.2/config +.PhpStorm2019.3/config From 2717fe69cb8a60cdcbf79a3f8f65771166526de5 Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Thu, 27 Feb 2020 04:13:28 +0100 Subject: [PATCH 130/406] Add support for rclone (#1461) * Add support for rclone * Update rclone.cfg * Update README.md * Update README.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/rclone.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/rclone.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 673475676..2b5325df7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Added support for Bat (via @joshmedeski) +- Added support for rclone (via @dnicolson) - Added support for NoSQLBooster for MongoDB (via @ivan-ha) - Updated support for RStudio, config stored in JSON as of v1.3.776 (via @petrbouchal) - Vulnerability fix diff --git a/README.md b/README.md index 1cdecd760..231f5e1ce 100644 --- a/README.md +++ b/README.md @@ -474,6 +474,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [R](http://www.r-project.org/) - [Rails](http://rubyonrails.org/) - [Ranger](https://ranger.github.io/) +- [Rclone](https://rclone.org/) - [Redshift Scheduler](https://github.com/spantaleev/redshift-scheduler) - [Redshift](http://jonls.dk/redshift/) - [Rhythmbox](https://wiki.gnome.org/Apps/Rhythmbox) diff --git a/mackup/applications/rclone.cfg b/mackup/applications/rclone.cfg new file mode 100644 index 000000000..e87038cad --- /dev/null +++ b/mackup/applications/rclone.cfg @@ -0,0 +1,5 @@ +[application] +name = rclone + +[xdg_configuration_files] +rclone From 031ae1f316f104c2bf41469469cab281a277a23d Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Thu, 27 Feb 2020 04:19:52 +0100 Subject: [PATCH 131/406] Add support for Bump config (#1455) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/bump.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/bump.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b5325df7..705d6b4d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Added support for Bat (via @joshmedeski) +- Added support for Bump (via @dnicolson) - Added support for rclone (via @dnicolson) - Added support for NoSQLBooster for MongoDB (via @ivan-ha) - Updated support for RStudio, config stored in JSON as of v1.3.776 (via @petrbouchal) diff --git a/README.md b/README.md index 231f5e1ce..d34cc68f2 100644 --- a/README.md +++ b/README.md @@ -208,6 +208,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Boto](https://github.com/boto/boto) - [Boxer](http://boxerapp.com) - [Brackets](http://brackets.io/) +- [Bump](https://github.com/fabiospampinato/bump) - [Bundler](http://bundler.io) - [Byobu](http://byobu.co/) - [Caffeine](http://lightheadsw.com/caffeine/) diff --git a/mackup/applications/bump.cfg b/mackup/applications/bump.cfg new file mode 100644 index 000000000..620fdda19 --- /dev/null +++ b/mackup/applications/bump.cfg @@ -0,0 +1,5 @@ +[application] +name = Bump + +[configuration_files] +.bump.json From e5c6198c2b69af65b1f93da221cf8c7981f96af2 Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Thu, 27 Feb 2020 04:25:06 +0100 Subject: [PATCH 132/406] Add ripgrep (#1460) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/ripgrep.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/ripgrep.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 705d6b4d7..d4916561b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Added support for Bat (via @joshmedeski) +- Added support for ripgrep (via @dnicolson) - Added support for Bump (via @dnicolson) - Added support for rclone (via @dnicolson) - Added support for NoSQLBooster for MongoDB (via @ivan-ha) diff --git a/README.md b/README.md index d34cc68f2..6e4504e77 100644 --- a/README.md +++ b/README.md @@ -480,6 +480,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Redshift](http://jonls.dk/redshift/) - [Rhythmbox](https://wiki.gnome.org/Apps/Rhythmbox) - [Rime](http://rime.im/) +- [ripgrep](https://github.com/BurntSushi/ripgrep) - [Robomongo](http://robomongo.org/) - [Rofi](https://github.com/DaveDavenport/rofi) - [Royal TSX](http://www.royaltsx.com/ts/osx/features) diff --git a/mackup/applications/ripgrep.cfg b/mackup/applications/ripgrep.cfg new file mode 100644 index 000000000..0c70519d7 --- /dev/null +++ b/mackup/applications/ripgrep.cfg @@ -0,0 +1,5 @@ +[application] +name = ripgrep + +[configuration_files] +.ripgreprc From 03c652605f87d288acbda1e470ecb803af8b3927 Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Thu, 27 Feb 2020 04:29:05 +0100 Subject: [PATCH 133/406] Add support for JS Beautifier (#1462) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/jsbeautifier.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/jsbeautifier.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index d4916561b..61c955526 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Added support for Bat (via @joshmedeski) +- Added support for JS Beautifier (via @dnicolson) - Added support for ripgrep (via @dnicolson) - Added support for Bump (via @dnicolson) - Added support for rclone (via @dnicolson) diff --git a/README.md b/README.md index 6e4504e77..119c922ee 100644 --- a/README.md +++ b/README.md @@ -347,6 +347,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Janus](https://github.com/carlhuda/janus) - [Jitouch](http://www.jitouch.com/) - [jrnl](http://maebert.github.io/jrnl/) +- [JS Beautifier](https://github.com/beautify-web/js-beautify) - [JSHint](http://jshint.com/) - [Julia](http://julialang.org) - [Jumpcut](http://jumpcut.sourceforge.net/) diff --git a/mackup/applications/jsbeautifier.cfg b/mackup/applications/jsbeautifier.cfg new file mode 100644 index 000000000..52b1ac9c8 --- /dev/null +++ b/mackup/applications/jsbeautifier.cfg @@ -0,0 +1,5 @@ +[application] +name = JS Beautifier + +[configuration_files] +.jsbeautifyrc From 631f3fa9d59a58bc73cdba611eb38306be295889 Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Thu, 27 Feb 2020 04:32:54 +0100 Subject: [PATCH 134/406] Add support for BitBar (#1477) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/bitbar.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/bitbar.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 61c955526..bd510419b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Added support for Bat (via @joshmedeski) +- Added support for BitBar (via @dnicolson) - Added support for JS Beautifier (via @dnicolson) - Added support for ripgrep (via @dnicolson) - Added support for Bump (via @dnicolson) diff --git a/README.md b/README.md index 119c922ee..6678e5aee 100644 --- a/README.md +++ b/README.md @@ -202,6 +202,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [BetterTouchTool](http://www.boastr.net/) - [BibDesk](http://bibdesk.sourceforge.net/) - [Billings Pro Server Admin](https://www.marketcircle.com/billingspro/download/billingspro-server/) +- [BitBar](https://getbitbar.com/) - [Bitchx](http://www.bitchx.org/) - [Blackfire](https://blackfire.io/) - [Blender](https://blender.org/) diff --git a/mackup/applications/bitbar.cfg b/mackup/applications/bitbar.cfg new file mode 100644 index 000000000..7d5dc22f1 --- /dev/null +++ b/mackup/applications/bitbar.cfg @@ -0,0 +1,5 @@ +[application] +name = BitBar + +[configuration_files] +Library/Preferences/com.matryer.BitBar.plist From 3ca0844f5c12fa7df67d0fcc9170ab8080d35dcb Mon Sep 17 00:00:00 2001 From: Arvind Chembarpu Date: Thu, 27 Feb 2020 04:36:36 +0100 Subject: [PATCH 135/406] Add support for Rectangle (#1513) * Add support for Rectangle As per https://github.com/rxhanson/Rectangle/issues/25, Rectangle stores config at ~/Library/Preferences/com.knollsoft.Rectangle.plist. * Add paperwork * Update README.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/Rectangle.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/Rectangle.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index bd510419b..586029f0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Added support for Bat (via @joshmedeski) +- Added support for Rectangle (via @arvindch) - Added support for BitBar (via @dnicolson) - Added support for JS Beautifier (via @dnicolson) - Added support for ripgrep (via @dnicolson) diff --git a/README.md b/README.md index 6678e5aee..a90f90197 100644 --- a/README.md +++ b/README.md @@ -478,6 +478,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Rails](http://rubyonrails.org/) - [Ranger](https://ranger.github.io/) - [Rclone](https://rclone.org/) +- [Rectangle](https://rectangleapp.com/) - [Redshift Scheduler](https://github.com/spantaleev/redshift-scheduler) - [Redshift](http://jonls.dk/redshift/) - [Rhythmbox](https://wiki.gnome.org/Apps/Rhythmbox) diff --git a/mackup/applications/Rectangle.cfg b/mackup/applications/Rectangle.cfg new file mode 100644 index 000000000..8d7e3a068 --- /dev/null +++ b/mackup/applications/Rectangle.cfg @@ -0,0 +1,5 @@ +[application] +name = Rectangle + +[configuration_files] +Library/Preferences/com.knollsoft.Rectangle.plist From 17d7eec5292bebbdd2bd83f5373aeec501501a02 Mon Sep 17 00:00:00 2001 From: Stefan Bauer Date: Thu, 27 Feb 2020 04:45:33 +0100 Subject: [PATCH 136/406] Add PhpStorm 2019.3 and 2019.4 (#1507) --- mackup/applications/phpstorm.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg index 6d32ccb4c..2913e82d6 100644 --- a/mackup/applications/phpstorm.cfg +++ b/mackup/applications/phpstorm.cfg @@ -13,6 +13,8 @@ Library/Application Support/PhpStorm2018.2 Library/Application Support/PhpStorm2018.3 Library/Application Support/PhpStorm2019.1 Library/Application Support/PhpStorm2019.2 +Library/Application Support/PhpStorm2019.3 +Library/Application Support/PhpStorm2019.4 Library/Application Support/WebIde100 Library/Application Support/WebIde60 Library/Application Support/WebIde70 @@ -31,6 +33,8 @@ Library/Preferences/PhpStorm2018.2 Library/Preferences/PhpStorm2018.3 Library/Preferences/PhpStorm2019.1 Library/Preferences/PhpStorm2019.2 +Library/Preferences/PhpStorm2019.3 +Library/Preferences/PhpStorm2019.4 Library/Preferences/WebIde100 Library/Preferences/WebIde60 Library/Preferences/WebIde70 From ea7f03088318dab14f06193dc927d176be8d9948 Mon Sep 17 00:00:00 2001 From: Zhizhen He Date: Thu, 27 Feb 2020 11:50:09 +0800 Subject: [PATCH 137/406] Add config.yml for cheat (#1506) * Add config.yml for cheat * Update cheat.cfg Co-authored-by: Laurent Raufaste --- mackup/applications/cheat.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mackup/applications/cheat.cfg b/mackup/applications/cheat.cfg index cb9c714d9..feed69b31 100644 --- a/mackup/applications/cheat.cfg +++ b/mackup/applications/cheat.cfg @@ -3,3 +3,6 @@ name = Cheat [configuration_files] .cheat + +[xdg_configuration_files] +cheat/conf.yml From 40b2fb3261470d146c8a44605bfad3a41f72f880 Mon Sep 17 00:00:00 2001 From: Petr Bouchal Date: Thu, 27 Feb 2020 04:53:16 +0100 Subject: [PATCH 138/406] Update support for marta 0.6.1 (#1505) * update marta config for marta 0.6.1 * update CHANGELOG * Update marta.cfg Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/marta.cfg | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 586029f0d..1704c34fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Added support for Bat (via @joshmedeski) +- Updated support for Marta to capture new config files in 0.6.1 (via @petrbouchal) - Added support for Rectangle (via @arvindch) - Added support for BitBar (via @dnicolson) - Added support for JS Beautifier (via @dnicolson) diff --git a/mackup/applications/marta.cfg b/mackup/applications/marta.cfg index dda9fb916..e437ba057 100644 --- a/mackup/applications/marta.cfg +++ b/mackup/applications/marta.cfg @@ -4,3 +4,5 @@ name = Marta [configuration_files] Library/Application Support/org.yanex.marta/conf.json Library/Application Support/org.yanex.marta/favorites.json +Library/Application Support/org.yanex.marta/conf.marco +Library/Application Support/org.yanex.marta/favorites.marco From 476501c43cfbb8b92c81d51c5861771653163289 Mon Sep 17 00:00:00 2001 From: "Ryotaro \"Justin\" Miura" <1560508+ryoppippi@users.noreply.github.com> Date: Thu, 27 Feb 2020 13:09:12 +0900 Subject: [PATCH 139/406] Update pycharm.cfg (#1501) Co-authored-by: Laurent Raufaste --- mackup/applications/pycharm.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/pycharm.cfg b/mackup/applications/pycharm.cfg index 513b3b652..89cb6c967 100644 --- a/mackup/applications/pycharm.cfg +++ b/mackup/applications/pycharm.cfg @@ -15,5 +15,7 @@ Library/Application Support/PyCharm2016.2 Library/Preferences/PyCharm2016.1 Library/Preferences/PyCharm2016.2 Library/Preferences/PyCharm2019.2 +Library/Preferences/PyCharm2019.3 Library/Application Support/PyCharm2019.2 +Library/Application Support/PyCharm2019.3 .PyCharmCE2019.3/config From 13c0ee239b37b03b7aa47116ea3a216074984438 Mon Sep 17 00:00:00 2001 From: Bryce Carr Date: Thu, 27 Feb 2020 15:19:36 +1100 Subject: [PATCH 140/406] Add support for WebStorm 2019 and (hopefully) WebStorm 2020 (#1476) * Add support for WebStorm 2019.1 and 2019.2 * Mention WebStorm 2019.1 & 2019.2 in CHANGELOG.md * Add support for 2019.3, as well as maybe 2020.x Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/webstorm.cfg | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1704c34fc..93afe753b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Added support for Bat (via @joshmedeski) +- Added support for newer versions of WebStorm - Updated support for Marta to capture new config files in 0.6.1 (via @petrbouchal) - Added support for Rectangle (via @arvindch) - Added support for BitBar (via @dnicolson) diff --git a/mackup/applications/webstorm.cfg b/mackup/applications/webstorm.cfg index a17c2bf04..ce6f5e18e 100644 --- a/mackup/applications/webstorm.cfg +++ b/mackup/applications/webstorm.cfg @@ -28,3 +28,15 @@ Library/Application Support/WebStorm2018.2 Library/Preferences/WebStorm2018.2 Library/Application Support/WebStorm2018.3 Library/Preferences/WebStorm2018.3 +Library/Application Support/WebStorm2019.1 +Library/Preferences/WebStorm2019.1 +Library/Application Support/WebStorm2019.2 +Library/Preferences/WebStorm2019.2 +Library/Application Support/WebStorm2019.3 +Library/Preferences/WebStorm2019.3 +Library/Application Support/WebStorm2020.1 +Library/Preferences/WebStorm2020.1 +Library/Application Support/WebStorm2020.2 +Library/Preferences/WebStorm2020.2 +Library/Application Support/WebStorm2020.3 +Library/Preferences/WebStorm2020.3 From be314bb56a83c84ffce1298f3925bda953a793fa Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 26 Feb 2020 23:55:01 -0500 Subject: [PATCH 141/406] Migrate all configs to XDG (#1532) * Migrate all configs to XDG * Update CHANGELOG.md --- CHANGELOG.md | 1 + mackup/applications/alacritty.cfg | 4 +++- mackup/applications/audacious.cfg | 12 ++++++------ mackup/applications/autokey.cfg | 4 ++-- mackup/applications/b-ryan_powerline-shell.cfg | 4 ++-- mackup/applications/blender.cfg | 4 +++- mackup/applications/cerebro.cfg | 6 +++--- mackup/applications/consular.cfg | 4 +++- mackup/applications/copyq.cfg | 4 ++-- mackup/applications/deepin-dde-dock.cfg | 4 ++-- mackup/applications/deepin-dde-file-manager.cfg | 4 ++-- mackup/applications/deepin-terminal.cfg | 4 ++-- mackup/applications/devilspie2.cfg | 4 ++-- mackup/applications/doublecmd.cfg | 10 +++++----- mackup/applications/filezilla.cfg | 8 +++++--- mackup/applications/fish.cfg | 12 ++++++------ mackup/applications/fisher.cfg | 4 ++-- mackup/applications/flexget.cfg | 4 +++- mackup/applications/fontconfig.cfg | 4 ++-- mackup/applications/franz.cfg | 4 ++-- mackup/applications/ghostwriter.cfg | 4 ++-- mackup/applications/goshare.cfg | 4 ++-- mackup/applications/hexchat.cfg | 4 ++-- mackup/applications/htop.cfg | 4 +++- mackup/applications/hub.cfg | 4 ++-- mackup/applications/i3.cfg | 4 +++- mackup/applications/inkscape.cfg | 4 ++-- mackup/applications/insomnia.cfg | 4 +++- mackup/applications/karabiner-elements.cfg | 4 ++-- mackup/applications/kdenlive.cfg | 5 +++-- mackup/applications/keepassx.cfg | 4 +++- mackup/applications/kitty.cfg | 4 ++-- mackup/applications/libreoffice.cfg | 4 ++-- mackup/applications/liquidprompt.cfg | 4 +++- mackup/applications/livestreamer.cfg | 6 ++++-- mackup/applications/micro.cfg | 10 +++++----- mackup/applications/mps-youtube.cfg | 6 +++--- mackup/applications/mpv.cfg | 12 +++++++----- mackup/applications/musicbrainz-picard.cfg | 4 ++-- mackup/applications/neovim.cfg | 4 +++- mackup/applications/nomacs.cfg | 4 ++-- mackup/applications/oh-my-fish.cfg | 4 ++-- mackup/applications/openbox.cfg | 10 +++++----- mackup/applications/qutebrowser.cfg | 6 ++++-- mackup/applications/ranger.cfg | 12 ++++++------ mackup/applications/redshift-scheduler.cfg | 4 ++-- mackup/applications/redshift.cfg | 4 ++-- mackup/applications/rime.cfg | 16 ++++++++-------- mackup/applications/robomongo.cfg | 4 ++-- mackup/applications/rofi.cfg | 4 ++-- mackup/applications/sublime-text-2.cfg | 4 +++- mackup/applications/sublime-text-3.cfg | 4 +++- mackup/applications/terminator.cfg | 4 ++-- mackup/applications/tint2.cfg | 4 ++-- mackup/applications/transmission.cfg | 8 +++++--- mackup/applications/typora.cfg | 4 +++- mackup/applications/ulauncher.cfg | 8 ++++---- mackup/applications/verdaccio.cfg | 4 ++-- mackup/applications/vscode-insiders.cfg | 8 ++++---- mackup/applications/vscode-oss.cfg | 8 ++++---- mackup/applications/vscode.cfg | 8 ++++---- mackup/applications/vscodium.cfg | 8 ++++---- mackup/applications/wireshark.cfg | 4 ++-- mackup/applications/zathura.cfg | 4 ++-- 64 files changed, 195 insertions(+), 157 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93afe753b..4b61664a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Removed support for Python 3.5 - Removed support for the Box storage - Fix: suppress errors when handling symlinks (via @doubleloop) +- Migrated all config files to the XDG format ## Mackup 0.8.27 diff --git a/mackup/applications/alacritty.cfg b/mackup/applications/alacritty.cfg index 5247613f1..d0709ce6f 100644 --- a/mackup/applications/alacritty.cfg +++ b/mackup/applications/alacritty.cfg @@ -2,5 +2,7 @@ name = Alacritty [configuration_files] -.config/alacritty/alacritty.yml .alacritty.yml + +[xdg_configuration_files] +alacritty/alacritty.yml diff --git a/mackup/applications/audacious.cfg b/mackup/applications/audacious.cfg index 092f5e56e..ef5adc25b 100644 --- a/mackup/applications/audacious.cfg +++ b/mackup/applications/audacious.cfg @@ -1,9 +1,9 @@ [application] name = Audacious -[configuration_files] -.config/audacious/config -.config/audacious/plugin-registry -.config/audacious/playlists -.config/audacious/playlist-state -.config/audacious/scrobbler.log +[xdg_configuration_files] +audacious/config +audacious/plugin-registry +audacious/playlists +audacious/playlist-state +audacious/scrobbler.log diff --git a/mackup/applications/autokey.cfg b/mackup/applications/autokey.cfg index 3a9fc61f6..0454fd33b 100644 --- a/mackup/applications/autokey.cfg +++ b/mackup/applications/autokey.cfg @@ -1,5 +1,5 @@ [application] name = Autokey -[configuration_files] -.config/autokey +[xdg_configuration_files] +autokey diff --git a/mackup/applications/b-ryan_powerline-shell.cfg b/mackup/applications/b-ryan_powerline-shell.cfg index 54130db16..222f32bc7 100644 --- a/mackup/applications/b-ryan_powerline-shell.cfg +++ b/mackup/applications/b-ryan_powerline-shell.cfg @@ -1,5 +1,5 @@ [application] name = Powerline Shell Prompt -[configuration_files] -.config/powerline-shell/config.json +[xdg_configuration_files] +powerline-shell/config.json diff --git a/mackup/applications/blender.cfg b/mackup/applications/blender.cfg index 0b00531ab..6ce8ff132 100644 --- a/mackup/applications/blender.cfg +++ b/mackup/applications/blender.cfg @@ -3,4 +3,6 @@ name = Blender [configuration_files] Library/Application Support/Blender -.config/blender + +[xdg_configuration_files] +blender diff --git a/mackup/applications/cerebro.cfg b/mackup/applications/cerebro.cfg index 8bc90d0a9..1d12314a5 100644 --- a/mackup/applications/cerebro.cfg +++ b/mackup/applications/cerebro.cfg @@ -5,6 +5,6 @@ name = Cerebro Library/Application Support/Cerebro/config.json Library/Application Support/Cerebro/plugins -# Linux Files -.config/Cerebro/config.json -.config/Cerebro/plugins +[xdg_configuration_files] +Cerebro/config.json +Cerebro/plugins diff --git a/mackup/applications/consular.cfg b/mackup/applications/consular.cfg index cc0a3290c..bda4245d5 100644 --- a/mackup/applications/consular.cfg +++ b/mackup/applications/consular.cfg @@ -2,5 +2,7 @@ name = Consular [configuration_files] -.config/consular .consularc + +[xdg_configuration_files] +consular diff --git a/mackup/applications/copyq.cfg b/mackup/applications/copyq.cfg index 05b5530d4..efb8ee2ed 100644 --- a/mackup/applications/copyq.cfg +++ b/mackup/applications/copyq.cfg @@ -1,5 +1,5 @@ [application] name = CopyQ -[configuration_files] -.config/copyq +[xdg_configuration_files] +copyq diff --git a/mackup/applications/deepin-dde-dock.cfg b/mackup/applications/deepin-dde-dock.cfg index 8e0c3a341..13d3660ef 100644 --- a/mackup/applications/deepin-dde-dock.cfg +++ b/mackup/applications/deepin-dde-dock.cfg @@ -1,5 +1,5 @@ [application] name = deepin-dde-dock -[configuration_files] -.config/deepin/dde-dock.conf +[xdg_configuration_files] +deepin/dde-dock.conf diff --git a/mackup/applications/deepin-dde-file-manager.cfg b/mackup/applications/deepin-dde-file-manager.cfg index 0efc57a3d..57dbad8d7 100644 --- a/mackup/applications/deepin-dde-file-manager.cfg +++ b/mackup/applications/deepin-dde-file-manager.cfg @@ -1,5 +1,5 @@ [application] name = deepin-dde-file-manager -[configuration_files] -.config/deepin/dde-file-manager.json +[xdg_configuration_files] +deepin/dde-file-manager.json diff --git a/mackup/applications/deepin-terminal.cfg b/mackup/applications/deepin-terminal.cfg index f64ea5021..0bcc8e18f 100644 --- a/mackup/applications/deepin-terminal.cfg +++ b/mackup/applications/deepin-terminal.cfg @@ -1,5 +1,5 @@ [application] name = deepin-terminal -[configuration_files] -.config/deepin/deepin-terminal/config.conf +[xdg_configuration_files] +deepin/deepin-terminal/config.conf diff --git a/mackup/applications/devilspie2.cfg b/mackup/applications/devilspie2.cfg index 5d2484f44..40a5c911d 100644 --- a/mackup/applications/devilspie2.cfg +++ b/mackup/applications/devilspie2.cfg @@ -1,5 +1,5 @@ [application] name = Devilspie2 -[configuration_files] -.config/devilspie2 +[xdg_configuration_files] +devilspie2 diff --git a/mackup/applications/doublecmd.cfg b/mackup/applications/doublecmd.cfg index 5f775c8ec..e6605f86e 100644 --- a/mackup/applications/doublecmd.cfg +++ b/mackup/applications/doublecmd.cfg @@ -1,8 +1,8 @@ [application] name = Double Commander -[configuration_files] -.config/doublecmd/wfx.ini -.config/doublecmd/doublecmd.ext -.config/doublecmd/shortcuts.scf -.config/doublecmd/doublecmd.xml +[xdg_configuration_files] +doublecmd/wfx.ini +doublecmd/doublecmd.ext +doublecmd/shortcuts.scf +doublecmd/doublecmd.xml diff --git a/mackup/applications/filezilla.cfg b/mackup/applications/filezilla.cfg index 8f90024cd..1d1498155 100644 --- a/mackup/applications/filezilla.cfg +++ b/mackup/applications/filezilla.cfg @@ -2,7 +2,9 @@ name = FileZilla [configuration_files] -.config/filezilla/filezilla.xml -.config/filezilla/layout.xml -.config/filezilla/sitemanager.xml .filezilla + +[xdg_configuration_files] +filezilla/filezilla.xml +filezilla/layout.xml +filezilla/sitemanager.xml diff --git a/mackup/applications/fish.cfg b/mackup/applications/fish.cfg index 562975c98..86af13208 100644 --- a/mackup/applications/fish.cfg +++ b/mackup/applications/fish.cfg @@ -1,9 +1,9 @@ [application] name = Fish -[configuration_files] -.config/fish/config.fish -.config/fish/conf.d -.config/fish/fish_variables -.config/fish/functions -.config/fish/completions +[xdg_configuration_files] +fish/config.fish +fish/conf.d +fish/fish_variables +fish/functions +fish/completions diff --git a/mackup/applications/fisher.cfg b/mackup/applications/fisher.cfg index 782bc0f71..651146492 100644 --- a/mackup/applications/fisher.cfg +++ b/mackup/applications/fisher.cfg @@ -1,5 +1,5 @@ [application] name = Fisher -[configuration_files] -.config/fish/fishfile +[xdg_configuration_files] +fish/fishfile diff --git a/mackup/applications/flexget.cfg b/mackup/applications/flexget.cfg index 1d8a42875..e8bdaf729 100644 --- a/mackup/applications/flexget.cfg +++ b/mackup/applications/flexget.cfg @@ -2,5 +2,7 @@ name = FlexGet [configuration_files] -.config/flexget/config.yml .flexget/config.yml + +[xdg_configuration_files] +flexget/config.yml diff --git a/mackup/applications/fontconfig.cfg b/mackup/applications/fontconfig.cfg index 14395cd4d..91d11ecb8 100644 --- a/mackup/applications/fontconfig.cfg +++ b/mackup/applications/fontconfig.cfg @@ -1,5 +1,5 @@ [application] name = Fontconfig -[configuration_files] -.config/fontconfig +[xdg_configuration_files] +fontconfig diff --git a/mackup/applications/franz.cfg b/mackup/applications/franz.cfg index eecf73787..73ee73367 100644 --- a/mackup/applications/franz.cfg +++ b/mackup/applications/franz.cfg @@ -4,5 +4,5 @@ name = Franz [configuration_files] Library/Application Support/Franz/settings -# Linux files -.config/Franz/settings +[xdg_configuration_files] +Franz/settings diff --git a/mackup/applications/ghostwriter.cfg b/mackup/applications/ghostwriter.cfg index 070a31e06..20239be3b 100644 --- a/mackup/applications/ghostwriter.cfg +++ b/mackup/applications/ghostwriter.cfg @@ -1,5 +1,5 @@ [application] name = Ghostwriter -[configuration_files] -.config/ghostwriter +[xdg_configuration_files] +ghostwriter diff --git a/mackup/applications/goshare.cfg b/mackup/applications/goshare.cfg index 31db0a055..f0fecfff2 100644 --- a/mackup/applications/goshare.cfg +++ b/mackup/applications/goshare.cfg @@ -1,5 +1,5 @@ [application] name = GoShare -[configuration_files] -.config/dictget/goshare +[xdg_configuration_files] +dictget/goshare diff --git a/mackup/applications/hexchat.cfg b/mackup/applications/hexchat.cfg index 62de963df..08b8cb720 100644 --- a/mackup/applications/hexchat.cfg +++ b/mackup/applications/hexchat.cfg @@ -1,5 +1,5 @@ [application] name = HexChat -[configuration_files] -.config/hexchat +[xdg_configuration_files] +hexchat diff --git a/mackup/applications/htop.cfg b/mackup/applications/htop.cfg index c17e11ead..0a6517d51 100644 --- a/mackup/applications/htop.cfg +++ b/mackup/applications/htop.cfg @@ -3,4 +3,6 @@ name = Htop [configuration_files] .htoprc -.config/htop/htoprc + +[xdg_configuration_files] +htop/htoprc diff --git a/mackup/applications/hub.cfg b/mackup/applications/hub.cfg index acdbbec50..e8527eb57 100644 --- a/mackup/applications/hub.cfg +++ b/mackup/applications/hub.cfg @@ -1,5 +1,5 @@ [application] name = hub -[configuration_files] -.config/hub +[xdg_configuration_files] +hub diff --git a/mackup/applications/i3.cfg b/mackup/applications/i3.cfg index 0c31ef46f..acee30c4f 100644 --- a/mackup/applications/i3.cfg +++ b/mackup/applications/i3.cfg @@ -3,5 +3,7 @@ name = i3 [configuration_files] .i3/config -.config/i3/config .i3status.conf + +[xdg_configuration_files] +i3/config diff --git a/mackup/applications/inkscape.cfg b/mackup/applications/inkscape.cfg index c0b8e05ca..bd7201b28 100644 --- a/mackup/applications/inkscape.cfg +++ b/mackup/applications/inkscape.cfg @@ -1,5 +1,5 @@ [application] name = inkscape -[configuration_files] -.config/inkscape/preferences.xml +[xdg_configuration_files] +inkscape/preferences.xml diff --git a/mackup/applications/insomnia.cfg b/mackup/applications/insomnia.cfg index e427da4c5..f62122e24 100644 --- a/mackup/applications/insomnia.cfg +++ b/mackup/applications/insomnia.cfg @@ -2,5 +2,7 @@ name = Insomnia [configuration_files] -.config/Insomnia Library/Application Support/Insomnia + +[xdg_configuration_files] +Insomnia diff --git a/mackup/applications/karabiner-elements.cfg b/mackup/applications/karabiner-elements.cfg index 98305506f..2455434e3 100644 --- a/mackup/applications/karabiner-elements.cfg +++ b/mackup/applications/karabiner-elements.cfg @@ -1,5 +1,5 @@ [application] name = Karabiner Elements -[configuration_files] -.config/karabiner +[xdg_configuration_files] +karabiner diff --git a/mackup/applications/kdenlive.cfg b/mackup/applications/kdenlive.cfg index b19171780..071b9ff86 100644 --- a/mackup/applications/kdenlive.cfg +++ b/mackup/applications/kdenlive.cfg @@ -2,6 +2,7 @@ name = Kdenlive [configuration_files] - -.config/kdenliverc kdenlive + +[xdg_configuration_files] +kdenliverc diff --git a/mackup/applications/keepassx.cfg b/mackup/applications/keepassx.cfg index 387be3e0b..fc47e6c80 100644 --- a/mackup/applications/keepassx.cfg +++ b/mackup/applications/keepassx.cfg @@ -3,6 +3,8 @@ name = KeePassX [configuration_files] .keepassx -.config/keepassx/keepassx2.ini Library/Preferences/org.keepassx.keepassx.plist Library/Application Support/keepassx/keepassx2.ini + +[xdg_configuration_files] +keepassx/keepassx2.ini diff --git a/mackup/applications/kitty.cfg b/mackup/applications/kitty.cfg index 5113e5987..081b7269d 100644 --- a/mackup/applications/kitty.cfg +++ b/mackup/applications/kitty.cfg @@ -1,5 +1,5 @@ [application] name = kitty -[configuration_files] -.config/kitty/kitty.conf +[xdg_configuration_files] +kitty/kitty.conf diff --git a/mackup/applications/libreoffice.cfg b/mackup/applications/libreoffice.cfg index 0c35b7f11..073d03e89 100644 --- a/mackup/applications/libreoffice.cfg +++ b/mackup/applications/libreoffice.cfg @@ -1,5 +1,5 @@ [application] name = LibreOffice -[configuration_files] -.config/libreoffice +[xdg_configuration_files] +libreoffice diff --git a/mackup/applications/liquidprompt.cfg b/mackup/applications/liquidprompt.cfg index be815a559..c6a389c3b 100644 --- a/mackup/applications/liquidprompt.cfg +++ b/mackup/applications/liquidprompt.cfg @@ -3,4 +3,6 @@ name = Liquid Prompt [configuration_files] .liquidpromptrc -.config/liquidpromptrc + +[xdg_configuration_files] +liquidpromptrc diff --git a/mackup/applications/livestreamer.cfg b/mackup/applications/livestreamer.cfg index 213a2ea0d..f8f8eb769 100644 --- a/mackup/applications/livestreamer.cfg +++ b/mackup/applications/livestreamer.cfg @@ -3,5 +3,7 @@ name = Livestreamer [configuration_files] .livestreamerrc -.config/livestreamer/config -.config/livestreamer/plugins + +[xdg_configuration_files] +livestreamer/config +livestreamer/plugins diff --git a/mackup/applications/micro.cfg b/mackup/applications/micro.cfg index 17f6f810b..862e8c98d 100644 --- a/mackup/applications/micro.cfg +++ b/mackup/applications/micro.cfg @@ -1,8 +1,8 @@ [application] name = Micro -[configuration_files] -.config/micro/colorschemes -.config/micro/syntax -.config/micro/settings.json -.config/micro/bindings.json +[xdg_configuration_files] +micro/colorschemes +micro/syntax +micro/settings.json +micro/bindings.json diff --git a/mackup/applications/mps-youtube.cfg b/mackup/applications/mps-youtube.cfg index 3c73693e4..aca606e5a 100644 --- a/mackup/applications/mps-youtube.cfg +++ b/mackup/applications/mps-youtube.cfg @@ -1,6 +1,6 @@ [application] name = MPS Youtube -[configuration_files] -.config/mps-youtube/config -.config/mps-youtube/playlist_v2 +[xdg_configuration_files] +mps-youtube/config +mps-youtube/playlist_v2 diff --git a/mackup/applications/mpv.cfg b/mackup/applications/mpv.cfg index 3ad60ec59..c6f993541 100644 --- a/mackup/applications/mpv.cfg +++ b/mackup/applications/mpv.cfg @@ -2,11 +2,13 @@ name = MPV [configuration_files] -.config/mpv/config -.config/mpv/mpv.conf -.config/mpv/scripts -.config/mpv/input.conf -.config/mpv/watch_later .mpv/channels.conf .mpv/config .mpv/input.conf + +[xdg_configuration_files] +mpv/config +mpv/mpv.conf +mpv/scripts +mpv/input.conf +mpv/watch_later diff --git a/mackup/applications/musicbrainz-picard.cfg b/mackup/applications/musicbrainz-picard.cfg index 01fb730df..9adc25bd9 100644 --- a/mackup/applications/musicbrainz-picard.cfg +++ b/mackup/applications/musicbrainz-picard.cfg @@ -1,5 +1,5 @@ [application] name = MusicBrainz Picard -[configuration_files] -.config/MusicBrainz +[xdg_configuration_files] +MusicBrainz diff --git a/mackup/applications/neovim.cfg b/mackup/applications/neovim.cfg index 386810e20..01f0ce9f5 100644 --- a/mackup/applications/neovim.cfg +++ b/mackup/applications/neovim.cfg @@ -2,6 +2,8 @@ name = neovim [configuration_files] -.config/nvim/init.vim .nvimrc .nvim + +[xdg_configuration_files] +nvim/init.vim diff --git a/mackup/applications/nomacs.cfg b/mackup/applications/nomacs.cfg index 9ac8ed40a..34d5f394e 100644 --- a/mackup/applications/nomacs.cfg +++ b/mackup/applications/nomacs.cfg @@ -1,5 +1,5 @@ [application] name = Nomacs -[configuration_files] -.config/nomacs +[xdg_configuration_files] +nomacs diff --git a/mackup/applications/oh-my-fish.cfg b/mackup/applications/oh-my-fish.cfg index a9b07cf49..cdf1b96c2 100644 --- a/mackup/applications/oh-my-fish.cfg +++ b/mackup/applications/oh-my-fish.cfg @@ -1,5 +1,5 @@ [application] name = Oh My Fish -[configuration_files] -.config/omf +[xdg_configuration_files] +omf diff --git a/mackup/applications/openbox.cfg b/mackup/applications/openbox.cfg index ed672ab4f..2bd43e3b8 100644 --- a/mackup/applications/openbox.cfg +++ b/mackup/applications/openbox.cfg @@ -1,8 +1,8 @@ [application] name = openbox -[configuration_files] -.config/openbox/menu.xml -.config/openbox/rc.xml -.config/openbox/environment -.config/openbox/autostart +[xdg_configuration_files] +openbox/menu.xml +openbox/rc.xml +openbox/environment +openbox/autostart diff --git a/mackup/applications/qutebrowser.cfg b/mackup/applications/qutebrowser.cfg index 23b8aff72..9acbc7abc 100644 --- a/mackup/applications/qutebrowser.cfg +++ b/mackup/applications/qutebrowser.cfg @@ -3,5 +3,7 @@ name = Qutebrowser [configuration_files] .qutebrowser/config.py -.config/qutebrowser/config.py -.config/qutebrowser/qutebrowser.conf + +[xdg_configuration_files] +qutebrowser/config.py +qutebrowser/qutebrowser.conf diff --git a/mackup/applications/ranger.cfg b/mackup/applications/ranger.cfg index fca092043..24abf3e9a 100644 --- a/mackup/applications/ranger.cfg +++ b/mackup/applications/ranger.cfg @@ -1,9 +1,9 @@ [application] name = Ranger -[configuration_files] -.config/ranger/commands.py -.config/ranger/rc.conf -.config/ranger/rifle.conf -.config/ranger/scope.sh -.config/ranger/plugins +[xdg_configuration_files] +ranger/commands.py +ranger/rc.conf +ranger/rifle.conf +ranger/scope.sh +ranger/plugins diff --git a/mackup/applications/redshift-scheduler.cfg b/mackup/applications/redshift-scheduler.cfg index e41627638..49726ba9c 100644 --- a/mackup/applications/redshift-scheduler.cfg +++ b/mackup/applications/redshift-scheduler.cfg @@ -1,5 +1,5 @@ [application] name = Redshift Scheduler -[configuration_files] -.config/redshift-scheduler/rules.conf +[xdg_configuration_files] +redshift-scheduler/rules.conf diff --git a/mackup/applications/redshift.cfg b/mackup/applications/redshift.cfg index 85bb31e65..87e2eb0b6 100644 --- a/mackup/applications/redshift.cfg +++ b/mackup/applications/redshift.cfg @@ -1,5 +1,5 @@ [application] name = Redshift -[configuration_files] -.config/redshift.conf +[xdg_configuration_files] +redshift.conf diff --git a/mackup/applications/rime.cfg b/mackup/applications/rime.cfg index 0865c581e..123701aca 100644 --- a/mackup/applications/rime.cfg +++ b/mackup/applications/rime.cfg @@ -2,7 +2,6 @@ name = Rime [configuration_files] - Library/Rime/default.custom.yaml Library/Rime/default.yaml Library/Rime/installation.yaml @@ -11,10 +10,11 @@ Library/Rime/squirrel.yaml Library/Rime/symbols.yaml Library/Rime/user.yaml -.config/ibus/rimedefault.custom.yaml -.config/ibus/rimedefault.yaml -.config/ibus/rimeinstallation.yaml -.config/ibus/rimesquirrel.custom.yaml -.config/ibus/rimesquirrel.yaml -.config/ibus/rimesymbols.yaml -.config/ibus/rimeuser.yaml +[xdg_configuration_files] +ibus/rimedefault.custom.yaml +ibus/rimedefault.yaml +ibus/rimeinstallation.yaml +ibus/rimesquirrel.custom.yaml +ibus/rimesquirrel.yaml +ibus/rimesymbols.yaml +ibus/rimeuser.yaml diff --git a/mackup/applications/robomongo.cfg b/mackup/applications/robomongo.cfg index 177835292..5acc3d76c 100644 --- a/mackup/applications/robomongo.cfg +++ b/mackup/applications/robomongo.cfg @@ -1,5 +1,5 @@ [application] name = Robomongo -[configuration_files] -.config/robomongo +[xdg_configuration_files] +robomongo diff --git a/mackup/applications/rofi.cfg b/mackup/applications/rofi.cfg index 0fa49324b..d40d53e43 100644 --- a/mackup/applications/rofi.cfg +++ b/mackup/applications/rofi.cfg @@ -1,5 +1,5 @@ [application] name = rofi -[configuration_files] -.config/rofi/config.rasi +[xdg_configuration_files] +rofi/config.rasi diff --git a/mackup/applications/sublime-text-2.cfg b/mackup/applications/sublime-text-2.cfg index 694049111..da58aa89e 100644 --- a/mackup/applications/sublime-text-2.cfg +++ b/mackup/applications/sublime-text-2.cfg @@ -4,4 +4,6 @@ name = Sublime Text 2 [configuration_files] # Based on https://packagecontrol.io/docs/syncing Library/Application Support/Sublime Text 2/Packages/User -.config/sublime-text-2/Packages/User + +[xdg_configuration_files] +sublime-text-2/Packages/User diff --git a/mackup/applications/sublime-text-3.cfg b/mackup/applications/sublime-text-3.cfg index 6f4e3b67d..2f3d9805c 100644 --- a/mackup/applications/sublime-text-3.cfg +++ b/mackup/applications/sublime-text-3.cfg @@ -4,4 +4,6 @@ name = Sublime Text 3 [configuration_files] # Based on https://packagecontrol.io/docs/syncing Library/Application Support/Sublime Text 3/Packages/User -.config/sublime-text-3/Packages/User + +[xdg_configuration_files] +sublime-text-3/Packages/User diff --git a/mackup/applications/terminator.cfg b/mackup/applications/terminator.cfg index 2dc2030d1..36f6abd79 100644 --- a/mackup/applications/terminator.cfg +++ b/mackup/applications/terminator.cfg @@ -1,5 +1,5 @@ [application] name = Terminator -[configuration_files] -.config/terminator/config +[xdg_configuration_files] +terminator/config diff --git a/mackup/applications/tint2.cfg b/mackup/applications/tint2.cfg index bf1a1f7d8..9ab406ea8 100644 --- a/mackup/applications/tint2.cfg +++ b/mackup/applications/tint2.cfg @@ -1,5 +1,5 @@ [application] name = tint2 -[configuration_files] -.config/tint2/tint2rc +[xdg_configuration_files] +tint2/tint2rc diff --git a/mackup/applications/transmission.cfg b/mackup/applications/transmission.cfg index ff882713c..cfb210e2b 100644 --- a/mackup/applications/transmission.cfg +++ b/mackup/applications/transmission.cfg @@ -4,6 +4,8 @@ name = Transmission [configuration_files] Library/Preferences/org.m0k.transmission.plist Library/Application Support/Transmission/blocklists -.config/transmission/blocklists -.config/transmission/settings.json -.config/transmission/stats.json + +[xdg_configuration_files] +transmission/blocklists +transmission/settings.json +transmission/stats.json diff --git a/mackup/applications/typora.cfg b/mackup/applications/typora.cfg index 6950cb331..1073a6895 100644 --- a/mackup/applications/typora.cfg +++ b/mackup/applications/typora.cfg @@ -2,5 +2,7 @@ name = Typora [configuration_files] -.config/Typora/themes Library/Application Support/abnerworks.Typora/themes + +[xdg_configuration_files] +Typora/themes diff --git a/mackup/applications/ulauncher.cfg b/mackup/applications/ulauncher.cfg index 3c912defc..48b74f12a 100644 --- a/mackup/applications/ulauncher.cfg +++ b/mackup/applications/ulauncher.cfg @@ -1,7 +1,7 @@ [application] name = Ulauncher -[configuration_files] -.config/ulauncher/extensions.json -.config/ulauncher/settings.json -.config/ulauncher/shortcuts.json +[xdg_configuration_files] +ulauncher/extensions.json +ulauncher/settings.json +ulauncher/shortcuts.json diff --git a/mackup/applications/verdaccio.cfg b/mackup/applications/verdaccio.cfg index 7e481f4ab..03c738db0 100644 --- a/mackup/applications/verdaccio.cfg +++ b/mackup/applications/verdaccio.cfg @@ -1,5 +1,5 @@ [application] name = Verdaccio -[configuration_files] -.config/verdaccio/config.yaml +[xdg_configuration_files] +verdaccio/config.yaml diff --git a/mackup/applications/vscode-insiders.cfg b/mackup/applications/vscode-insiders.cfg index bac845151..bc52af3bd 100644 --- a/mackup/applications/vscode-insiders.cfg +++ b/mackup/applications/vscode-insiders.cfg @@ -6,7 +6,7 @@ Library/Application Support/Code - Insiders/User/snippets Library/Application Support/Code - Insiders/User/keybindings.json Library/Application Support/Code - Insiders/User/settings.json -# Linux Files -.config/Code - Insiders/User/snippets -.config/Code - Insiders/User/keybindings.json -.config/Code - Insiders/User/settings.json +[xdg_configuration_files] +Code - Insiders/User/snippets +Code - Insiders/User/keybindings.json +Code - Insiders/User/settings.json diff --git a/mackup/applications/vscode-oss.cfg b/mackup/applications/vscode-oss.cfg index 8e64f9c9f..fbaca786f 100644 --- a/mackup/applications/vscode-oss.cfg +++ b/mackup/applications/vscode-oss.cfg @@ -6,7 +6,7 @@ Library/Application Support/Code - OSS/User/snippets Library/Application Support/Code - OSS/User/keybindings.json Library/Application Support/Code - OSS/User/settings.json -# Linux Files -.config/Code - OSS/User/snippets -.config/Code - OSS/User/keybindings.json -.config/Code - OSS/User/settings.json +[xdg_configuration_files] +Code - OSS/User/snippets +Code - OSS/User/keybindings.json +Code - OSS/User/settings.json diff --git a/mackup/applications/vscode.cfg b/mackup/applications/vscode.cfg index 9c5da5bed..a216c2709 100644 --- a/mackup/applications/vscode.cfg +++ b/mackup/applications/vscode.cfg @@ -6,7 +6,7 @@ Library/Application Support/Code/User/snippets Library/Application Support/Code/User/keybindings.json Library/Application Support/Code/User/settings.json -# Linux Files -.config/Code/User/snippets -.config/Code/User/keybindings.json -.config/Code/User/settings.json +[xdg_configuration_files] +Code/User/snippets +Code/User/keybindings.json +Code/User/settings.json diff --git a/mackup/applications/vscodium.cfg b/mackup/applications/vscodium.cfg index 272ec445d..2bd5224a2 100644 --- a/mackup/applications/vscodium.cfg +++ b/mackup/applications/vscodium.cfg @@ -6,7 +6,7 @@ Library/Application Support/VSCodium/User/snippets Library/Application Support/VSCodium/User/keybindings.json Library/Application Support/VSCodium/User/settings.json -# Linux Files -.config/VSCodium/User/snippets -.config/VSCodium/User/keybindings.json -.config/VSCodium/User/settings.json +[xdg_configuration_files] +VSCodium/User/snippets +VSCodium/User/keybindings.json +VSCodium/User/settings.json diff --git a/mackup/applications/wireshark.cfg b/mackup/applications/wireshark.cfg index fa8fb1479..0abfc04cf 100644 --- a/mackup/applications/wireshark.cfg +++ b/mackup/applications/wireshark.cfg @@ -1,5 +1,5 @@ [application] name = Wireshark 2 -[configuration_files] -.config/wireshark +[xdg_configuration_files] +wireshark diff --git a/mackup/applications/zathura.cfg b/mackup/applications/zathura.cfg index 103e16273..13e379cf2 100644 --- a/mackup/applications/zathura.cfg +++ b/mackup/applications/zathura.cfg @@ -1,5 +1,5 @@ [application] name = zathura -[configuration_files] -.config/zathura/zathurarc +[xdg_configuration_files] +zathura/zathurarc From c5b12d86481dfbdafa95b9ba79d34aedc4f248ae Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 26 Feb 2020 23:57:34 -0500 Subject: [PATCH 142/406] Add support for Python 3.8 (#1533) --- .circleci/config.yml | 19 +++++++++++++++++++ CHANGELOG.md | 1 + 2 files changed, 20 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 15225830a..ae4ee14bd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,6 +27,15 @@ jobs: - run: pipenv install -d - run: make test + nose-3_8: + docker: + - image: python:3.8 + steps: + - checkout + - run: pip install pipenv + - run: pipenv install -d + - run: make test + install-2_7: docker: - image: python:2.7 @@ -51,6 +60,14 @@ jobs: - run: python setup.py install - run: mackup --help + install-3_8: + docker: + - image: python:3.8 + steps: + - checkout + - run: python setup.py install + - run: mackup --help + mdl: docker: - image: rsrchboy/mdl @@ -73,8 +90,10 @@ workflows: - nose-2_7 - nose-3_6 - nose-3_7 + - nose-3_8 - install-2_7 - install-3_6 - install-3_7 + - install-3_8 - mdl - black diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b61664a2..0f109d8aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Removed support for the Box storage - Fix: suppress errors when handling symlinks (via @doubleloop) - Migrated all config files to the XDG format +- Add support for Python 3.8 ## Mackup 0.8.27 From 4aeb69c49bb54db762c7281e7a7e5a7ddf75cb81 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 26 Feb 2020 23:58:51 -0500 Subject: [PATCH 143/406] Mackup 0.8.28 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f109d8aa..d3e309dd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.28 + - Added support for Bat (via @joshmedeski) - Added support for newer versions of WebStorm - Updated support for Marta to capture new config files in 0.6.1 (via @petrbouchal) diff --git a/mackup/constants.py b/mackup/constants.py index bcad0513e..5525e5119 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = "0.8.27" +VERSION = "0.8.28" # Support platforms PLATFORM_DARWIN = "Darwin" From b76ac2ee738941cd4eab605128c55b0cb1f5e103 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 27 Feb 2020 03:51:14 -0500 Subject: [PATCH 144/406] Setup github actions (#1534) * Setup github actions * Update README.md * Try without a container * Remove file filter * "You don't have write permissions for the /var/lib/gems/2.5.0 directory." * checkout the code * Fix mdl * Try with a container * Remove mdl from CCI * Add an error * without ubuntu * Migrate black * trigger black * black fix * Full CircleCI migration * use checkout action * Status badge * typo * Give the workflow a name * Add a link to the badge --- .../workflows/mackup.yaml | 97 ++++++++----------- README.md | 2 +- 2 files changed, 43 insertions(+), 56 deletions(-) rename .circleci/config.yml => .github/workflows/mackup.yaml (53%) diff --git a/.circleci/config.yml b/.github/workflows/mackup.yaml similarity index 53% rename from .circleci/config.yml rename to .github/workflows/mackup.yaml index ae4ee14bd..6cacb1b85 100644 --- a/.circleci/config.yml +++ b/.github/workflows/mackup.yaml @@ -1,99 +1,86 @@ -version: 2.1 +name: Mackup +on: push jobs: + + mdl: + runs-on: ubuntu-latest + container: rsrchboy/mdl + steps: + - uses: actions/checkout@v2 + - run: mdl . + + black: + runs-on: ubuntu-latest + container: python + steps: + - run: pip install black + - uses: actions/checkout@v2 + - run: black --check --target-version py27 . + nose-2_7: - docker: - - image: python:2.7 + runs-on: ubuntu-latest + container: python:2.7 steps: - - checkout - run: pip install docopt six nose + - uses: actions/checkout@v2 - run: nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup nose-3_6: - docker: - - image: python:3.6 + runs-on: ubuntu-latest + container: python:3.6 steps: - - checkout - run: pip install pipenv + - uses: actions/checkout@v2 - run: pipenv install -d - run: make test nose-3_7: - docker: - - image: python:3.7 + runs-on: ubuntu-latest + container: python:3.7 steps: - - checkout - run: pip install pipenv + - uses: actions/checkout@v2 - run: pipenv install -d - run: make test nose-3_8: - docker: - - image: python:3.8 + runs-on: ubuntu-latest + container: python:3.8 steps: - - checkout - run: pip install pipenv + - uses: actions/checkout@v2 - run: pipenv install -d - run: make test install-2_7: - docker: - - image: python:2.7 + runs-on: ubuntu-latest + container: python:2.7 steps: - - checkout + - uses: actions/checkout@v2 - run: python setup.py install - run: mackup --help install-3_6: - docker: - - image: python:3.6 + runs-on: ubuntu-latest + container: python:3.6 steps: - - checkout + - uses: actions/checkout@v2 - run: python setup.py install - run: mackup --help install-3_7: - docker: - - image: python:3.7 + runs-on: ubuntu-latest + container: python:3.7 steps: - - checkout + - uses: actions/checkout@v2 - run: python setup.py install - run: mackup --help install-3_8: - docker: - - image: python:3.8 + runs-on: ubuntu-latest + container: python:3.8 steps: - - checkout + - uses: actions/checkout@v2 - run: python setup.py install - run: mackup --help - - mdl: - docker: - - image: rsrchboy/mdl - steps: - - checkout - - run: mdl . - - black: - docker: - - image: python - steps: - - checkout - - run: pip install black - - run: black --check --target-version py27 . - -workflows: - version: 2 - mackup: - jobs: - - nose-2_7 - - nose-3_6 - - nose-3_7 - - nose-3_8 - - install-2_7 - - install-3_6 - - install-3_7 - - install-3_8 - - mdl - - black diff --git a/README.md b/README.md index a90f90197..e6885429f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Keep your application settings in sync. -[![Circle CI](https://circleci.com/gh/lra/mackup.svg?style=shield)](https://circleci.com/gh/lra/mackup) +[![Status](https://github.com/lra/mackup/workflows/Mackup/badge.svg)](https://github.com/lra/mackup/actions) [![snapcraft](https://snapcraft.io/mackup/badge.svg)](https://snapcraft.io/mackup) ## Table of content From 6c311945e6bdaf608c19e2b883523afc3cb9817f Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 27 Feb 2020 13:10:49 -0500 Subject: [PATCH 145/406] Create FUNDING.yml --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000000000..4486f9791 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +custom: ['https://tippin.me/@_LR_'] From a7e28f479f00798138c82c9ad460e0e404f6f333 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 27 Feb 2020 13:13:50 -0500 Subject: [PATCH 146/406] Move CONTRIBUTING.md --- CONTRIBUTING.md => .github/CONTRIBUTING.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename CONTRIBUTING.md => .github/CONTRIBUTING.md (100%) diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md From 5a8331bb034e947639cfc664462d666a3ecc4568 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 27 Feb 2020 13:38:18 -0500 Subject: [PATCH 147/406] Enable actions on PRs --- .github/workflows/mackup.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mackup.yaml b/.github/workflows/mackup.yaml index 6cacb1b85..a273613c9 100644 --- a/.github/workflows/mackup.yaml +++ b/.github/workflows/mackup.yaml @@ -1,5 +1,5 @@ name: Mackup -on: push +on: [push, pull_request] jobs: From eb9c0f5a41c4c72b231ae4bb38b0f095824e1ae4 Mon Sep 17 00:00:00 2001 From: Kristian Boda Date: Thu, 27 Feb 2020 18:41:32 +0000 Subject: [PATCH 148/406] Add support for Calibre (#1527) * Add calibre.cfg * Update README * Update CHANGELOG * Update calibre.cfg Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/calibre.cfg | 8 ++++++++ 3 files changed, 11 insertions(+) create mode 100644 mackup/applications/calibre.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index d3e309dd6..4432ef6f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Added support for Calibre (via @ttuygun @bodak) + ## Mackup 0.8.28 - Added support for Bat (via @joshmedeski) diff --git a/README.md b/README.md index e6885429f..37701aaa6 100644 --- a/README.md +++ b/README.md @@ -213,6 +213,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Bundler](http://bundler.io) - [Byobu](http://byobu.co/) - [Caffeine](http://lightheadsw.com/caffeine/) +- [Calibre](https://calibre-ebook.com/) - [Capture One](http://www.phaseone.com/Imaging-Software/Capture-One.aspx) - [Cartographica](https://www.macgis.com/) - [Cerebro](https://cerebroapp.com/) diff --git a/mackup/applications/calibre.cfg b/mackup/applications/calibre.cfg new file mode 100644 index 000000000..a75779306 --- /dev/null +++ b/mackup/applications/calibre.cfg @@ -0,0 +1,8 @@ +[application] +name = Calibre + +[configuration_files] +Library/Preferences/calibre + +[xdg_configuration_files] +calibre From f30d877184b7ea2a09be19076945d3917d5eda77 Mon Sep 17 00:00:00 2001 From: "Ryotaro \"Justin\" Miura" <1560508+ryoppippi@users.noreply.github.com> Date: Fri, 28 Feb 2020 03:49:19 +0900 Subject: [PATCH 149/406] Add Poetry Support (#1503) * Create poetry.cfg * update README and CHANGELOG Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/poetry.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/poetry.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 4432ef6f8..c9b1c1e4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Added support for Calibre (via @ttuygun @bodak) +- Added support for Poetry (via @ryoppippi) ## Mackup 0.8.28 diff --git a/README.md b/README.md index 37701aaa6..bca9175a0 100644 --- a/README.md +++ b/README.md @@ -456,6 +456,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Pnpm](https://pnpm.js.org/) - [Pock](https://pock.pigigaldi.com) - [Poedit](http://poedit.net/) +- [Poetry](https://python-poetry.org) - [PokerStars](https://www.pokerstars.com/) - [PopClip](http://pilotmoon.com/popclip/) - [Popcorn-Time](https://popcorntime.io/) diff --git a/mackup/applications/poetry.cfg b/mackup/applications/poetry.cfg new file mode 100644 index 000000000..c0cb2c318 --- /dev/null +++ b/mackup/applications/poetry.cfg @@ -0,0 +1,5 @@ +[application] +name = poetry + +[configuration_files] +Library/Application Support/pypoetry/config.cfg From 7759d3e055ac0a3d90840b4f61f2adbab3c7d908 Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Thu, 27 Feb 2020 19:54:33 +0100 Subject: [PATCH 150/406] Add support for Music (#1456) * Add support for Music * Update README.md * Update and rename music.cfg to apple-music.cfg Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/apple-music.cfg | 7 +++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/apple-music.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index c9b1c1e4b..d2dc12606 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Added support for Calibre (via @ttuygun @bodak) - Added support for Poetry (via @ryoppippi) +- Added support for Music (via @dnicolson) ## Mackup 0.8.28 diff --git a/README.md b/README.md index bca9175a0..44dd9e167 100644 --- a/README.md +++ b/README.md @@ -177,6 +177,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Ansible](http://www.ansible.com/) - [AppCleaner](http://freemacsoft.net/appcleaner/) - [AppCode](http://www.jetbrains.com/objc/) +- [Apple Music](https://www.apple.com/apple-music/) - [Apptivate](http://www.apptivateapp.com/) - [Arara](https://github.com/cereda/arara) - [aria2c](http://aria2.sourceforge.net/) diff --git a/mackup/applications/apple-music.cfg b/mackup/applications/apple-music.cfg new file mode 100644 index 000000000..e39b8fdc7 --- /dev/null +++ b/mackup/applications/apple-music.cfg @@ -0,0 +1,7 @@ +[application] +name = Apple Music + +[configuration_files] +Library/Music/Scripts +Library/Preferences/com.apple.Music.eq.plist +Library/Preferences/com.apple.Music.plist From c78a01515d6d7fb75c6e83cd92745a5a44d8dd55 Mon Sep 17 00:00:00 2001 From: "Ryotaro \"Justin\" Miura" <1560508+ryoppippi@users.noreply.github.com> Date: Sat, 29 Feb 2020 03:09:08 +0900 Subject: [PATCH 151/406] Add Kaggle Support (#1502) * Add Kaggle Support * update README and CHANGELOG * Update README.md * Update README.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/kaggle.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/kaggle.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index d2dc12606..2986ee4c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Added support for Calibre (via @ttuygun @bodak) - Added support for Poetry (via @ryoppippi) - Added support for Music (via @dnicolson) +- Added support for Kaggle (via @ryoppippi) ## Mackup 0.8.28 diff --git a/README.md b/README.md index 44dd9e167..dd12b7451 100644 --- a/README.md +++ b/README.md @@ -355,6 +355,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Julia](http://julialang.org) - [Jumpcut](http://jumpcut.sourceforge.net/) - [Jupyter](http://jupyter.org/) +- [Kaggle](https://kaggle.com/) - [Kaleidoscope](http://www.kaleidoscopeapp.com/) - [Karabiner Elements](https://github.com/tekezo/Karabiner-Elements) - [Karabiner](https://pqrs.org/osx/karabiner/) diff --git a/mackup/applications/kaggle.cfg b/mackup/applications/kaggle.cfg new file mode 100644 index 000000000..0999d411d --- /dev/null +++ b/mackup/applications/kaggle.cfg @@ -0,0 +1,5 @@ +[application] +name = Kaggle + +[configuration_files] +.kaggle/kaggle.json From a8b4fe7cf613fdf107c9fd096e2fedb85082de65 Mon Sep 17 00:00:00 2001 From: Ali Ustek Date: Sat, 29 Feb 2020 18:22:28 +0000 Subject: [PATCH 152/406] Added support for SBT 1.0 (#1536) --- mackup/applications/sbt.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mackup/applications/sbt.cfg b/mackup/applications/sbt.cfg index 9e97fa788..205f43136 100644 --- a/mackup/applications/sbt.cfg +++ b/mackup/applications/sbt.cfg @@ -11,3 +11,7 @@ name = SBT .sbt/0.13/build.sbt .sbt/0.13/plugins/plugins.sbt .sbt/0.13/plugins/build.sbt +.sbt/1.0/global.sbt +.sbt/1.0/build.sbt +.sbt/1.0/plugins/plugins.sbt +.sbt/1.0/plugins/build.sbt From 619fd76c575d7e16697231bdb0c0578fc8d4ec9e Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 29 Feb 2020 13:23:12 -0500 Subject: [PATCH 153/406] Missing changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2986ee4c0..6fbb889c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Added support for Poetry (via @ryoppippi) - Added support for Music (via @dnicolson) - Added support for Kaggle (via @ryoppippi) +- Added support for SBT 1.0 (via @austek) ## Mackup 0.8.28 From 243e154fa047706f037f015bfd49dcfc95971092 Mon Sep 17 00:00:00 2001 From: Chris <7539871+paxperscientiam@users.noreply.github.com> Date: Sat, 29 Feb 2020 13:33:40 -0500 Subject: [PATCH 154/406] Add support for FiloSottile/mkcert (#1497) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/mkcert.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/mkcert.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fbb889c0..fc571c947 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Added support for Music (via @dnicolson) - Added support for Kaggle (via @ryoppippi) - Added support for SBT 1.0 (via @austek) +- Added support for FiloSottile/mkcert (via @paxperscientiam) ## Mackup 0.8.28 diff --git a/README.md b/README.md index dd12b7451..9ad89a80b 100644 --- a/README.md +++ b/README.md @@ -405,6 +405,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Micro](https://github.com/zyedidia/micro) - [Microsoft Azure CLI](https://github.com/Azure/azure-xplat-cli) - [Microsoft Remote Desktop](https://itunes.apple.com/us/app/microsoft-remote-desktop-10/id1295203466) +- [mkcert](https://github.com/FiloSottile/mkcert) - [MonoDevelop](http://www.monodevelop.com) - [Moom](http://manytricks.com/moom/) - [Mou](http://25.io/mou/) diff --git a/mackup/applications/mkcert.cfg b/mackup/applications/mkcert.cfg new file mode 100644 index 000000000..566385cac --- /dev/null +++ b/mackup/applications/mkcert.cfg @@ -0,0 +1,5 @@ +[application] +name = mkcert + +[configuration_files] +Library/Application Support/mkcert From a940f5a6671a7eb5a61e71aa38577e9a9559ba36 Mon Sep 17 00:00:00 2001 From: Aman Date: Sun, 1 Mar 2020 00:05:37 +0530 Subject: [PATCH 155/406] PopClip contant syncing fix. (#1495) Excluding other files, in the PopClip folder as they were log files that were creating unnecessary load on CPU. Co-authored-by: Laurent Raufaste --- mackup/applications/popclip.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/popclip.cfg b/mackup/applications/popclip.cfg index 5ab9e29f7..a4d00ac41 100644 --- a/mackup/applications/popclip.cfg +++ b/mackup/applications/popclip.cfg @@ -3,4 +3,4 @@ name = PopClip [configuration_files] Library/Preferences/com.pilotmoon.popclip.plist -Library/Application Support/PopClip +Library/Application Support/PopClip/Extensions From 83b886312ab967eeea8a52b5bf14bc2f87a9520e Mon Sep 17 00:00:00 2001 From: Aman Date: Sun, 1 Mar 2020 00:07:22 +0530 Subject: [PATCH 156/406] Adding Illustrator 24 (CC 2020) settings (#1496) Illustrator CC 2020 update. Co-authored-by: Laurent Raufaste --- mackup/applications/illustrator.cfg | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/mackup/applications/illustrator.cfg b/mackup/applications/illustrator.cfg index 05db3bd33..16d63eacf 100644 --- a/mackup/applications/illustrator.cfg +++ b/mackup/applications/illustrator.cfg @@ -8,6 +8,8 @@ Library/Application Support/Adobe/Adobe Illustrator 19 Library/Application Support/Adobe/Adobe Illustrator 20 Library/Application Support/Adobe/Adobe Illustrator 23/en_US/Adobe SVG Filters.svg Library/Application Support/Adobe/Adobe Illustrator 23/en_US/Swatches +Library/Application Support/Adobe/Adobe Illustrator 24/en_US/Adobe SVG Filters.svg +Library/Application Support/Adobe/Adobe Illustrator 24/en_US/Swatches Library/Application Support/Adobe/OOBE Library/Preferences/Adobe Illustrator 17 Settings Library/Preferences/Adobe Illustrator 18 Settings @@ -24,4 +26,15 @@ Library/Preferences/Adobe Illustrator 23 Settings/en_US/Transparency flattener p Library/Preferences/Adobe Illustrator 23 Settings/en_US/VariableWidthProfiles Library/Preferences/Adobe Illustrator 23 Settings/en_US/Vectorizing Presets Library/Preferences/Adobe Illustrator 23 Settings/en_US/Workspaces +Library/Preferences/Adobe Illustrator 24 Settings/en_US/Adobe Illustrator Prefs +Library/Preferences/Adobe Illustrator 24 Settings/en_US/Last Used Artboard Export Settings +Library/Preferences/Adobe Illustrator 24 Settings/en_US/Last Used Asset Export Settings +Library/Preferences/Adobe Illustrator 24 Settings/en_US/Modified Workspaces +Library/Preferences/Adobe Illustrator 24 Settings/en_US/Perspective grid Presets +Library/Preferences/Adobe Illustrator 24 Settings/en_US/Print Presets +Library/Preferences/Adobe Illustrator 24 Settings/en_US/Tools/Tools Panel Presets +Library/Preferences/Adobe Illustrator 24 Settings/en_US/Transparency flattener presets +Library/Preferences/Adobe Illustrator 24 Settings/en_US/VariableWidthProfiles +Library/Preferences/Adobe Illustrator 24 Settings/en_US/Vectorizing Presets +Library/Preferences/Adobe Illustrator 24 Settings/en_US/Workspaces Library/Preferences/com.adobe.illustrator.plist From 69e348c14ca49af99b1d6fc6702042bcdc3c0b2e Mon Sep 17 00:00:00 2001 From: Patrick Cason Date: Sat, 29 Feb 2020 18:44:14 +0000 Subject: [PATCH 157/406] Adding GoodSync support to Mackup (#1493) * Adding GoodSync support to Mackup * Update goodsync.cfg Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/goodsync.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/goodsync.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index fc571c947..b87e70096 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Added support for Kaggle (via @ryoppippi) - Added support for SBT 1.0 (via @austek) - Added support for FiloSottile/mkcert (via @paxperscientiam) +- Added support for GoodSync (via @cereallarceny) ## Mackup 0.8.28 diff --git a/README.md b/README.md index 9ad89a80b..1def07bf3 100644 --- a/README.md +++ b/README.md @@ -312,6 +312,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Go2Shell](http://zipzapmac.com/Go2Shell) - [GoLand](https://www.jetbrains.com/go/) - [Goldendict](http://goldendict.org/) +- [GoodSync](https://goodsync.com/) - [GoShare](https://github.com/dictget/goshare) - [Gradle](http://gradle.org) - [GrandTotal 3](http://www.mediaatelier.com/GrandTotal4/) diff --git a/mackup/applications/goodsync.cfg b/mackup/applications/goodsync.cfg new file mode 100644 index 000000000..08184874b --- /dev/null +++ b/mackup/applications/goodsync.cfg @@ -0,0 +1,5 @@ +[application] +name = GoodSync + +[configuration_files] +.goodsync From 652a8d5faa298641349b30aa91e724cd8a6e841d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Etienne=20Le=20Bell=C3=A9guy?= Date: Sat, 29 Feb 2020 18:47:50 +0000 Subject: [PATCH 158/406] added support for mitmproxy (#1492) * added support for mitmproxy * Update mitmproxy.cfg Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/mitmproxy.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/mitmproxy.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b87e70096..e3eacc2a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Added support for SBT 1.0 (via @austek) - Added support for FiloSottile/mkcert (via @paxperscientiam) - Added support for GoodSync (via @cereallarceny) +- Added support for mitmproxy (via @etiennelb) ## Mackup 0.8.28 diff --git a/README.md b/README.md index 1def07bf3..5624b0734 100644 --- a/README.md +++ b/README.md @@ -406,6 +406,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Micro](https://github.com/zyedidia/micro) - [Microsoft Azure CLI](https://github.com/Azure/azure-xplat-cli) - [Microsoft Remote Desktop](https://itunes.apple.com/us/app/microsoft-remote-desktop-10/id1295203466) +- [mitmproxy](https://mitmproxy.org/) - [mkcert](https://github.com/FiloSottile/mkcert) - [MonoDevelop](http://www.monodevelop.com) - [Moom](http://manytricks.com/moom/) diff --git a/mackup/applications/mitmproxy.cfg b/mackup/applications/mitmproxy.cfg new file mode 100644 index 000000000..6ab38a75b --- /dev/null +++ b/mackup/applications/mitmproxy.cfg @@ -0,0 +1,5 @@ +[application] +name = mitmproxy + +[configuration_files] +.mitmproxy/config.yaml From c2f35576959e460f2af3f40f9f25a36926f48525 Mon Sep 17 00:00:00 2001 From: Chris <7539871+paxperscientiam@users.noreply.github.com> Date: Sat, 29 Feb 2020 13:50:32 -0500 Subject: [PATCH 159/406] Added missing config file reference for jrnl (#1491) Co-authored-by: Laurent Raufaste --- README.md | 2 +- mackup/applications/jrnl.cfg | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5624b0734..7a41aa208 100644 --- a/README.md +++ b/README.md @@ -350,7 +350,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [iTunes Scripts](https://www.apple.com/) - [Janus](https://github.com/carlhuda/janus) - [Jitouch](http://www.jitouch.com/) -- [jrnl](http://maebert.github.io/jrnl/) +- [jrnl](https://jrnl.sh) - [JS Beautifier](https://github.com/beautify-web/js-beautify) - [JSHint](http://jshint.com/) - [Julia](http://julialang.org) diff --git a/mackup/applications/jrnl.cfg b/mackup/applications/jrnl.cfg index d09c8fe3f..7348f488e 100644 --- a/mackup/applications/jrnl.cfg +++ b/mackup/applications/jrnl.cfg @@ -3,3 +3,6 @@ name = jrnl [configuration_files] .jrnl_config + +[xdg_configuration_files] +jrnl/jrnl.yaml From a449f1ed62930c2fdbb0fe54dacf78599b5eb78b Mon Sep 17 00:00:00 2001 From: Jamie Rolfs Date: Sat, 29 Feb 2020 11:09:11 -0800 Subject: [PATCH 160/406] Add support for Hocus Focus (#1485) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/hocus-focus.cfg | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 mackup/applications/hocus-focus.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e3eacc2a1..fdd54966c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Added support for FiloSottile/mkcert (via @paxperscientiam) - Added support for GoodSync (via @cereallarceny) - Added support for mitmproxy (via @etiennelb) +- Added support for Hocus Focus (via @jrolfs) ## Mackup 0.8.28 diff --git a/README.md b/README.md index 7a41aa208..6f9b3bfe0 100644 --- a/README.md +++ b/README.md @@ -176,6 +176,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Android Studio](https://developer.android.com/sdk/) - [Ansible](http://www.ansible.com/) - [AppCleaner](http://freemacsoft.net/appcleaner/) +- [Hocus Focus](http://hocusfoc.us/) - [AppCode](http://www.jetbrains.com/objc/) - [Apple Music](https://www.apple.com/apple-music/) - [Apptivate](http://www.apptivateapp.com/) diff --git a/mackup/applications/hocus-focus.cfg b/mackup/applications/hocus-focus.cfg new file mode 100644 index 000000000..a0820d335 --- /dev/null +++ b/mackup/applications/hocus-focus.cfg @@ -0,0 +1,8 @@ +[application] +name = Hocus Focus + +[configuration_files] +Library/Preferences/com.uglyapps.HocusFocus.plist +Library/Application Support/com.uglyapps.HocusFocusHocusFocus.db +Library/Application Support/com.uglyapps.HocusFocusHocusFocus.db-shm +Library/Application Support/com.uglyapps.HocusFocusHocusFocus.db-wal From 42e1ca22a35661b5d22cc28cbe126845d14ce2a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tar=C4=B1k=20Taha=20UYGUN?= Date: Sun, 1 Mar 2020 00:53:06 +0300 Subject: [PATCH 161/406] TripMode support (#1480) * tripMode support * Update tripmode.cfg * Update CHANGELOG.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/tripmode.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/tripmode.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index fdd54966c..efd5943d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Added support for GoodSync (via @cereallarceny) - Added support for mitmproxy (via @etiennelb) - Added support for Hocus Focus (via @jrolfs) +- Added support for TripMode (via @ttuygun) ## Mackup 0.8.28 diff --git a/README.md b/README.md index 6f9b3bfe0..f4908cd2b 100644 --- a/README.md +++ b/README.md @@ -577,6 +577,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Tower](http://www.git-tower.com/) - [Transmission](http://www.transmissionbt.com/) - [Transmit](http://panic.com/transmit/) +- [TripMode](https://www.tripmode.ch) - [Tunnelblick](https://tunnelblick.net) - [tvnamer](https://github.com/dbr/tvnamer) - [Twitterrific](http://twitterrific.com/) diff --git a/mackup/applications/tripmode.cfg b/mackup/applications/tripmode.cfg new file mode 100644 index 000000000..46721fc8b --- /dev/null +++ b/mackup/applications/tripmode.cfg @@ -0,0 +1,5 @@ +[application] +name = TripMode + +[configuration_files] +Library/Application Support/TripMode From 1e067bac446d7ad884c4839f393e39a170ac280c Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Mon, 2 Mar 2020 00:47:32 +0100 Subject: [PATCH 162/406] Update bundle identifier (#1483) --- mackup/applications/go2shell.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/go2shell.cfg b/mackup/applications/go2shell.cfg index 442e9451d..cb25f8e8f 100644 --- a/mackup/applications/go2shell.cfg +++ b/mackup/applications/go2shell.cfg @@ -2,4 +2,4 @@ name = Go2Shell [configuration_files] -Library/Preferences/com.alice.mac.go2shell.plist +Library/Preferences/com.zipzapmac.Go2Shell.plist From b53cbb9f652e44dc7f862c85b1bdea9d5b20df97 Mon Sep 17 00:00:00 2001 From: Callum Mellor-Reed Date: Sun, 1 Mar 2020 23:56:11 +0000 Subject: [PATCH 163/406] Add Starship support (#1482) * Add Starship support * Update starship.cfg Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/starship.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/starship.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index efd5943d5..6dd4e163b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for mitmproxy (via @etiennelb) - Added support for Hocus Focus (via @jrolfs) - Added support for TripMode (via @ttuygun) +- Added support for Starship (via @callummr) ## Mackup 0.8.28 diff --git a/README.md b/README.md index f4908cd2b..46fa326f5 100644 --- a/README.md +++ b/README.md @@ -542,6 +542,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Splice](https://splice.com/) - [Spotify Notifications](http://spotify-notifications.citruspi.io/) - [Spotify](https://www.spotify.com/) +- [Starship](https://starship.rs/) - [Startupizer2](http://appledoc.gentlebytes.com/startupizer/) - [Stata](http://www.stata.com/) - [Stay](https://cordlessdog.com/stay/) diff --git a/mackup/applications/starship.cfg b/mackup/applications/starship.cfg new file mode 100644 index 000000000..2e55ed92d --- /dev/null +++ b/mackup/applications/starship.cfg @@ -0,0 +1,6 @@ +[application] +name = Starship + +[configuration_files] +# .config is hardcoded, see https://github.com/starship/starship/blob/1eabd527252291398df5749d30f3459ea2a03823/src/config.rs#L184 +.config/starship.toml From 35a47a565d458b573e28f0b0e8e4e62bbc974ded Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 4 Mar 2020 16:04:50 -0500 Subject: [PATCH 164/406] add fincky support (#1537) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/finicky.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/finicky.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 6dd4e163b..be7e70de0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Added support for Kaggle (via @ryoppippi) - Added support for SBT 1.0 (via @austek) - Added support for FiloSottile/mkcert (via @paxperscientiam) +- Added support for Finicky (via @ryoppippi) - Added support for GoodSync (via @cereallarceny) - Added support for mitmproxy (via @etiennelb) - Added support for Hocus Focus (via @jrolfs) diff --git a/README.md b/README.md index 46fa326f5..56b0f7f89 100644 --- a/README.md +++ b/README.md @@ -284,6 +284,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [fastlane](https://fastlane.tools) - [Feeds](http://www.feedsapp.com/) - [FileZilla](https://filezilla-project.org/) +- [Finicky](https://github.com/johnste/finicky) - [Fish](http://fishshell.com/) - [Fisher](https://github.com/jorgebucaran/fisher) - [FlexGet](http://flexget.com/) diff --git a/mackup/applications/finicky.cfg b/mackup/applications/finicky.cfg new file mode 100644 index 000000000..7608aac24 --- /dev/null +++ b/mackup/applications/finicky.cfg @@ -0,0 +1,5 @@ +[application] +name = fincky + +[configuration_files] +.finicky.js From b7e0bef6f3686c5e1e8fb11faf5534cd6a8ed6c5 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 4 Mar 2020 16:23:36 -0500 Subject: [PATCH 165/406] Allow mackup to be run as superuser with explicit flag (#1535) Co-authored-by: Laurent Raufaste --- mackup/mackup.py | 9 +++++---- mackup/main.py | 5 +++++ mackup/utils.py | 3 +++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/mackup/mackup.py b/mackup/mackup.py index 4a5300059..c60184353 100644 --- a/mackup/mackup.py +++ b/mackup/mackup.py @@ -28,11 +28,12 @@ def __init__(self): def check_for_usable_environment(self): """Check if the current env is usable and has everything's required.""" - # Do not let the user run Mackup as root - if os.geteuid() == 0: + # Allow only explicit superuser usage + if os.geteuid() == 0 and not utils.CAN_RUN_AS_ROOT: utils.error( - "Running Mackup as a superuser is useless and" - " dangerous. Don't do it!" + "Running Mackup as superuser can be dangerous." + " Don't do it unless you know what you're doing!" + " Run mackup --help for guidance." ) # Do we have a folder to put the Mackup folder ? diff --git a/mackup/main.py b/mackup/main.py index bffbd73dc..b07a91224 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -15,6 +15,7 @@ Options: -h --help Show this screen. -f --force Force every question asked to be answered with "Yes". + -r --root Allow mackup to be run as superuser. -n --dry-run Show steps without executing. -v --verbose Show additional details. --version Show version. @@ -73,6 +74,10 @@ def printAppHeader(app_name): if args["--force"]: utils.FORCE_YES = True + # Allow mackup to be run as root + if args["--root"]: + utils.CAN_RUN_AS_ROOT = True + dry_run = args["--dry-run"] verbose = args["--verbose"] diff --git a/mackup/utils.py b/mackup/utils.py index 61d49eefe..bcd2977e0 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -16,6 +16,9 @@ # If True, the user wants to say "yes" to everything. FORCE_YES = False +# Flag that control if mackup can be run as root +CAN_RUN_AS_ROOT = False + def confirm(question): """ From d8be30761df3fa8ebe8a93af610bc81800c82db3 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 4 Mar 2020 16:24:11 -0500 Subject: [PATCH 166/406] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index be7e70de0..8b91e5256 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Added support for Hocus Focus (via @jrolfs) - Added support for TripMode (via @ttuygun) - Added support for Starship (via @callummr) +- Added the `--root` command line option ## Mackup 0.8.28 From 53501958b55e46cadac2404dd12fb73c38382394 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Fri, 6 Mar 2020 17:43:51 -0500 Subject: [PATCH 167/406] Removed support for Sketch (#1539) --- CHANGELOG.md | 1 + README.md | 1 - mackup/applications/sketch.cfg | 6 ------ 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 mackup/applications/sketch.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b91e5256..38f7380dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Added support for TripMode (via @ttuygun) - Added support for Starship (via @callummr) - Added the `--root` command line option +- Removed support for Sketch ## Mackup 0.8.28 diff --git a/README.md b/README.md index 56b0f7f89..c3d9fae6b 100644 --- a/README.md +++ b/README.md @@ -524,7 +524,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [SHSH Blobs](https://en.wikipedia.org/wiki/SHSH_blob) - [Shuttle](http://fitztrev.github.io/shuttle/) - [SizeUp](http://www.irradiatedsoftware.com/sizeup/) -- [Sketch](http://sketchapp.com/) - [skhd](https://github.com/koekeishiya/skhd/) - [Skim](http://skim-app.sourceforge.net/) - [Skitch](https://evernote.com/skitch/) diff --git a/mackup/applications/sketch.cfg b/mackup/applications/sketch.cfg deleted file mode 100644 index 86ad6b99b..000000000 --- a/mackup/applications/sketch.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[application] -name = Sketch - -[configuration_files] -Library/Application Support/com.bohemiancoding.sketch3 -Library/Preferences/com.bohemiancoding.sketch3.plist From 3f9854a9dffc6f17d586ca0b09252b3fc40b8b6a Mon Sep 17 00:00:00 2001 From: Ophir Radnitz Date: Tue, 10 Mar 2020 18:16:21 +0200 Subject: [PATCH 168/406] Added IntelliJ 2019.3 & 2020.1 (#1541) The default configuration directory for 2020.1 (and up) has changed according to https://intellij-support.jetbrains.com/hc/en-us/articles/206544519-Directories-used-by-the-IDE-to-store-settings-caches-plugins-and-logs --- mackup/applications/intellijidea.cfg | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mackup/applications/intellijidea.cfg b/mackup/applications/intellijidea.cfg index 66fe98e81..2024b5b4b 100644 --- a/mackup/applications/intellijidea.cfg +++ b/mackup/applications/intellijidea.cfg @@ -59,3 +59,8 @@ IdeaIC2019.2/config Library/Preferences/IntelliJIdea2019.2 Library/Application Support/IntelliJIdea2019.2 IntelliJIdea2019.2/config +IdeaIC2019.3/config +Library/Preferences/IntelliJIdea2019.3 +Library/Application Support/IntelliJIdea2019.3 +IntelliJIdea2019.3/config +Library/Application Support/JetBrains/IntelliJIdea2020.1 From 32815f0e1a738e7451510f3ace9de14bbdcfa1ed Mon Sep 17 00:00:00 2001 From: Shuhei KONDO Date: Fri, 20 Mar 2020 03:02:01 +0900 Subject: [PATCH 169/406] update tmuxinator configration path with xdg support (#1545) --- mackup/applications/tmuxinator.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mackup/applications/tmuxinator.cfg b/mackup/applications/tmuxinator.cfg index c72e2351a..f2b0ea738 100644 --- a/mackup/applications/tmuxinator.cfg +++ b/mackup/applications/tmuxinator.cfg @@ -1,5 +1,5 @@ [application] name = Tmuxinator -[configuration_files] -.tmuxinator +[xdg_configuration_files] +tmuxinator From f253d2c19f63796c405211ba19da5dfdd6cd6528 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 24 Mar 2020 14:19:01 -0400 Subject: [PATCH 170/406] Update packages --- Pipfile.lock | 103 ++++++++++++++++++++++----------------------------- 1 file changed, 44 insertions(+), 59 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index ac27789f5..e8c77e425 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -33,10 +33,10 @@ "develop": { "bleach": { "hashes": [ - "sha256:44f69771e2ac81ff30d929d485b7f9919f3ad6d019b6b20c74f3b8687c3f70df", - "sha256:aa8b870d0f46965bac2c073a93444636b0e1ca74e9777e34f03dd494b8a59d48" + "sha256:53165a6596e7899c4338d847315fec508110a53bd6fd15c127c2e0d0860264e3", + "sha256:f8dfd8a7e26443e986c4e44df31870da8e906ea61096af06ba5d5cc2d519842a" ], - "version": "==3.1.1" + "version": "==3.1.3" }, "certifi": { "hashes": [ @@ -54,40 +54,40 @@ }, "coverage": { "hashes": [ - "sha256:15cf13a6896048d6d947bf7d222f36e4809ab926894beb748fc9caa14605d9c3", - "sha256:1daa3eceed220f9fdb80d5ff950dd95112cd27f70d004c7918ca6dfc6c47054c", - "sha256:1e44a022500d944d42f94df76727ba3fc0a5c0b672c358b61067abb88caee7a0", - "sha256:25dbf1110d70bab68a74b4b9d74f30e99b177cde3388e07cc7272f2168bd1477", - "sha256:3230d1003eec018ad4a472d254991e34241e0bbd513e97a29727c7c2f637bd2a", - "sha256:3dbb72eaeea5763676a1a1efd9b427a048c97c39ed92e13336e726117d0b72bf", - "sha256:5012d3b8d5a500834783689a5d2292fe06ec75dc86ee1ccdad04b6f5bf231691", - "sha256:51bc7710b13a2ae0c726f69756cf7ffd4362f4ac36546e243136187cfcc8aa73", - "sha256:527b4f316e6bf7755082a783726da20671a0cc388b786a64417780b90565b987", - "sha256:722e4557c8039aad9592c6a4213db75da08c2cd9945320220634f637251c3894", - "sha256:76e2057e8ffba5472fd28a3a010431fd9e928885ff480cb278877c6e9943cc2e", - "sha256:77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef", - "sha256:7afad9835e7a651d3551eab18cbc0fdb888f0a6136169fbef0662d9cdc9987cf", - "sha256:9bea19ac2f08672636350f203db89382121c9c2ade85d945953ef3c8cf9d2a68", - "sha256:a8b8ac7876bc3598e43e2603f772d2353d9931709345ad6c1149009fd1bc81b8", - "sha256:b0840b45187699affd4c6588286d429cd79a99d509fe3de0f209594669bb0954", - "sha256:b26aaf69713e5674efbde4d728fb7124e429c9466aeaf5f4a7e9e699b12c9fe2", - "sha256:b63dd43f455ba878e5e9f80ba4f748c0a2156dde6e0e6e690310e24d6e8caf40", - "sha256:be18f4ae5a9e46edae3f329de2191747966a34a3d93046dbdf897319923923bc", - "sha256:c312e57847db2526bc92b9bfa78266bfbaabac3fdcd751df4d062cd4c23e46dc", - "sha256:c60097190fe9dc2b329a0eb03393e2e0829156a589bd732e70794c0dd804258e", - "sha256:c62a2143e1313944bf4a5ab34fd3b4be15367a02e9478b0ce800cb510e3bbb9d", - "sha256:cc1109f54a14d940b8512ee9f1c3975c181bbb200306c6d8b87d93376538782f", - "sha256:cd60f507c125ac0ad83f05803063bed27e50fa903b9c2cfee3f8a6867ca600fc", - "sha256:d513cc3db248e566e07a0da99c230aca3556d9b09ed02f420664e2da97eac301", - "sha256:d649dc0bcace6fcdb446ae02b98798a856593b19b637c1b9af8edadf2b150bea", - "sha256:d7008a6796095a79544f4da1ee49418901961c97ca9e9d44904205ff7d6aa8cb", - "sha256:da93027835164b8223e8e5af2cf902a4c80ed93cb0909417234f4a9df3bcd9af", - "sha256:e69215621707119c6baf99bda014a45b999d37602cb7043d943c76a59b05bf52", - "sha256:ea9525e0fef2de9208250d6c5aeeee0138921057cd67fcef90fbed49c4d62d37", - "sha256:fca1669d464f0c9831fd10be2eef6b86f5ebd76c724d1e0706ebdff86bb4adf0" + "sha256:03f630aba2b9b0d69871c2e8d23a69b7fe94a1e2f5f10df5049c0df99db639a0", + "sha256:046a1a742e66d065d16fb564a26c2a15867f17695e7f3d358d7b1ad8a61bca30", + "sha256:0a907199566269e1cfa304325cc3b45c72ae341fbb3253ddde19fa820ded7a8b", + "sha256:165a48268bfb5a77e2d9dbb80de7ea917332a79c7adb747bd005b3a07ff8caf0", + "sha256:1b60a95fc995649464e0cd48cecc8288bac5f4198f21d04b8229dc4097d76823", + "sha256:1f66cf263ec77af5b8fe14ef14c5e46e2eb4a795ac495ad7c03adc72ae43fafe", + "sha256:2e08c32cbede4a29e2a701822291ae2bc9b5220a971bba9d1e7615312efd3037", + "sha256:3844c3dab800ca8536f75ae89f3cf566848a3eb2af4d9f7b1103b4f4f7a5dad6", + "sha256:408ce64078398b2ee2ec08199ea3fcf382828d2f8a19c5a5ba2946fe5ddc6c31", + "sha256:443be7602c790960b9514567917af538cac7807a7c0c0727c4d2bbd4014920fd", + "sha256:4482f69e0701139d0f2c44f3c395d1d1d37abd81bfafbf9b6efbe2542679d892", + "sha256:4a8a259bf990044351baf69d3b23e575699dd60b18460c71e81dc565f5819ac1", + "sha256:513e6526e0082c59a984448f4104c9bf346c2da9961779ede1fc458e8e8a1f78", + "sha256:5f587dfd83cb669933186661a351ad6fc7166273bc3e3a1531ec5c783d997aac", + "sha256:62061e87071497951155cbccee487980524d7abea647a1b2a6eb6b9647df9006", + "sha256:641e329e7f2c01531c45c687efcec8aeca2a78a4ff26d49184dce3d53fc35014", + "sha256:65a7e00c00472cd0f59ae09d2fb8a8aaae7f4a0cf54b2b74f3138d9f9ceb9cb2", + "sha256:6ad6ca45e9e92c05295f638e78cd42bfaaf8ee07878c9ed73e93190b26c125f7", + "sha256:73aa6e86034dad9f00f4bbf5a666a889d17d79db73bc5af04abd6c20a014d9c8", + "sha256:7c9762f80a25d8d0e4ab3cb1af5d9dffbddb3ee5d21c43e3474c84bf5ff941f7", + "sha256:85596aa5d9aac1bf39fe39d9fa1051b0f00823982a1de5766e35d495b4a36ca9", + "sha256:86a0ea78fd851b313b2e712266f663e13b6bc78c2fb260b079e8b67d970474b1", + "sha256:8a620767b8209f3446197c0e29ba895d75a1e272a36af0786ec70fe7834e4307", + "sha256:922fb9ef2c67c3ab20e22948dcfd783397e4c043a5c5fa5ff5e9df5529074b0a", + "sha256:9fad78c13e71546a76c2f8789623eec8e499f8d2d799f4b4547162ce0a4df435", + "sha256:a37c6233b28e5bc340054cf6170e7090a4e85069513320275a4dc929144dccf0", + "sha256:c3fc325ce4cbf902d05a80daa47b645d07e796a80682c1c5800d6ac5045193e5", + "sha256:cda33311cb9fb9323958a69499a667bd728a39a7aa4718d7622597a44c4f1441", + "sha256:db1d4e38c9b15be1521722e946ee24f6db95b189d1447fa9ff18dd16ba89f732", + "sha256:eda55e6e9ea258f5e4add23bcf33dc53b2c319e70806e180aecbff8d90ea24de", + "sha256:f372cdbb240e09ee855735b9d85e7f50730dcfb6296b74b95a3e5dea0615c4c1" ], "index": "pypi", - "version": "==5.0.3" + "version": "==5.0.4" }, "docutils": { "hashes": [ @@ -103,20 +103,12 @@ ], "version": "==2.9" }, - "importlib-metadata": { - "hashes": [ - "sha256:06f5b3a99029c7134207dd882428a66992a9de2bef7c2b699b5641f9886c3302", - "sha256:b97607a1a18a5100839aec1dc26a1ea17ee0d93b20b0f008d80a5a050afb200b" - ], - "markers": "python_version < '3.8'", - "version": "==1.5.0" - }, "keyring": { "hashes": [ - "sha256:1f393f7466314068961c7e1d508120c092bd71fa54e3d93b76180b526d4abc56", - "sha256:24ae23ab2d6adc59138339e56843e33ec7b0a6b2f06302662477085c6c0aca00" + "sha256:197fd5903901030ef7b82fe247f43cfed2c157a28e7747d1cfcf4bc5e699dd03", + "sha256:8179b1cdcdcbc221456b5b74e6b7cfa06f8dd9f239eb81892166d9223d82c5ba" ], - "version": "==21.1.0" + "version": "==21.2.0" }, "nose": { "hashes": [ @@ -136,17 +128,17 @@ }, "pygments": { "hashes": [ - "sha256:2a3fe295e54a20164a9df49c75fa58526d3be48e14aceba6d6b1e8ac0bfd6f1b", - "sha256:98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe" + "sha256:647344a061c249a3b74e230c739f434d7ea4d8b1d5f3721bc0f3558049b38f44", + "sha256:ff7a40b4860b727ab48fad6360eb351cc1b33cbf9b15a0f689ca5353e9463324" ], - "version": "==2.5.2" + "version": "==2.6.1" }, "readme-renderer": { "hashes": [ - "sha256:bb16f55b259f27f75f640acf5e00cf897845a8b3e4731b5c1a436e4b8529202f", - "sha256:c8532b79afc0375a85f10433eca157d6b50f7d6990f337fa498c96cd4bfc203d" + "sha256:1b6d8dd1673a0b293766b4106af766b6eff3654605f9c4f239e65de6076bc222", + "sha256:e67d64242f0174a63c3b727801a2fff4c1f38ebe5d71d95ff7ece081945a6cd4" ], - "version": "==24.0" + "version": "==25.0" }, "requests": { "hashes": [ @@ -198,13 +190,6 @@ "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923" ], "version": "==0.5.1" - }, - "zipp": { - "hashes": [ - "sha256:12248a63bbdf7548f89cb4c7cda4681e537031eda29c02ea29674bc6854460c2", - "sha256:7c0f8e91abc0dc07a5068f315c52cb30c66bfbc581e5b50704c8a2f6ebae794a" - ], - "version": "==3.0.0" } } } From a90388f7e51fd343a93db2abf2cb3c5b9b6ba4e2 Mon Sep 17 00:00:00 2001 From: Rainy Date: Fri, 27 Mar 2020 04:09:13 +0800 Subject: [PATCH 171/406] Added support for Joplin (#1543) * Added support for Joplin * Update joplin.cfg --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/joplin.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/joplin.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 38f7380dd..a42d32fa0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Added support for Hocus Focus (via @jrolfs) - Added support for TripMode (via @ttuygun) - Added support for Starship (via @callummr) +- Added support for Joplin (via @geekrainy) - Added the `--root` command line option - Removed support for Sketch diff --git a/README.md b/README.md index c3d9fae6b..ef3521df1 100644 --- a/README.md +++ b/README.md @@ -352,6 +352,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [iTunes Scripts](https://www.apple.com/) - [Janus](https://github.com/carlhuda/janus) - [Jitouch](http://www.jitouch.com/) +- [Joplin](https://joplinapp.org/) - [jrnl](https://jrnl.sh) - [JS Beautifier](https://github.com/beautify-web/js-beautify) - [JSHint](http://jshint.com/) diff --git a/mackup/applications/joplin.cfg b/mackup/applications/joplin.cfg new file mode 100644 index 000000000..a3e5230ad --- /dev/null +++ b/mackup/applications/joplin.cfg @@ -0,0 +1,6 @@ +[application] +name = Joplin + +[xdg_configuration_files] +joplin-desktop/userchrome.css +joplin-desktop/userstyle.css From 09548e922c8b63ac763cba0eb799561b1b338764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Benoist?= Date: Wed, 1 Apr 2020 20:00:23 +0200 Subject: [PATCH 172/406] Small changes related to Storage paragraph (#1550) Separate the `Dropbox` sub-section from the introduction paragraph of `Storage` section. --- doc/README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/README.md b/doc/README.md index 71258b92c..8212eea43 100644 --- a/doc/README.md +++ b/doc/README.md @@ -11,15 +11,16 @@ vi ~/.mackup.cfg ## Storage -### Dropbox - You can specify the storage type Mackup will use to store your configuration files. -For now you have 4 options: `dropbox`, `google_drive`, `copy` and `file_system`. +For now you have 4 options: `dropbox`, `google_drive`, `icloud`, `copy` and `file_system`. + If none is specified, Mackup will try to use the default: `dropbox`. With the `dropbox` storage engine, Mackup will automatically figure out your Dropbox folder. +### Dropbox + ```ini [storage] engine = dropbox From 06b0dbd2fb1923f62ba6c0919740adf381237711 Mon Sep 17 00:00:00 2001 From: Vincent D Date: Sat, 4 Apr 2020 21:26:10 +0200 Subject: [PATCH 173/406] Update exercism (#1552) * update exercism support * newline at end of file... Co-authored-by: dayervi --- mackup/applications/exercism.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mackup/applications/exercism.cfg b/mackup/applications/exercism.cfg index 95e914b13..c5c522dda 100644 --- a/mackup/applications/exercism.cfg +++ b/mackup/applications/exercism.cfg @@ -3,3 +3,6 @@ name = Exercism [configuration_files] .exercism + +[xdg_configuration_files] +exercism From 63de28d258d846cdeffb341d0480a038386a5569 Mon Sep 17 00:00:00 2001 From: Valentino Cossar Date: Fri, 10 Apr 2020 02:54:57 +0200 Subject: [PATCH 174/406] Rename Rectangle app (#1553) --- mackup/applications/{Rectangle.cfg => rectangle.cfg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mackup/applications/{Rectangle.cfg => rectangle.cfg} (100%) diff --git a/mackup/applications/Rectangle.cfg b/mackup/applications/rectangle.cfg similarity index 100% rename from mackup/applications/Rectangle.cfg rename to mackup/applications/rectangle.cfg From 65461bb12fee13fdd75b2585bf2bc4ba3d095817 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 9 Apr 2020 20:55:33 -0400 Subject: [PATCH 175/406] No executable --- mackup/applications/mycli.cfg | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 mackup/applications/mycli.cfg diff --git a/mackup/applications/mycli.cfg b/mackup/applications/mycli.cfg old mode 100755 new mode 100644 From d91b09f6cdef8558a98354f11ac1eeca9c8932c5 Mon Sep 17 00:00:00 2001 From: Quang Luong Date: Mon, 13 Apr 2020 21:22:35 -0400 Subject: [PATCH 176/406] Add doom emacs (#1556) --- README.md | 1 + mackup/applications/doom-emacs.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/doom-emacs.cfg diff --git a/README.md b/README.md index ef3521df1..db2230554 100644 --- a/README.md +++ b/README.md @@ -264,6 +264,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Divvy](http://mizage.com/divvy/) - [Docker](https://www.docker.com/) - [Dolphin](https://dolphin-emu.org/) +- [Doom Emacs](https://github.com/hlissner/doom-emacs) - [Double Commander](http://doublecmd.sourceforge.net/) - [Doxie](http://www.getdoxie.com/) - [Droplr](https://droplr.com/) diff --git a/mackup/applications/doom-emacs.cfg b/mackup/applications/doom-emacs.cfg new file mode 100644 index 000000000..6cabdb01e --- /dev/null +++ b/mackup/applications/doom-emacs.cfg @@ -0,0 +1,5 @@ +[application] +name = Doom Emacs + +[configuration_files] +.doom.d From 2b14da49bea98bcde30fa2d1536d0cdc2c9f6595 Mon Sep 17 00:00:00 2001 From: ameyuuno Date: Tue, 14 Apr 2020 08:56:30 +0700 Subject: [PATCH 177/406] fixed links to README.md and CHANGELOG.md files in CONTRIBUTING.md (#1555) Before link opened page with 404 code because of they pointed to files in the current directory that did not exist. Added explicit links to files in repository. Co-authored-by: Laurent Raufaste --- .github/CONTRIBUTING.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index d7f4e1465..a347a9a0d 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -16,8 +16,8 @@ these guidelines: - Keep one application supported per PR - Add the application to the list of supported applications in - [README.md](README.md) -- Add your change to the WIP section of the [CHANGELOG.md](CHANGELOG.md) + [README.md][README.md] +- Add your change to the WIP section of the [CHANGELOG.md][CHANGELOG.md] - Sync configurations should follow the following principles: - Syncing should not break the application, and PRs should be tested - Syncing should not break any syncing functionality internal to the @@ -34,3 +34,5 @@ Thank you for your contribution! [TOFIX]: https://github.com/lra/mackup/labels/TOFIX [CODETRIAGE]: https://www.codetriage.com/lra/mackup [CODETRIAGE-IMG]: https://www.codetriage.com/lra/mackup/badges/users.svg +[README.md]: https://github.com/lra/mackup/blob/master/README.md +[CHANGELOG.md]: https://github.com/lra/mackup/blob/master/CHANGELOG.md From fcf13ee8b96f560e5e3c728ca5cf408295bee9de Mon Sep 17 00:00:00 2001 From: ameyuuno Date: Tue, 14 Apr 2020 09:00:16 +0700 Subject: [PATCH 178/406] Added support of PyCharm 2020 (#1554) * added support of PyCharm 2020 Directories used by the IDE to store settings was moved https://www.jetbrains.com/help/idea/2020.1/tuning-the-ide.html?_ga=2.75428818.1116905432.1586681336-733062730.1586681336#config-directory * updated CHANGELOG.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/pycharm.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a42d32fa0..c3e76f561 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Added support for Joplin (via @geekrainy) - Added the `--root` command line option - Removed support for Sketch +- Add support for PyCharm 2020.1 (via @ameyuuno) ## Mackup 0.8.28 diff --git a/mackup/applications/pycharm.cfg b/mackup/applications/pycharm.cfg index 89cb6c967..bef747772 100644 --- a/mackup/applications/pycharm.cfg +++ b/mackup/applications/pycharm.cfg @@ -19,3 +19,4 @@ Library/Preferences/PyCharm2019.3 Library/Application Support/PyCharm2019.2 Library/Application Support/PyCharm2019.3 .PyCharmCE2019.3/config +Library/Application Support/JetBrains/PyCharm2020.1 From fd380cf990292a525c50942c04bd9739983f017f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Spie=C3=9F?= Date: Wed, 15 Apr 2020 21:30:07 +0200 Subject: [PATCH 179/406] Add support for Tower 3 (#1557) --- mackup/applications/tower.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/tower.cfg b/mackup/applications/tower.cfg index b4bc45a14..cbf945751 100644 --- a/mackup/applications/tower.cfg +++ b/mackup/applications/tower.cfg @@ -3,4 +3,6 @@ name = Tower [configuration_files] Library/Application Support/Tower +Library/Application Support/com.fournova.Tower3 Library/Preferences/com.fournova.Tower.plist +Library/Preferences/com.fournova.Tower3.plist From 2925ff158ee69ac0ec93e820f6989fa4b8d9b7a7 Mon Sep 17 00:00:00 2001 From: ho-oto Date: Tue, 21 Apr 2020 02:45:58 +0900 Subject: [PATCH 180/406] Add support for Powerline (#1562) * Add support for Powerline * Add support for Powerline --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/powerline.cfg | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 mackup/applications/powerline.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index c3e76f561..1d2032c5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Added the `--root` command line option - Removed support for Sketch - Add support for PyCharm 2020.1 (via @ameyuuno) +- Add support for Powerline (via @ho-oto) ## Mackup 0.8.28 diff --git a/README.md b/README.md index db2230554..dfbd44a48 100644 --- a/README.md +++ b/README.md @@ -472,6 +472,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [PostgreSQL](http://www.postgresql.org/) - [Postico](https://eggerapps.at/postico/) - [Pow](http://pow.cx/) +- [Powerline](https://github.com/powerline/powerline) - [Powerline-shell](https://github.com/b-ryan/powerline-shell) - [Prezto](https://github.com/sorin-ionescu/prezto) - [Processing](https://processing.org/) diff --git a/mackup/applications/powerline.cfg b/mackup/applications/powerline.cfg new file mode 100644 index 000000000..fcf44a83b --- /dev/null +++ b/mackup/applications/powerline.cfg @@ -0,0 +1,8 @@ +[application] +name = Powerline + +[xdg_configuration_files] +powerline/config.json +powerline/colors.json +powerline/themes +powerline/colorschemes From 479351dbfdc1785ef3e2e33a7c33a7d7b0bf09d9 Mon Sep 17 00:00:00 2001 From: ho-oto Date: Tue, 21 Apr 2020 08:24:55 +0900 Subject: [PATCH 181/406] support Julia 1.0 (#1563) The location of config file of Julia has been moved at the time of v1.0 release. https://github.com/JuliaLang/julia/pull/26161 --- mackup/applications/julia.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/julia.cfg b/mackup/applications/julia.cfg index 8eb124285..2731ce39c 100644 --- a/mackup/applications/julia.cfg +++ b/mackup/applications/julia.cfg @@ -3,3 +3,4 @@ name = Julia [configuration_files] .juliarc.jl +.julia/config/startup.jl From 41dcdb849511116f5612cf8323ee7987f396c152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Spie=C3=9F?= Date: Mon, 27 Apr 2020 18:46:11 +0200 Subject: [PATCH 182/406] Add unified iStat Menus config (#1548) * Remove old istat-menus-5 config * Add new, universal istat-menus config * Update Changelog # Conflicts: # CHANGELOG.md * Update Readme --- CHANGELOG.md | 1 + README.md | 2 +- mackup/applications/{istat-menus-5.cfg => istat-menus.cfg} | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) rename mackup/applications/{istat-menus-5.cfg => istat-menus.cfg} (59%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d2032c5c..b7b77c92c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Added support for TripMode (via @ttuygun) - Added support for Starship (via @callummr) - Added support for Joplin (via @geekrainy) +- Added support for iStat Menus 6 and unified config files (via @lumaxis) - Added the `--root` command line option - Removed support for Sketch - Add support for PyCharm 2020.1 (via @ameyuuno) diff --git a/README.md b/README.md index dfbd44a48..8692fc7f3 100644 --- a/README.md +++ b/README.md @@ -346,7 +346,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [IntelliJIDEA](http://www.jetbrains.com/idea/) - [IPython](http://ipython.org/) - [Irssi](http://www.irssi.org/) -- [iStat Menus 5](https://bjango.com/mac/istatmenus/) +- [iStat Menus](https://bjango.com/mac/istatmenus/) - [Itsycal](https://github.com/sfsam/Itsycal) - [iTerm2](https://www.iterm2.com/) - [iTermocil](https://github.com/TomAnthony/itermocil) diff --git a/mackup/applications/istat-menus-5.cfg b/mackup/applications/istat-menus.cfg similarity index 59% rename from mackup/applications/istat-menus-5.cfg rename to mackup/applications/istat-menus.cfg index 78710a0e2..80a821d09 100644 --- a/mackup/applications/istat-menus-5.cfg +++ b/mackup/applications/istat-menus.cfg @@ -3,4 +3,6 @@ name = iStat Menus [configuration_files] Library/Preferences/com.bjango.istatmenus.plist +Library/Preferences/com.bjango.istatmenus.status.plist Library/Preferences/com.bjango.istatmenus5.extras.plist +Library/Preferences/com.bjango.istatmenus6.extras.plist From 2fb00251530616fdefdf8245272ef738885fedcd Mon Sep 17 00:00:00 2001 From: Barry Date: Tue, 28 Apr 2020 02:21:35 +0800 Subject: [PATCH 183/406] add yarn support (#1546) Co-authored-by: Laurent Raufaste --- README.md | 1 + mackup/applications/yarn.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/yarn.cfg diff --git a/README.md b/README.md index 8692fc7f3..f6cdecb28 100644 --- a/README.md +++ b/README.md @@ -622,6 +622,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Xonsh](https://xon.sh) - [XtraFinder](http://www.trankynam.com/xtrafinder/) - [yabai](https://github.com/koekeishiya/yabai) +- [yarn](https://yarnpkg.com) - [Yummy FTP](http://www.yummysoftware.com/) - [zabbix-cli](https://github.com/usit-gd/zabbix-cli) - [zathura](https://pwmt.org/projects/zathura/) diff --git a/mackup/applications/yarn.cfg b/mackup/applications/yarn.cfg new file mode 100644 index 000000000..fd5368610 --- /dev/null +++ b/mackup/applications/yarn.cfg @@ -0,0 +1,5 @@ +[application] +name = yarn + +[configuration_files] +.yarnrc From 9759aa5b1643734712fc3e06c217594a2b65b612 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 27 Apr 2020 14:22:15 -0400 Subject: [PATCH 184/406] Missing changelog line --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7b77c92c..373aac8ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,8 +18,9 @@ - Added support for iStat Menus 6 and unified config files (via @lumaxis) - Added the `--root` command line option - Removed support for Sketch -- Add support for PyCharm 2020.1 (via @ameyuuno) -- Add support for Powerline (via @ho-oto) +- Added support for PyCharm 2020.1 (via @ameyuuno) +- Added support for Powerline (via @ho-oto) +- Added support for Yarn (via @dhb52) ## Mackup 0.8.28 From 36f97ca2eda8833a677d10000b6cb83a9fb1a59e Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 27 Apr 2020 14:23:17 -0400 Subject: [PATCH 185/406] Update bleach --- Pipfile.lock | 94 ++++++++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index e8c77e425..ea1ec745f 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -33,17 +33,17 @@ "develop": { "bleach": { "hashes": [ - "sha256:53165a6596e7899c4338d847315fec508110a53bd6fd15c127c2e0d0860264e3", - "sha256:f8dfd8a7e26443e986c4e44df31870da8e906ea61096af06ba5d5cc2d519842a" + "sha256:cc8da25076a1fe56c3ac63671e2194458e0c4d9c7becfd52ca251650d517903c", + "sha256:e78e426105ac07026ba098f04de8abe9b6e3e98b5befbf89b51a5ef0a4292b03" ], - "version": "==3.1.3" + "version": "==3.1.4" }, "certifi": { "hashes": [ - "sha256:017c25db2a153ce562900032d5bc68e9f191e44e9a0f762f373977de9df1fbb3", - "sha256:25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f" + "sha256:1d987a998c75633c40847cc966fcf5904906c920a7f17ef374f5aa4282abd304", + "sha256:51fcb31174be6e6664c5f69e3e1691a2d72a1a12e90f872cbdb1567eb47b6519" ], - "version": "==2019.11.28" + "version": "==2020.4.5.1" }, "chardet": { "hashes": [ @@ -54,40 +54,40 @@ }, "coverage": { "hashes": [ - "sha256:03f630aba2b9b0d69871c2e8d23a69b7fe94a1e2f5f10df5049c0df99db639a0", - "sha256:046a1a742e66d065d16fb564a26c2a15867f17695e7f3d358d7b1ad8a61bca30", - "sha256:0a907199566269e1cfa304325cc3b45c72ae341fbb3253ddde19fa820ded7a8b", - "sha256:165a48268bfb5a77e2d9dbb80de7ea917332a79c7adb747bd005b3a07ff8caf0", - "sha256:1b60a95fc995649464e0cd48cecc8288bac5f4198f21d04b8229dc4097d76823", - "sha256:1f66cf263ec77af5b8fe14ef14c5e46e2eb4a795ac495ad7c03adc72ae43fafe", - "sha256:2e08c32cbede4a29e2a701822291ae2bc9b5220a971bba9d1e7615312efd3037", - "sha256:3844c3dab800ca8536f75ae89f3cf566848a3eb2af4d9f7b1103b4f4f7a5dad6", - "sha256:408ce64078398b2ee2ec08199ea3fcf382828d2f8a19c5a5ba2946fe5ddc6c31", - "sha256:443be7602c790960b9514567917af538cac7807a7c0c0727c4d2bbd4014920fd", - "sha256:4482f69e0701139d0f2c44f3c395d1d1d37abd81bfafbf9b6efbe2542679d892", - "sha256:4a8a259bf990044351baf69d3b23e575699dd60b18460c71e81dc565f5819ac1", - "sha256:513e6526e0082c59a984448f4104c9bf346c2da9961779ede1fc458e8e8a1f78", - "sha256:5f587dfd83cb669933186661a351ad6fc7166273bc3e3a1531ec5c783d997aac", - "sha256:62061e87071497951155cbccee487980524d7abea647a1b2a6eb6b9647df9006", - "sha256:641e329e7f2c01531c45c687efcec8aeca2a78a4ff26d49184dce3d53fc35014", - "sha256:65a7e00c00472cd0f59ae09d2fb8a8aaae7f4a0cf54b2b74f3138d9f9ceb9cb2", - "sha256:6ad6ca45e9e92c05295f638e78cd42bfaaf8ee07878c9ed73e93190b26c125f7", - "sha256:73aa6e86034dad9f00f4bbf5a666a889d17d79db73bc5af04abd6c20a014d9c8", - "sha256:7c9762f80a25d8d0e4ab3cb1af5d9dffbddb3ee5d21c43e3474c84bf5ff941f7", - "sha256:85596aa5d9aac1bf39fe39d9fa1051b0f00823982a1de5766e35d495b4a36ca9", - "sha256:86a0ea78fd851b313b2e712266f663e13b6bc78c2fb260b079e8b67d970474b1", - "sha256:8a620767b8209f3446197c0e29ba895d75a1e272a36af0786ec70fe7834e4307", - "sha256:922fb9ef2c67c3ab20e22948dcfd783397e4c043a5c5fa5ff5e9df5529074b0a", - "sha256:9fad78c13e71546a76c2f8789623eec8e499f8d2d799f4b4547162ce0a4df435", - "sha256:a37c6233b28e5bc340054cf6170e7090a4e85069513320275a4dc929144dccf0", - "sha256:c3fc325ce4cbf902d05a80daa47b645d07e796a80682c1c5800d6ac5045193e5", - "sha256:cda33311cb9fb9323958a69499a667bd728a39a7aa4718d7622597a44c4f1441", - "sha256:db1d4e38c9b15be1521722e946ee24f6db95b189d1447fa9ff18dd16ba89f732", - "sha256:eda55e6e9ea258f5e4add23bcf33dc53b2c319e70806e180aecbff8d90ea24de", - "sha256:f372cdbb240e09ee855735b9d85e7f50730dcfb6296b74b95a3e5dea0615c4c1" + "sha256:00f1d23f4336efc3b311ed0d807feb45098fc86dee1ca13b3d6768cdab187c8a", + "sha256:01333e1bd22c59713ba8a79f088b3955946e293114479bbfc2e37d522be03355", + "sha256:0cb4be7e784dcdc050fc58ef05b71aa8e89b7e6636b99967fadbdba694cf2b65", + "sha256:0e61d9803d5851849c24f78227939c701ced6704f337cad0a91e0972c51c1ee7", + "sha256:1601e480b9b99697a570cea7ef749e88123c04b92d84cedaa01e117436b4a0a9", + "sha256:2742c7515b9eb368718cd091bad1a1b44135cc72468c731302b3d641895b83d1", + "sha256:2d27a3f742c98e5c6b461ee6ef7287400a1956c11421eb574d843d9ec1f772f0", + "sha256:402e1744733df483b93abbf209283898e9f0d67470707e3c7516d84f48524f55", + "sha256:5c542d1e62eece33c306d66fe0a5c4f7f7b3c08fecc46ead86d7916684b36d6c", + "sha256:5f2294dbf7875b991c381e3d5af2bcc3494d836affa52b809c91697449d0eda6", + "sha256:6402bd2fdedabbdb63a316308142597534ea8e1895f4e7d8bf7476c5e8751fef", + "sha256:66460ab1599d3cf894bb6baee8c684788819b71a5dc1e8fa2ecc152e5d752019", + "sha256:782caea581a6e9ff75eccda79287daefd1d2631cc09d642b6ee2d6da21fc0a4e", + "sha256:79a3cfd6346ce6c13145731d39db47b7a7b859c0272f02cdb89a3bdcbae233a0", + "sha256:7a5bdad4edec57b5fb8dae7d3ee58622d626fd3a0be0dfceda162a7035885ecf", + "sha256:8fa0cbc7ecad630e5b0f4f35b0f6ad419246b02bc750de7ac66db92667996d24", + "sha256:a027ef0492ede1e03a8054e3c37b8def89a1e3c471482e9f046906ba4f2aafd2", + "sha256:a3f3654d5734a3ece152636aad89f58afc9213c6520062db3978239db122f03c", + "sha256:a82b92b04a23d3c8a581fc049228bafde988abacba397d57ce95fe95e0338ab4", + "sha256:acf3763ed01af8410fc36afea23707d4ea58ba7e86a8ee915dfb9ceff9ef69d0", + "sha256:adeb4c5b608574a3d647011af36f7586811a2c1197c861aedb548dd2453b41cd", + "sha256:b83835506dfc185a319031cf853fa4bb1b3974b1f913f5bb1a0f3d98bdcded04", + "sha256:bb28a7245de68bf29f6fb199545d072d1036a1917dca17a1e75bbb919e14ee8e", + "sha256:bf9cb9a9fd8891e7efd2d44deb24b86d647394b9705b744ff6f8261e6f29a730", + "sha256:c317eaf5ff46a34305b202e73404f55f7389ef834b8dbf4da09b9b9b37f76dd2", + "sha256:dbe8c6ae7534b5b024296464f387d57c13caa942f6d8e6e0346f27e509f0f768", + "sha256:de807ae933cfb7f0c7d9d981a053772452217df2bf38e7e6267c9cbf9545a796", + "sha256:dead2ddede4c7ba6cb3a721870f5141c97dc7d85a079edb4bd8d88c3ad5b20c7", + "sha256:dec5202bfe6f672d4511086e125db035a52b00f1648d6407cc8e526912c0353a", + "sha256:e1ea316102ea1e1770724db01998d1603ed921c54a86a2efcb03428d5417e489", + "sha256:f90bfc4ad18450c80b024036eaf91e4a246ae287701aaa88eaebebf150868052" ], "index": "pypi", - "version": "==5.0.4" + "version": "==5.1" }, "docutils": { "hashes": [ @@ -135,10 +135,10 @@ }, "readme-renderer": { "hashes": [ - "sha256:1b6d8dd1673a0b293766b4106af766b6eff3654605f9c4f239e65de6076bc222", - "sha256:e67d64242f0174a63c3b727801a2fff4c1f38ebe5d71d95ff7ece081945a6cd4" + "sha256:cbe9db71defedd2428a1589cdc545f9bd98e59297449f69d721ef8f1cfced68d", + "sha256:cc4957a803106e820d05d14f71033092537a22daa4f406dfbdd61177e0936376" ], - "version": "==25.0" + "version": "==26.0" }, "requests": { "hashes": [ @@ -164,10 +164,10 @@ }, "tqdm": { "hashes": [ - "sha256:0d8b5afb66e23d80433102e9bd8b5c8b65d34c2a2255b2de58d97bd2ea8170fd", - "sha256:f35fb121bafa030bd94e74fcfd44f3c2830039a2ddef7fc87ef1c2d205237b24" + "sha256:00339634a22c10a7a22476ee946bbde2dbe48d042ded784e4d88e0236eca5d81", + "sha256:ea9e3fd6bd9a37e8783d75bfc4c1faf3c6813da6bd1c3e776488b41ec683af94" ], - "version": "==4.43.0" + "version": "==4.45.0" }, "twine": { "hashes": [ @@ -179,10 +179,10 @@ }, "urllib3": { "hashes": [ - "sha256:2f3db8b19923a873b3e5256dc9c2dedfa883e33d87c690d9c7913e1f40673cdc", - "sha256:87716c2d2a7121198ebcb7ce7cccf6ce5e9ba539041cfbaeecfb641dc0bf6acc" + "sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527", + "sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115" ], - "version": "==1.25.8" + "version": "==1.25.9" }, "webencodings": { "hashes": [ From d5bec973c54bc19f4de964b1ce2c01dc83c5ca18 Mon Sep 17 00:00:00 2001 From: mk-atlassian <47995834+mk-atlassian@users.noreply.github.com> Date: Thu, 30 Apr 2020 03:16:56 +1000 Subject: [PATCH 186/406] Add support for termite (#1569) Only include the config file and not the whole directory since it's unlikely there is supporting files. --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/termite.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/termite.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 373aac8ac..afdb0fb4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Added support for termite (via @mk-atlassian) - Added support for Calibre (via @ttuygun @bodak) - Added support for Poetry (via @ryoppippi) - Added support for Music (via @dnicolson) diff --git a/README.md b/README.md index f6cdecb28..df90fd1b0 100644 --- a/README.md +++ b/README.md @@ -564,6 +564,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Telegram for macOS](https://macos.telegram.org) - [Terminal](http://www.apple.com/osx/apps/) - [Terminator](https://launchpad.net/terminator/) +- [termite](https://github.com/thestinger/termite) - [TextExpander](https://smilesoftware.com/textexpander) - [TextMate](http://macromates.com/) - [Textual](http://www.codeux.com/textual/) diff --git a/mackup/applications/termite.cfg b/mackup/applications/termite.cfg new file mode 100644 index 000000000..6c83db357 --- /dev/null +++ b/mackup/applications/termite.cfg @@ -0,0 +1,5 @@ +[application] +name = termite + +[configuration_files] +termite/config From 6a6bf255041dec9c1e7c2e64334e0f11f1e8bdd0 Mon Sep 17 00:00:00 2001 From: mk-atlassian <47995834+mk-atlassian@users.noreply.github.com> Date: Fri, 1 May 2020 04:25:38 +1000 Subject: [PATCH 187/406] Add support for swaywm (#1566) Includes the whole sway config directory since there are often supporting scripts or config files. --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/swaywm.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/swaywm.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index afdb0fb4f..6f74619df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Added support for Swaywm (via @mk-atlassian) - Added support for termite (via @mk-atlassian) - Added support for Calibre (via @ttuygun @bodak) - Added support for Poetry (via @ryoppippi) diff --git a/README.md b/README.md index df90fd1b0..8bc2153f4 100644 --- a/README.md +++ b/README.md @@ -555,6 +555,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Subversion](http://subversion.apache.org/) - [SuperDuper!](http://www.shirt-pocket.com/SuperDuper/SuperDuperDescription.html) - [Surge](http://surge.run/manual/) +- [Sway](https://swaywm.org/) - [Swinsian](http://swinsian.com/) - [T](http://sferik.github.io/t/) - [TablePlus](https://tableplus.io) diff --git a/mackup/applications/swaywm.cfg b/mackup/applications/swaywm.cfg new file mode 100644 index 000000000..077c536c7 --- /dev/null +++ b/mackup/applications/swaywm.cfg @@ -0,0 +1,5 @@ +[application] +name = Swaywm + +[xdg_configuration_files] +sway From f667c8d9e4b245803952c07f94a98dbe305d6802 Mon Sep 17 00:00:00 2001 From: mk-atlassian <47995834+mk-atlassian@users.noreply.github.com> Date: Fri, 1 May 2020 04:30:09 +1000 Subject: [PATCH 188/406] Add support for mako (#1568) * Add support for mako Only includes the config file since it's unlikely that there will be other supporting config files. * Update mako.cfg Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/mako.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/mako.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f74619df..42b9a1bbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Added support for mako (via @mk-atlassian) - Added support for Swaywm (via @mk-atlassian) - Added support for termite (via @mk-atlassian) - Added support for Calibre (via @ttuygun @bodak) diff --git a/README.md b/README.md index 8bc2153f4..3e18c8294 100644 --- a/README.md +++ b/README.md @@ -398,6 +398,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Maid](https://github.com/benjaminoakes/maid/) - [Mailmate](http://freron.com/) - [Mailplane](http://mailplaneapp.com/) +- [mako](https://wayland.emersion.fr/mako/) - [Marked 2](http://marked2app.com) - [Marta](https://marta.yanex.org/) - [MATLAB](http://www.mathworks.com/products/matlab/) diff --git a/mackup/applications/mako.cfg b/mackup/applications/mako.cfg new file mode 100644 index 000000000..b611ce197 --- /dev/null +++ b/mackup/applications/mako.cfg @@ -0,0 +1,5 @@ +[application] +name = mako + +[xdg_configuration_files] +mako/config From 2aede236bf4c3e218550283e34c8c356e73e7267 Mon Sep 17 00:00:00 2001 From: mk-atlassian <47995834+mk-atlassian@users.noreply.github.com> Date: Fri, 1 May 2020 04:31:57 +1000 Subject: [PATCH 189/406] Add support for waybar (#1567) Includes the whole waybar config directory so that common supporting scripts are included. Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/waybar.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/waybar.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 42b9a1bbb..aec4a9a74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Added support for waybar (via @mk-atlassian) - Added support for mako (via @mk-atlassian) - Added support for Swaywm (via @mk-atlassian) - Added support for termite (via @mk-atlassian) diff --git a/README.md b/README.md index 3e18c8294..5aad2fa0e 100644 --- a/README.md +++ b/README.md @@ -606,6 +606,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [VLC](http://www.videolan.org/) - [Volt](https://github.com/vim-volt/volt) - [Wakatime](https://wakatime.com/) +- [waybar](https://github.com/Alexays/Waybar) - [WebStorm](https://www.jetbrains.com/webstorm/) - [Wget](https://www.gnu.org/software/wget/) - [WhatsApp Web](https://web.whatsapp.com/) diff --git a/mackup/applications/waybar.cfg b/mackup/applications/waybar.cfg new file mode 100644 index 000000000..339ec627e --- /dev/null +++ b/mackup/applications/waybar.cfg @@ -0,0 +1,5 @@ +[application] +name = waybar + +[xdg_configuration_files] +waybar From 51342a168deb2f3c531cec791a7dbd185c808c22 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 6 Jun 2020 00:45:51 -0400 Subject: [PATCH 190/406] Refactor CI (#1589) * CI Improvements * Matrix node tests * Job name nose-2.7 is invalid. * split lint and markdown --- .github/workflows/install.yaml | 21 ++++++++ .github/workflows/lint.yaml | 14 ++++++ .github/workflows/mackup.yaml | 86 --------------------------------- .github/workflows/markdown.yaml | 13 +++++ .github/workflows/test.yaml | 29 +++++++++++ 5 files changed, 77 insertions(+), 86 deletions(-) create mode 100644 .github/workflows/install.yaml create mode 100644 .github/workflows/lint.yaml delete mode 100644 .github/workflows/mackup.yaml create mode 100644 .github/workflows/markdown.yaml create mode 100644 .github/workflows/test.yaml diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml new file mode 100644 index 000000000..07615349d --- /dev/null +++ b/.github/workflows/install.yaml @@ -0,0 +1,21 @@ +name: Test installs +on: + - pull_request + - push + +jobs: + + install: + strategy: + matrix: + python-version: + - 2.7 + - 3.6 + - 3.7 + - 3.8 + runs-on: ubuntu-latest + container: python:${{ matrix.python-version }} + steps: + - uses: actions/checkout@v2 + - run: python setup.py install + - run: mackup --help diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml new file mode 100644 index 000000000..4502ca383 --- /dev/null +++ b/.github/workflows/lint.yaml @@ -0,0 +1,14 @@ +name: Lint Python +on: + - pull_request + - push + +jobs: + + black: + runs-on: ubuntu-latest + container: python + steps: + - run: pip install black + - uses: actions/checkout@v2 + - run: black --check --target-version py27 . diff --git a/.github/workflows/mackup.yaml b/.github/workflows/mackup.yaml deleted file mode 100644 index a273613c9..000000000 --- a/.github/workflows/mackup.yaml +++ /dev/null @@ -1,86 +0,0 @@ -name: Mackup -on: [push, pull_request] - -jobs: - - mdl: - runs-on: ubuntu-latest - container: rsrchboy/mdl - steps: - - uses: actions/checkout@v2 - - run: mdl . - - black: - runs-on: ubuntu-latest - container: python - steps: - - run: pip install black - - uses: actions/checkout@v2 - - run: black --check --target-version py27 . - - nose-2_7: - runs-on: ubuntu-latest - container: python:2.7 - steps: - - run: pip install docopt six nose - - uses: actions/checkout@v2 - - run: nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup - - nose-3_6: - runs-on: ubuntu-latest - container: python:3.6 - steps: - - run: pip install pipenv - - uses: actions/checkout@v2 - - run: pipenv install -d - - run: make test - - nose-3_7: - runs-on: ubuntu-latest - container: python:3.7 - steps: - - run: pip install pipenv - - uses: actions/checkout@v2 - - run: pipenv install -d - - run: make test - - nose-3_8: - runs-on: ubuntu-latest - container: python:3.8 - steps: - - run: pip install pipenv - - uses: actions/checkout@v2 - - run: pipenv install -d - - run: make test - - install-2_7: - runs-on: ubuntu-latest - container: python:2.7 - steps: - - uses: actions/checkout@v2 - - run: python setup.py install - - run: mackup --help - - install-3_6: - runs-on: ubuntu-latest - container: python:3.6 - steps: - - uses: actions/checkout@v2 - - run: python setup.py install - - run: mackup --help - - install-3_7: - runs-on: ubuntu-latest - container: python:3.7 - steps: - - uses: actions/checkout@v2 - - run: python setup.py install - - run: mackup --help - - install-3_8: - runs-on: ubuntu-latest - container: python:3.8 - steps: - - uses: actions/checkout@v2 - - run: python setup.py install - - run: mackup --help diff --git a/.github/workflows/markdown.yaml b/.github/workflows/markdown.yaml new file mode 100644 index 000000000..5b1e62b9a --- /dev/null +++ b/.github/workflows/markdown.yaml @@ -0,0 +1,13 @@ +name: Lint Markdown +on: + - pull_request + - push + +jobs: + + mdl: + runs-on: ubuntu-latest + container: rsrchboy/mdl + steps: + - uses: actions/checkout@v2 + - run: mdl . diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml new file mode 100644 index 000000000..430fe795d --- /dev/null +++ b/.github/workflows/test.yaml @@ -0,0 +1,29 @@ +name: Run tests +on: + - pull_request + - push + +jobs: + + nose-2_7: + runs-on: ubuntu-latest + container: python:2.7 + steps: + - run: pip install docopt six nose + - uses: actions/checkout@v2 + - run: nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup + + nose: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: + - 3.6 + - 3.7 + - 3.8 + container: python:${{ matrix.python-version }} + steps: + - run: pip install pipenv + - uses: actions/checkout@v2 + - run: pipenv install -d + - run: make test From b3386b104934407d35363402bcec6ef6603b5e58 Mon Sep 17 00:00:00 2001 From: Guillaume Algis Date: Sat, 6 Jun 2020 07:06:54 +0200 Subject: [PATCH 191/406] Add reminder to look at CONTIBUTING.md in doc/README.md (#1586) Co-authored-by: Laurent Raufaste --- doc/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/README.md b/doc/README.md index 8212eea43..879b0d76d 100644 --- a/doc/README.md +++ b/doc/README.md @@ -154,6 +154,9 @@ fork Mackup and open a [Pull Request](https://help.github.com/articles/using-pull-requests). The stock application configs are in the `mackup/applications` directory. +Remember to follow the guidelines in [CONTRIBUTING.md](https://github.com/lra/mackup/blob/master/.github/CONTRIBUTING.md) +to get your Pull Request merged faster. + ### Add support for an application or any file or directory You can customize the Mackup engine and add support for unsupported From 96f37e5657fc2473d9704cdecaa68c50ea5fda97 Mon Sep 17 00:00:00 2001 From: Guillaume Algis Date: Sat, 6 Jun 2020 07:10:11 +0200 Subject: [PATCH 192/406] Add support for Quitter (#1584) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/quitter.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/quitter.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index aec4a9a74..cb339dca1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - Added support for PyCharm 2020.1 (via @ameyuuno) - Added support for Powerline (via @ho-oto) - Added support for Yarn (via @dhb52) +- Add support for Quitter (via @guillaumealgis) ## Mackup 0.8.28 diff --git a/README.md b/README.md index 5aad2fa0e..10225a13f 100644 --- a/README.md +++ b/README.md @@ -486,6 +486,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [PyRadio](http://www.coderholic.com/pyradio/) - [Querious](http://www.araelium.com/querious/) - [Quicksilver](http://qsapp.com/) +- [Quitter](https://marco.org/apps) - [Qutebrowser](http://qutebrowser.org/) - [R](http://www.r-project.org/) - [Rails](http://rubyonrails.org/) diff --git a/mackup/applications/quitter.cfg b/mackup/applications/quitter.cfg new file mode 100644 index 000000000..1dae8b0c1 --- /dev/null +++ b/mackup/applications/quitter.cfg @@ -0,0 +1,5 @@ +[application] +name = Quitter + +[configuration_files] +Library/Preferences/com.marcoarment.quitter.plist From 4b6cec989f65c25160a6e21027308283420ca734 Mon Sep 17 00:00:00 2001 From: dalisoft Date: Sat, 6 Jun 2020 10:54:17 +0500 Subject: [PATCH 193/406] [WebStorm]: Add folders (for 2020.1) on macOS (#1578) Co-authored-by: Laurent Raufaste --- mackup/applications/webstorm.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/webstorm.cfg b/mackup/applications/webstorm.cfg index ce6f5e18e..a18ac928e 100644 --- a/mackup/applications/webstorm.cfg +++ b/mackup/applications/webstorm.cfg @@ -2,6 +2,7 @@ name = WebStorm [configuration_files] +Library/Application Support/WebStorm Library/Application Support/WebStorm8 Library/Preferences/WebStorm8 Library/Application Support/WebStorm9 @@ -40,3 +41,4 @@ Library/Application Support/WebStorm2020.2 Library/Preferences/WebStorm2020.2 Library/Application Support/WebStorm2020.3 Library/Preferences/WebStorm2020.3 +Library/Application Support/JetBrains/WebStorm2020.1 From 395296770090968bb876a4b935fbdc5996fc9328 Mon Sep 17 00:00:00 2001 From: dalisoft Date: Sat, 6 Jun 2020 10:56:18 +0500 Subject: [PATCH 194/406] [PyCharm]: Adding CE support (for 2020.1) on macOS (#1577) Co-authored-by: Laurent Raufaste --- mackup/applications/pycharm.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/pycharm.cfg b/mackup/applications/pycharm.cfg index bef747772..d0946853d 100644 --- a/mackup/applications/pycharm.cfg +++ b/mackup/applications/pycharm.cfg @@ -20,3 +20,5 @@ Library/Application Support/PyCharm2019.2 Library/Application Support/PyCharm2019.3 .PyCharmCE2019.3/config Library/Application Support/JetBrains/PyCharm2020.1 +Library/Application Support/JetBrains/PyCharmCE2020.1 +Library/Application Support/PyCharm From a8cc280c56336c348f19c902094eb451d7a0d4c5 Mon Sep 17 00:00:00 2001 From: yamatsum <42740055+yamatsum@users.noreply.github.com> Date: Sat, 6 Jun 2020 14:59:43 +0900 Subject: [PATCH 195/406] Update tmux configration path with xdg support (#1573) Co-authored-by: Laurent Raufaste --- mackup/applications/tmux.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mackup/applications/tmux.cfg b/mackup/applications/tmux.cfg index af8f5d27c..eecfa29c5 100644 --- a/mackup/applications/tmux.cfg +++ b/mackup/applications/tmux.cfg @@ -3,3 +3,6 @@ name = Tmux [configuration_files] .tmux.conf + +[xdg_configuration_files] +tmux/tmux.conf From 65b9d42dc7c818db1b5fd649a3901c298c3cce3c Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 6 Jun 2020 02:05:49 -0400 Subject: [PATCH 196/406] Mackup 0.8.29 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb339dca1..034793b6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.29 + - Added support for waybar (via @mk-atlassian) - Added support for mako (via @mk-atlassian) - Added support for Swaywm (via @mk-atlassian) diff --git a/mackup/constants.py b/mackup/constants.py index 5525e5119..2279545e7 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = "0.8.28" +VERSION = "0.8.29" # Support platforms PLATFORM_DARWIN = "Darwin" From 8ea1020c6800e0e69f442e590f5cdfd24b4426a7 Mon Sep 17 00:00:00 2001 From: Bouke Haarsma Date: Sat, 6 Jun 2020 10:08:51 +0200 Subject: [PATCH 197/406] GnuPG doesn't sync private keys anymore (#1021) (#1590) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 10225a13f..4759eae00 100644 --- a/README.md +++ b/README.md @@ -311,7 +311,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Gmail Notifr](http://ashchan.com/projects/gmail-notifr) - [GMVault](http://gmvault.org/) - [Gnome SSH Tunnel Manager](http://sourceforge.net/projects/gstm/) -- [GnuPG](https://www.gnupg.org/) (NOTE: includes private keys) +- [GnuPG](https://www.gnupg.org/) - [Go2Shell](http://zipzapmac.com/Go2Shell) - [GoLand](https://www.jetbrains.com/go/) - [Goldendict](http://goldendict.org/) From 710dbc026cab8c762fec561f7d02664a2c93a063 Mon Sep 17 00:00:00 2001 From: awkj Date: Sun, 7 Jun 2020 08:02:59 +0800 Subject: [PATCH 198/406] add support clashX (#1591) * add support clashX * Update CHANGELOG.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/clashx.cfg | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/clashx.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 034793b6d..2c525d4bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Added support for clashX (via @awkj) + ## Mackup 0.8.29 - Added support for waybar (via @mk-atlassian) diff --git a/README.md b/README.md index 4759eae00..766a0e82d 100644 --- a/README.md +++ b/README.md @@ -226,6 +226,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Choosy](https://www.choosyosx.com/) - [chunkwm](https://github.com/koekeishiya/chunkwm) - [Cider](https://github.com/msanders/cider) +- [ClashX](https://github.com/yichengchen/clashX) - [Clasp](https://github.com/google/clasp) - [Clementine](https://www.clementine-player.org/) - [CLion](https://www.jetbrains.com/clion/) diff --git a/mackup/applications/clashx.cfg b/mackup/applications/clashx.cfg new file mode 100644 index 000000000..4f7f80f9b --- /dev/null +++ b/mackup/applications/clashx.cfg @@ -0,0 +1,5 @@ +[application] +name = clashX + +[xdg_configuration_files] +clash From 8ea144cc68e4a131de05c1dcb915bdc216c05a55 Mon Sep 17 00:00:00 2001 From: Christoforus Benvenuto Date: Fri, 12 Jun 2020 19:28:35 -0700 Subject: [PATCH 199/406] feat: add support for brave browser (#1593) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/brave.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/brave.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c525d4bc..b87aff640 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Added support for clashX (via @awkj) +- Added support for Brave (via @cbenv) ## Mackup 0.8.29 diff --git a/README.md b/README.md index 766a0e82d..03651051c 100644 --- a/README.md +++ b/README.md @@ -211,6 +211,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Boto](https://github.com/boto/boto) - [Boxer](http://boxerapp.com) - [Brackets](http://brackets.io/) +- [Brave](https://brave.com/) - [Bump](https://github.com/fabiospampinato/bump) - [Bundler](http://bundler.io) - [Byobu](http://byobu.co/) diff --git a/mackup/applications/brave.cfg b/mackup/applications/brave.cfg new file mode 100644 index 000000000..599bcf41b --- /dev/null +++ b/mackup/applications/brave.cfg @@ -0,0 +1,5 @@ +[application] +name = Brave + +[configuration_files] +Library/Application Support/BraveSoftware/Brave-Browser/Default/Preferences From 58cce83f6e2f3569e2c7cadfc7b0326b62877b3c Mon Sep 17 00:00:00 2001 From: Lee Siong Chan Date: Mon, 22 Jun 2020 08:12:39 +0800 Subject: [PATCH 200/406] Add Nushell (#1596) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/nushell.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/nushell.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b87aff640..6e034ae9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Added support for clashX (via @awkj) - Added support for Brave (via @cbenv) +- Added support for Nushell (via @leesiongchan) ## Mackup 0.8.29 diff --git a/README.md b/README.md index 03651051c..05b9bf57b 100644 --- a/README.md +++ b/README.md @@ -439,6 +439,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Nomacs](http://nomacs.org/) - [NoSQLBooster for MongoDB](https://www.nosqlbooster.com/) - [npm](https://www.npmjs.com/) +- [Nushell](https://www.nushell.sh/) - [nvALT](http://brettterpstra.com/projects/nvalt/) - [nvpy](https://github.com/cpbotha/nvpy) - [Oh My Fish](https://github.com/bpinto/oh-my-fish) diff --git a/mackup/applications/nushell.cfg b/mackup/applications/nushell.cfg new file mode 100644 index 000000000..2aac9e84e --- /dev/null +++ b/mackup/applications/nushell.cfg @@ -0,0 +1,5 @@ +[application] +name = Nushell + +[xdg_configuration_files] +nu/config.toml From 12b4d7bc4a819c35d725547f63c3cbe20d489dc5 Mon Sep 17 00:00:00 2001 From: Jonathan Clerc <16090337+jclerc@users.noreply.github.com> Date: Sun, 28 Jun 2020 22:55:16 +0200 Subject: [PATCH 201/406] Don't sync paste history from Clipy (#1599) --- CHANGELOG.md | 1 + mackup/applications/clipy.cfg | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e034ae9a..5b5e6739b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Added support for clashX (via @awkj) - Added support for Brave (via @cbenv) - Added support for Nushell (via @leesiongchan) +- Updated support for Clipy (via @jclerc) ## Mackup 0.8.29 diff --git a/mackup/applications/clipy.cfg b/mackup/applications/clipy.cfg index 4ab6db013..bcf723cad 100644 --- a/mackup/applications/clipy.cfg +++ b/mackup/applications/clipy.cfg @@ -2,5 +2,4 @@ name = Clipy [configuration_files] -Library/Application Support/Clipy Library/Preferences/com.clipy-app.Clipy.plist From bb01e79ed542a62b31fb7212cfc4cd838f3190bf Mon Sep 17 00:00:00 2001 From: Gabriel Augendre Date: Sun, 5 Jul 2020 04:28:50 +0200 Subject: [PATCH 202/406] Add support for aerc (#1603) * Add support for aerc * Update aerc.cfg Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/aerc.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/aerc.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b5e6739b..70a77dbe6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Added support for Brave (via @cbenv) - Added support for Nushell (via @leesiongchan) - Updated support for Clipy (via @jclerc) +- Added support for aerc (via @Crocmagnon) ## Mackup 0.8.29 diff --git a/README.md b/README.md index 05b9bf57b..724d849ae 100644 --- a/README.md +++ b/README.md @@ -169,6 +169,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adobe Illustrator CC](https://www.adobe.com/products/illustrator.html) - [Adobe Photoshop CC](http://www.adobe.com/products/photoshop.html) - [Adobe Photoshop Lightroom CC](https://www.adobe.com/products/photoshop-lightroom.html) +- [aerc](https://aerc-mail.org/) - [Airmail](http://airmailapp.com/) - [Alacritty](https://github.com/jwilm/alacritty) - [Amethyst](https://ianyh.com/amethyst/) diff --git a/mackup/applications/aerc.cfg b/mackup/applications/aerc.cfg new file mode 100644 index 000000000..5f8f45fcb --- /dev/null +++ b/mackup/applications/aerc.cfg @@ -0,0 +1,5 @@ +[application] +name = aerc + +[configuration_files] +Library/Preferences/aerc From 65b970ca6f4d1266d2c15f5f59e526021a191187 Mon Sep 17 00:00:00 2001 From: Max Rydahl Andersen Date: Thu, 23 Jul 2020 14:10:53 +0200 Subject: [PATCH 203/406] add support for espanso (#1605) * add support for espanso * Update espanso.cfg Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/espanso.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/espanso.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 70a77dbe6..a1545a43b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Added support for Nushell (via @leesiongchan) - Updated support for Clipy (via @jclerc) - Added support for aerc (via @Crocmagnon) +- Added support for espanso (via @maxandersen) ## Mackup 0.8.29 diff --git a/README.md b/README.md index 724d849ae..926e0c18f 100644 --- a/README.md +++ b/README.md @@ -280,6 +280,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Environmental Station Alpha](http://www.hempuli.com/esa/) - [eqMac2](https://bitgapp.com/eqmac/) - [ESLint](https://eslint.org/) +- [espanso](https://espanso.org) - [Exercism](http://exercism.io/) - [ExpanDrive](http://www.expandrive.com/) - [Factorio](https://www.factorio.com) diff --git a/mackup/applications/espanso.cfg b/mackup/applications/espanso.cfg new file mode 100644 index 000000000..6cc81b817 --- /dev/null +++ b/mackup/applications/espanso.cfg @@ -0,0 +1,5 @@ +[application] +name = espanso + +[configuration_files] +Library/Preferences/espanso From 6b77f2b40c83e1a3858b12ed9955861a64bc0ac7 Mon Sep 17 00:00:00 2001 From: John Muchovej <5000729+ionlights@users.noreply.github.com> Date: Thu, 23 Jul 2020 17:20:34 -0400 Subject: [PATCH 204/406] Adding SpaceVim to Applications (#1602) * Adding SpaceVim to Applications [SpaceVim][sv] is a `vim` distribution that tries to mimic Spacemacs, but for `vim`. Configurations are stored in either: 1. `~/.SpaceVim.d/` 1. `$SPACEVIMDIR` ([see ref][sv-config]) The default is `~/.SpaceVim.d/`, so that's what makes sense for Mackup to support. [sv]: https://spacevim.org [sv-config]: https://spacevim.org/documentation/#custom-configuration * :sparkles: track adding SpaceVim in README/CHANGELOG Adding link to SpaceVim in README; Adding SpaceVim support to CHANGELOG Co-authored-by: John M Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/spacevim.cfg | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 mackup/applications/spacevim.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index a1545a43b..1647ee125 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Added support for SpaceVim (via @ionlights) - Added support for clashX (via @awkj) - Added support for Brave (via @cbenv) - Added support for Nushell (via @leesiongchan) diff --git a/README.md b/README.md index 926e0c18f..c2c56920c 100644 --- a/README.md +++ b/README.md @@ -546,6 +546,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [SourceTree](https://www.sourcetreeapp.com/) - [SpaceLauncher](https://spacelauncherapp.com/) - [Spacemacs](https://github.com/syl20bnr/spacemacs) +- [SpaceVim](https://github.com/SpaceVim/SpaceVim) - [Spark](http://www.shadowlab.org/softwares/spark.php) - [Spectacle](https://www.spectacleapp.com/) - [Spectrwm](https://github.com/conformal/spectrwm/wiki) diff --git a/mackup/applications/spacevim.cfg b/mackup/applications/spacevim.cfg new file mode 100644 index 000000000..33dd700ab --- /dev/null +++ b/mackup/applications/spacevim.cfg @@ -0,0 +1,8 @@ +[application] +name = SpaceVim + +[configuration_files] +# Default configuration directory +.SpaceVim.d +# Default configuration file; could be this specific or backup the config directory +# .SpaceVim.d/init.toml From 901eab685ed44fe3da42ad0a49ada2ba562244a1 Mon Sep 17 00:00:00 2001 From: Bryce Carr Date: Wed, 29 Jul 2020 06:07:19 +1000 Subject: [PATCH 205/406] correct the directory locations for WebStorm 2020.x and add 2019.4 (#1609) --- CHANGELOG.md | 1 + mackup/applications/webstorm.cfg | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1647ee125..ccf86d352 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Updated support for Clipy (via @jclerc) - Added support for aerc (via @Crocmagnon) - Added support for espanso (via @maxandersen) +- Added support for WebStorm versions 2019.4, 2020.2, 2020.3, 2020.4 (via @bdcarr) ## Mackup 0.8.29 diff --git a/mackup/applications/webstorm.cfg b/mackup/applications/webstorm.cfg index a18ac928e..9971d3a33 100644 --- a/mackup/applications/webstorm.cfg +++ b/mackup/applications/webstorm.cfg @@ -35,10 +35,11 @@ Library/Application Support/WebStorm2019.2 Library/Preferences/WebStorm2019.2 Library/Application Support/WebStorm2019.3 Library/Preferences/WebStorm2019.3 -Library/Application Support/WebStorm2020.1 -Library/Preferences/WebStorm2020.1 -Library/Application Support/WebStorm2020.2 -Library/Preferences/WebStorm2020.2 -Library/Application Support/WebStorm2020.3 -Library/Preferences/WebStorm2020.3 +Library/Application Support/WebStorm2019.3 +Library/Preferences/WebStorm2019.3 +Library/Application Support/WebStorm2019.4 +Library/Preferences/WebStorm2019.4 Library/Application Support/JetBrains/WebStorm2020.1 +Library/Application Support/JetBrains/WebStorm2020.2 +Library/Application Support/JetBrains/WebStorm2020.3 +Library/Application Support/JetBrains/WebStorm2020.4 From 009636eb2ab356f3f8009e5b442ed8a020200925 Mon Sep 17 00:00:00 2001 From: Sebastian Schmidt Date: Wed, 19 Aug 2020 21:10:29 +1000 Subject: [PATCH 206/406] Add beets (#1619) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/beets.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/beets.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ccf86d352..eabf7b4c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Added support for aerc (via @Crocmagnon) - Added support for espanso (via @maxandersen) - Added support for WebStorm versions 2019.4, 2020.2, 2020.3, 2020.4 (via @bdcarr) +- Added support for Beets (via @publicarray) ## Mackup 0.8.29 diff --git a/README.md b/README.md index c2c56920c..f1dac3a71 100644 --- a/README.md +++ b/README.md @@ -201,6 +201,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Bat](https://github.com/sharkdp/bat) - [Bc](https://www.gnu.org/software/bc/) - [Beatport Pro](https://www.beatport.com/desktop) +- [Beets](http://beets.io/) - [BetterSnapTool](http://www.boastr.net/) - [BetterTouchTool](http://www.boastr.net/) - [BibDesk](http://bibdesk.sourceforge.net/) diff --git a/mackup/applications/beets.cfg b/mackup/applications/beets.cfg new file mode 100644 index 000000000..e6af33f98 --- /dev/null +++ b/mackup/applications/beets.cfg @@ -0,0 +1,5 @@ +[application] +name = Beets + +[xdg_configuration_files] +beets/config.yaml From 6e4f09025881196c8e3e0066f7029800ac59ef93 Mon Sep 17 00:00:00 2001 From: Herb Brewer Date: Thu, 27 Aug 2020 14:46:05 +0800 Subject: [PATCH 207/406] add krew support (#1623) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/krew.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/krew.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index eabf7b4c0..b58058d3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Added support for espanso (via @maxandersen) - Added support for WebStorm versions 2019.4, 2020.2, 2020.3, 2020.4 (via @bdcarr) - Added support for Beets (via @publicarray) +- Added support for Krew (via @exherb) ## Mackup 0.8.29 diff --git a/README.md b/README.md index f1dac3a71..31a033788 100644 --- a/README.md +++ b/README.md @@ -379,6 +379,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [KeyRemap4MacBook](https://pqrs.org/osx/karabiner/) - [Khd](https://github.com/koekeishiya/khd/) - [kitty](https://sw.kovidgoyal.net/kitty/) +- [Krew](https://github.com/kubernetes-sigs/krew) - [Kubectl](https://kubernetes.io/docs/reference/kubectl/overview/) - [Kwm](https://koekeishiya.github.io/kwm/) - [LaTeXiT](http://www.chachatelier.fr/latexit/latexit-home.php?lang=en) diff --git a/mackup/applications/krew.cfg b/mackup/applications/krew.cfg new file mode 100644 index 000000000..11e530e2e --- /dev/null +++ b/mackup/applications/krew.cfg @@ -0,0 +1,5 @@ +[application] +name = Krew + +[configuration_files] +.krew From c03c2a2efa54ee964216d4811c8143182a0329ec Mon Sep 17 00:00:00 2001 From: Herb Brewer Date: Thu, 27 Aug 2020 19:49:42 +0800 Subject: [PATCH 208/406] add homebrew (#1622) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/homebrew.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/homebrew.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b58058d3f..5860eec41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for WebStorm versions 2019.4, 2020.2, 2020.3, 2020.4 (via @bdcarr) - Added support for Beets (via @publicarray) - Added support for Krew (via @exherb) +- Added support for Homebrew (via @exherb) ## Mackup 0.8.29 diff --git a/README.md b/README.md index 31a033788..fad04d52c 100644 --- a/README.md +++ b/README.md @@ -334,6 +334,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [HexChat](https://hexchat.github.io/) - [Hexels](http://hexraystudios.com/hexels/) - [Homebridge](https://github.com/nfarina/homebridge) +- [Homebrew](https://brew.sh) - [Houdini](http://uglyapps.co.uk/houdini/) - [Hstr](https://github.com/dvorka/hstr) - [Htop](http://htop.sourceforge.net/) diff --git a/mackup/applications/homebrew.cfg b/mackup/applications/homebrew.cfg new file mode 100644 index 000000000..96acceebe --- /dev/null +++ b/mackup/applications/homebrew.cfg @@ -0,0 +1,5 @@ +[application] +name = Homebrew + +[configuration_files] +.Brewfile From ac779ff38c9635a5680a76ebe3155f9c47e76dbb Mon Sep 17 00:00:00 2001 From: ameyuuno Date: Thu, 10 Sep 2020 11:52:56 +0300 Subject: [PATCH 209/406] fix extension of poetry config file Configuration of poetry is stored in toml file, not cfg. Based on its documentation https://python-poetry.org/docs/configuration/ --- mackup/applications/poetry.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/poetry.cfg b/mackup/applications/poetry.cfg index c0cb2c318..c78eec27e 100644 --- a/mackup/applications/poetry.cfg +++ b/mackup/applications/poetry.cfg @@ -2,4 +2,4 @@ name = poetry [configuration_files] -Library/Application Support/pypoetry/config.cfg +Library/Application Support/pypoetry/config.toml From bb1203515f86af75087510878ee861bfd77cf10a Mon Sep 17 00:00:00 2001 From: ameyuuno Date: Thu, 10 Sep 2020 11:55:38 +0300 Subject: [PATCH 210/406] update changelog file --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5860eec41..a40b856df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Added support for Beets (via @publicarray) - Added support for Krew (via @exherb) - Added support for Homebrew (via @exherb) +- Fixed support for poetry (via @ameyuuno) ## Mackup 0.8.29 From f9898288a3a65eeaa165b5ed358a133d47f028a3 Mon Sep 17 00:00:00 2001 From: Gilad Peleg Date: Sat, 7 Sep 2019 00:15:51 +0300 Subject: [PATCH 211/406] Add support for Netlify Fixes #1452 --- README.md | 1 + mackup/applications/netlify.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/netlify.cfg diff --git a/README.md b/README.md index fad04d52c..83e09bc50 100644 --- a/README.md +++ b/README.md @@ -439,6 +439,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [ncmpcpp](http://rybczak.net/ncmpcpp/) - [neovim](https://github.com/neovim/neovim) - [Nethack](http://www.nethack.org) +- [Netlify](https://www.netlify.com/) - [newsbeuter](http://newsbeuter.org/) - [ngrok](https://ngrok.com/) - [Nomacs](http://nomacs.org/) diff --git a/mackup/applications/netlify.cfg b/mackup/applications/netlify.cfg new file mode 100644 index 000000000..3282f52a7 --- /dev/null +++ b/mackup/applications/netlify.cfg @@ -0,0 +1,5 @@ +[application] +name = Netlify + +[configuration_files] +.netlify/config.json \ No newline at end of file From f94cfdf7dc9bfa6f8d649fb8583bff0259e78c4b Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 14 Sep 2020 13:53:17 -0400 Subject: [PATCH 212/406] Complete the PR --- CHANGELOG.md | 1 + mackup/applications/netlify.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5860eec41..19f35ee73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Added support for Beets (via @publicarray) - Added support for Krew (via @exherb) - Added support for Homebrew (via @exherb) +- Added support for Netlify (via @pgilad) ## Mackup 0.8.29 diff --git a/mackup/applications/netlify.cfg b/mackup/applications/netlify.cfg index 3282f52a7..83d4b0e30 100644 --- a/mackup/applications/netlify.cfg +++ b/mackup/applications/netlify.cfg @@ -2,4 +2,4 @@ name = Netlify [configuration_files] -.netlify/config.json \ No newline at end of file +.netlify/config.json From f5ee2fe34d17bfa06fa2acf6868aedc8d3d80270 Mon Sep 17 00:00:00 2001 From: "Tarek N. Elsamni" Date: Wed, 23 Sep 2020 18:25:07 +0100 Subject: [PATCH 213/406] Add support for K9s and p10k (#1636) * Add support for K9s and p10k * Sort in Readme.md * Update p10k.cfg Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 2 ++ README.md | 2 ++ mackup/applications/k9s.cfg | 5 +++++ mackup/applications/p10k.cfg | 5 +++++ 4 files changed, 14 insertions(+) create mode 100644 mackup/applications/k9s.cfg create mode 100644 mackup/applications/p10k.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 19f35ee73..3cef89624 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ - Added support for Krew (via @exherb) - Added support for Homebrew (via @exherb) - Added support for Netlify (via @pgilad) +- Added support for K9s (via @tareksamni) +- Added support for Powerlevel10k (via @tareksamni) ## Mackup 0.8.29 diff --git a/README.md b/README.md index 83e09bc50..27f0bf5ae 100644 --- a/README.md +++ b/README.md @@ -366,6 +366,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Julia](http://julialang.org) - [Jumpcut](http://jumpcut.sourceforge.net/) - [Jupyter](http://jupyter.org/) +- [K9s](https://github.com/derailed/k9s) - [Kaggle](https://kaggle.com/) - [Kaleidoscope](http://www.kaleidoscopeapp.com/) - [Karabiner Elements](https://github.com/tekezo/Karabiner-Elements) @@ -482,6 +483,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [PostgreSQL](http://www.postgresql.org/) - [Postico](https://eggerapps.at/postico/) - [Pow](http://pow.cx/) +- [Powerlevel10k](https://github.com/romkatv/powerlevel10k) - [Powerline](https://github.com/powerline/powerline) - [Powerline-shell](https://github.com/b-ryan/powerline-shell) - [Prezto](https://github.com/sorin-ionescu/prezto) diff --git a/mackup/applications/k9s.cfg b/mackup/applications/k9s.cfg new file mode 100644 index 000000000..b19ae9011 --- /dev/null +++ b/mackup/applications/k9s.cfg @@ -0,0 +1,5 @@ +[application] +name = K9s + +[configuration_files] +.k9s diff --git a/mackup/applications/p10k.cfg b/mackup/applications/p10k.cfg new file mode 100644 index 000000000..4703fa661 --- /dev/null +++ b/mackup/applications/p10k.cfg @@ -0,0 +1,5 @@ +[application] +name = p10k + +[configuration_files] +.p10k.zsh From 9d70f2f3da96f1993fef6095340d0608d43ff676 Mon Sep 17 00:00:00 2001 From: ameyuuno Date: Mon, 28 Sep 2020 15:32:23 +0300 Subject: [PATCH 214/406] add support pycharm 2020.(2, 3, 4) squash commits because of https://github.com/lra/mackup/pull/1629#pullrequestreview-497438964 --- CHANGELOG.md | 1 + mackup/applications/pycharm.cfg | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cef89624..de53b9349 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Added support for Beets (via @publicarray) - Added support for Krew (via @exherb) - Added support for Homebrew (via @exherb) +- Added support for PyCharm versions 2020.2, 2020.3, 2020.4 (via @ameyuuno) - Added support for Netlify (via @pgilad) - Added support for K9s (via @tareksamni) - Added support for Powerlevel10k (via @tareksamni) diff --git a/mackup/applications/pycharm.cfg b/mackup/applications/pycharm.cfg index d0946853d..01510a6e1 100644 --- a/mackup/applications/pycharm.cfg +++ b/mackup/applications/pycharm.cfg @@ -22,3 +22,6 @@ Library/Application Support/PyCharm2019.3 Library/Application Support/JetBrains/PyCharm2020.1 Library/Application Support/JetBrains/PyCharmCE2020.1 Library/Application Support/PyCharm +Library/Application Support/JetBrains/PyCharm2020.2 +Library/Application Support/JetBrains/PyCharm2020.3 +Library/Application Support/JetBrains/PyCharm2020.4 From e71c12903d9ada84bceed1bed5a680a1e486c55d Mon Sep 17 00:00:00 2001 From: fang duan Date: Sun, 18 Oct 2020 01:03:57 +0800 Subject: [PATCH 215/406] Add draft support (#1614) * Add draft support https://draft.sh/ * Update readme and changelog --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/draft.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/draft.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cef89624..d30230859 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Added support for aerc (via @Crocmagnon) - Added support for espanso (via @maxandersen) - Added support for WebStorm versions 2019.4, 2020.2, 2020.3, 2020.4 (via @bdcarr) +- Added support for draft (via @dfang) - Added support for Beets (via @publicarray) - Added support for Krew (via @exherb) - Added support for Homebrew (via @exherb) diff --git a/README.md b/README.md index 27f0bf5ae..6801565b9 100644 --- a/README.md +++ b/README.md @@ -271,6 +271,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Doom Emacs](https://github.com/hlissner/doom-emacs) - [Double Commander](http://doublecmd.sourceforge.net/) - [Doxie](http://www.getdoxie.com/) +- [Draft](https://draft.sh/) - [Droplr](https://droplr.com/) - [Dropzone 3](https://aptonic.com/dropzone3/) - [Drush](http://www.drush.org/) diff --git a/mackup/applications/draft.cfg b/mackup/applications/draft.cfg new file mode 100644 index 000000000..1c28adde9 --- /dev/null +++ b/mackup/applications/draft.cfg @@ -0,0 +1,5 @@ +[application] +name = Draft + +[configuration_files] +.draft/config.toml From 750fad36fadfb68d01d07ecdab9beba1469f1bbe Mon Sep 17 00:00:00 2001 From: Daniel Vivar Date: Tue, 17 Nov 2020 11:49:38 +0100 Subject: [PATCH 216/406] feat: new app npmrc --- README.md | 1 + mackup/applications/npmrc.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/npmrc.cfg diff --git a/README.md b/README.md index 6801565b9..1adc2d2a5 100644 --- a/README.md +++ b/README.md @@ -447,6 +447,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Nomacs](http://nomacs.org/) - [NoSQLBooster for MongoDB](https://www.nosqlbooster.com/) - [npm](https://www.npmjs.com/) +- [npmrc](https://github.com/deoxxa/npmrc/) - [Nushell](https://www.nushell.sh/) - [nvALT](http://brettterpstra.com/projects/nvalt/) - [nvpy](https://github.com/cpbotha/nvpy) diff --git a/mackup/applications/npmrc.cfg b/mackup/applications/npmrc.cfg new file mode 100644 index 000000000..2ed1e1c89 --- /dev/null +++ b/mackup/applications/npmrc.cfg @@ -0,0 +1,5 @@ +[application] +name = npmrc + +[configuration_files] +.npmrcs From ab53a10fb231a83d2a46caa8f3b10a23a5db040b Mon Sep 17 00:00:00 2001 From: Rainer Mager Date: Fri, 27 Nov 2020 16:35:30 +0900 Subject: [PATCH 217/406] added support for Visual Studior for Mac version 8 --- mackup/applications/vs4mac.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/vs4mac.cfg b/mackup/applications/vs4mac.cfg index 72a9dd624..e9424be49 100644 --- a/mackup/applications/vs4mac.cfg +++ b/mackup/applications/vs4mac.cfg @@ -5,3 +5,5 @@ name = Visual Studio for Mac Library/VisualStudio Library/Preferences/VisualStudio/7.0/EditingLayout.xml Library/Preferences/VisualStudio/7.0/MonoDevelopProperties.xml +Library/Preferences/VisualStudio/8.0/EditingLayout.xml +Library/Preferences/VisualStudio/8.0/MonoDevelopProperties.xml From 613bef3cd4bf41986908a16b09c880b845067d1f Mon Sep 17 00:00:00 2001 From: janniks Date: Thu, 17 Dec 2020 10:34:48 +0100 Subject: [PATCH 218/406] Add raycast --- mackup/applications/raycast.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/raycast.cfg diff --git a/mackup/applications/raycast.cfg b/mackup/applications/raycast.cfg new file mode 100644 index 000000000..767ed4d16 --- /dev/null +++ b/mackup/applications/raycast.cfg @@ -0,0 +1,5 @@ +[application] +name = Raycast + +[configuration_files] +Library/Preferences/com.raycast.macos.plist From 5f1e286f10f21c4b41f2381554158b75e071be7b Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Mon, 21 Dec 2020 08:23:20 +0800 Subject: [PATCH 219/406] Add support for zoxide --- mackup/applications/zoxide.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/zoxide.cfg diff --git a/mackup/applications/zoxide.cfg b/mackup/applications/zoxide.cfg new file mode 100644 index 000000000..4e2ca35ab --- /dev/null +++ b/mackup/applications/zoxide.cfg @@ -0,0 +1,5 @@ +[application] +name = zoxide + +[configuration_files] +Library/Application Support/zoxide From 8285a74f96c2d67d1a735130c8aa2375325d5795 Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Mon, 21 Dec 2020 08:24:09 +0800 Subject: [PATCH 220/406] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d30230859..6258c8147 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Added support for Netlify (via @pgilad) - Added support for K9s (via @tareksamni) - Added support for Powerlevel10k (via @tareksamni) +- Added support for zoxide (via @kidonng) ## Mackup 0.8.29 From 11723e9a69d0ca2b4e6596256630b450df737c7a Mon Sep 17 00:00:00 2001 From: Scott Sinclair Date: Sat, 2 Jan 2021 04:03:55 +1100 Subject: [PATCH 221/406] add additional file to little snitch configuration (#1672) --- mackup/applications/littlesnitch.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/littlesnitch.cfg b/mackup/applications/littlesnitch.cfg index d3ef2509f..f952d2abb 100644 --- a/mackup/applications/littlesnitch.cfg +++ b/mackup/applications/littlesnitch.cfg @@ -3,6 +3,7 @@ name = LittleSnitch [configuration_files] Library/Preferences/at.obdev.LittleSnitchNetworkMonitor.plist +Library/Preferences/at.obdev.littlesnitch.networkmonitor.plist Library/Application Support/Little Snitch/rules.usr.xpl Library/Application Support/Little Snitch/configuration.xpl Library/Application Support/Little Snitch/configuration.user.xpl From 19e26f0d93ddbf24eebd1ed3360aae49f0c4d616 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Fri, 1 Jan 2021 18:09:39 +0100 Subject: [PATCH 222/406] Remove support for Oh My Zsh (#1674) Fix #1384 --- README.md | 1 - mackup/applications/oh-my-zsh.cfg | 6 ------ 2 files changed, 7 deletions(-) delete mode 100644 mackup/applications/oh-my-zsh.cfg diff --git a/README.md b/README.md index 6801565b9..387e7a537 100644 --- a/README.md +++ b/README.md @@ -452,7 +452,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [nvpy](https://github.com/cpbotha/nvpy) - [Oh My Fish](https://github.com/bpinto/oh-my-fish) - [Oh My Tmux](https://github.com/gpakosz/.tmux) -- [Oh My Zsh](https://github.com/robbyrussell/oh-my-zsh) - [OmniFocus](https://www.omnigroup.com/omnifocus/) - [OmniGraffle](https://www.omnigroup.com/omnigraffle/) - [Openbox](http://openbox.org) diff --git a/mackup/applications/oh-my-zsh.cfg b/mackup/applications/oh-my-zsh.cfg deleted file mode 100644 index 37e8aa59d..000000000 --- a/mackup/applications/oh-my-zsh.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[application] -name = Oh My Zsh - -[configuration_files] -.oh-my-zsh/custom -.oh-my-zsh/completions From 30c4e5ff59cd0830eba6c8aff87dc7f6460ebad1 Mon Sep 17 00:00:00 2001 From: Qiangning Hong Date: Sat, 2 Jan 2021 03:31:48 +0800 Subject: [PATCH 223/406] fix: aria2 supports XDG_CONFIG_HOME (#1671) Quote from [aria2 documentation](https://aria2.github.io/manual/en/html/aria2c.html#aria2-conf): > By default, aria2 checks whether the legacy path > `$HOME/.aria2/aria2.conf` is present, otherwise it parses > `$XDG_CONFIG_HOME/aria2/aria2.conf` as its configuration file. Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/aria2c.cfg | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d30230859..15ff07a85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Added support for Netlify (via @pgilad) - Added support for K9s (via @tareksamni) - Added support for Powerlevel10k (via @tareksamni) +- Updated support for aria2 (via @hongqn) ## Mackup 0.8.29 diff --git a/mackup/applications/aria2c.cfg b/mackup/applications/aria2c.cfg index 14c3b30fa..ded172f65 100644 --- a/mackup/applications/aria2c.cfg +++ b/mackup/applications/aria2c.cfg @@ -3,3 +3,6 @@ name = aria2c [configuration_files] .aria2 + +[xdg_configuration_files] +aria2 From 482e195775bab7402ebe3501ac3deba7b4acc28f Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 2 Jan 2021 11:34:54 +0100 Subject: [PATCH 224/406] Scooby config/intellij (#1675) * Add config files for IntelliJ IDEA. * Add support for IntelliJ Ultimate Edition 2017.1 Co-authored-by: Ben Samuel --- CHANGELOG.md | 1 + mackup/applications/intellijidea.cfg | 102 +++++++++++++++------------ 2 files changed, 59 insertions(+), 44 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15ff07a85..086d3a915 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Added support for K9s (via @tareksamni) - Added support for Powerlevel10k (via @tareksamni) - Updated support for aria2 (via @hongqn) +- Update support for IntelliJ (via @scooby) ## Mackup 0.8.29 diff --git a/mackup/applications/intellijidea.cfg b/mackup/applications/intellijidea.cfg index 2024b5b4b..f24688d5d 100644 --- a/mackup/applications/intellijidea.cfg +++ b/mackup/applications/intellijidea.cfg @@ -3,64 +3,78 @@ name = IntelliJ IDEA [configuration_files] .IntelliJIdea12/config -Library/Application Support/IntelliJIdea12 -Library/Preferences/IntelliJIdea12 .IntelliJIdea13/config -Library/Application Support/IntelliJIdea13 -Library/Preferences/IntelliJIdea13 .IntelliJIdea14/config -Library/Application Support/IntelliJIdea14 -Library/Preferences/IntelliJIdea14 .IntelliJIdea15/config -Library/Application Support/IntelliJIdea15 -Library/Preferences/IntelliJIdea15 +IdeaIC2018.2/config +IdeaIC2018.3/config +IdeaIC2019.1/config +IdeaIC2019.2/config +IdeaIC2019.3/config IntelliJIdea2016.1/config -Library/Application Support/IntelliJIdea2016.1 -Library/Preferences/IntelliJIdea2016.1 -Library/Application Support/IdeaIC2016.1 -Library/Preferences/IdeaIC2016.1 -Library/Preferences/IntelliJIdea2016.2 -Library/Application Support/IntelliJIdea2016.2 IntelliJIdea2016.2/config -Library/Preferences/IntelliJIdea2016.3 -Library/Application Support/IntelliJIdea2016.3 IntelliJIdea2016.3/config -Library/Preferences/IntelliJIdea2017.1 -Library/Application Support/IntelliJIdea2017.1 IntelliJIdea2017.1/config -Library/Preferences/IntelliJIdea2017.2 -Library/Application Support/IntelliJIdea2017.2 IntelliJIdea2017.2/config -Library/Preferences/IntelliJIdea2017.3 -Library/Application Support/IntelliJIdea2017.3 IntelliJIdea2017.3/config -Library/Preferences/IntelliJIdea2018.1 -Library/Application Support/IntelliJIdea2018.1 IntelliJIdea2018.1/config -Library/Preferences/IdeaIC2018.2 -Library/Application Support/IdeaIC2018.2 -IdeaIC2018.2/config -Library/Preferences/IntelliJIdea2018.2 -Library/Application Support/IntelliJIdea2018.2 IntelliJIdea2018.2/config -Library/Preferences/IdeaIC2018.3 -Library/Application Support/IdeaIC2018.3 -IdeaIC2018.3/config -Library/Preferences/IntelliJIdea2018.3 -Library/Application Support/IntelliJIdea2018.3 IntelliJIdea2018.3/config -Library/Preferences/IdeaIC2019.1 +IntelliJIdea2019.1/config +IntelliJIdea2019.2/config +IntelliJIdea2019.3/config +Library/Application Support/IdeaIC2016.1 +Library/Application Support/IdeaIC2017.1 +Library/Application Support/IdeaIC2018.2 +Library/Application Support/IdeaIC2018.3 Library/Application Support/IdeaIC2019.1 -IdeaIC2019.1/config -Library/Preferences/IntelliJIdea2019.1 +Library/Application Support/IntelliJIdea12 +Library/Application Support/IntelliJIdea13 +Library/Application Support/IntelliJIdea14 +Library/Application Support/IntelliJIdea15 +Library/Application Support/IntelliJIdea2016.1 +Library/Application Support/IntelliJIdea2016.2 +Library/Application Support/IntelliJIdea2016.3 +Library/Application Support/IntelliJIdea2017.1 +Library/Application Support/IntelliJIdea2017.2 +Library/Application Support/IntelliJIdea2017.3 +Library/Application Support/IntelliJIdea2018.1 +Library/Application Support/IntelliJIdea2018.2 +Library/Application Support/IntelliJIdea2018.3 Library/Application Support/IntelliJIdea2019.1 -IntelliJIdea2019.1/config -IdeaIC2019.2/config -Library/Preferences/IntelliJIdea2019.2 Library/Application Support/IntelliJIdea2019.2 -IntelliJIdea2019.2/config -IdeaIC2019.3/config -Library/Preferences/IntelliJIdea2019.3 Library/Application Support/IntelliJIdea2019.3 -IntelliJIdea2019.3/config Library/Application Support/JetBrains/IntelliJIdea2020.1 +Library/Preferences/IdeaIC2016.1 +Library/Preferences/IdeaIC2016.2 +Library/Preferences/IdeaIC2016.3 +Library/Preferences/IdeaIC2017.1 +Library/Preferences/IdeaIC2017.2 +Library/Preferences/IdeaIC2017.3 +Library/Preferences/IdeaIC2018.2 +Library/Preferences/IdeaIC2018.3 +Library/Preferences/IdeaIC2019.1 +Library/Preferences/IntelliJIdea12 +Library/Preferences/IntelliJIdea13 +Library/Preferences/IntelliJIdea14 +Library/Preferences/IntelliJIdea15 +Library/Preferences/IntelliJIdea2016.1 +Library/Preferences/IntelliJIdea2016.2 +Library/Preferences/IntelliJIdea2016.3 +Library/Preferences/IntelliJIdea2017.1 +Library/Preferences/IntelliJIdea2017.2 +Library/Preferences/IntelliJIdea2017.3 +Library/Preferences/IntelliJIdea2018.1 +Library/Preferences/IntelliJIdea2018.2 +Library/Preferences/IntelliJIdea2018.3 +Library/Preferences/IntelliJIdea2019.1 +Library/Preferences/IntelliJIdea2019.2 +Library/Preferences/IntelliJIdea2019.3 +Library/Application Support/IdeaIC2017.1 +Library/Application Support/IntelliJIdea2017.1 +Library/Preferences/IntelliJIdea2017.2 +Library/Application Support/IdeaIC2017.2 +Library/Application Support/IntelliJIdea2017.2 +Library/Preferences/IntelliJIdea2017.3 +Library/Application Support/IdeaIC2017.3 +Library/Application Support/IntelliJIdea2017.3 From e82a260934dc1d4c879ce2bc326de86d16cbea74 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 3 Jan 2021 16:09:14 +0100 Subject: [PATCH 225/406] Clarify app name usage Fix #1670 --- doc/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/README.md b/doc/README.md index 879b0d76d..b9790e48c 100644 --- a/doc/README.md +++ b/doc/README.md @@ -121,6 +121,8 @@ ssh adium ``` +Use `mackup list` to get a list of valid application names. Don't use fancy names (with spaces) here. + A [sample](.mackup.cfg) of this file is available in this folder. Just copy it in your home folder: @@ -140,6 +142,8 @@ ssh adium ``` +Use `mackup list` to get a list of valid application names. Don't use fancy names (with spaces) here. + A [sample](.mackup.cfg) of this file is available in this folder. Just copy it in your home folder: From b124b906a1641ab43f9703bef981b49804b5e2e2 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 3 Jan 2021 16:11:55 +0100 Subject: [PATCH 226/406] Fix CI --- doc/README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/README.md b/doc/README.md index b9790e48c..566d32908 100644 --- a/doc/README.md +++ b/doc/README.md @@ -121,7 +121,8 @@ ssh adium ``` -Use `mackup list` to get a list of valid application names. Don't use fancy names (with spaces) here. +Use `mackup list` to get a list of valid application names. Don't use fancy +names (with spaces) here. A [sample](.mackup.cfg) of this file is available in this folder. Just copy it in your home folder: @@ -142,7 +143,8 @@ ssh adium ``` -Use `mackup list` to get a list of valid application names. Don't use fancy names (with spaces) here. +Use `mackup list` to get a list of valid application names. Don't use fancy +names (with spaces) here. A [sample](.mackup.cfg) of this file is available in this folder. Just copy it in your home folder: From 21550fe0d0edabc39f3b89da2d93495952a33405 Mon Sep 17 00:00:00 2001 From: Mariano Mollo Date: Sun, 3 Jan 2021 16:44:06 +0100 Subject: [PATCH 227/406] Support espanso on Linux (#1665) https://espanso.org/docs/get-started/#configuration Co-authored-by: Laurent Raufaste --- mackup/applications/espanso.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mackup/applications/espanso.cfg b/mackup/applications/espanso.cfg index 6cc81b817..5d0e073ae 100644 --- a/mackup/applications/espanso.cfg +++ b/mackup/applications/espanso.cfg @@ -3,3 +3,6 @@ name = espanso [configuration_files] Library/Preferences/espanso + +[xdg_configuration_files] +espanso From 7cd0d4311e0cef686f43aeb6aab9dabafc1960d8 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 3 Jan 2021 16:56:32 +0100 Subject: [PATCH 228/406] Update README and CHANGELOG --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 025662d5a..536e803e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ - Updated support for aria2 (via @hongqn) - Update support for IntelliJ (via @scooby) - Added support for zoxide (via @kidonng) +- Added support for Raycast (via @janniks) ## Mackup 0.8.29 diff --git a/README.md b/README.md index d219388c6..6029137bb 100644 --- a/README.md +++ b/README.md @@ -502,6 +502,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [R](http://www.r-project.org/) - [Rails](http://rubyonrails.org/) - [Ranger](https://ranger.github.io/) +- [Raycast](https://raycast.com/) - [Rclone](https://rclone.org/) - [Rectangle](https://rectangleapp.com/) - [Redshift Scheduler](https://github.com/spantaleev/redshift-scheduler) From 7e107c160a6732b2510528773c00ad3ff03196dc Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 3 Jan 2021 17:57:08 +0100 Subject: [PATCH 229/406] sort lines --- mackup/applications/pycharm.cfg | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/mackup/applications/pycharm.cfg b/mackup/applications/pycharm.cfg index 01510a6e1..ae050b77e 100644 --- a/mackup/applications/pycharm.cfg +++ b/mackup/applications/pycharm.cfg @@ -2,26 +2,26 @@ name = PyCharm [configuration_files] -.PyCharm40/config -Library/Application Support/PyCharm40 -Library/Preferences/PyCharm40 -.PyCharm50/config -Library/Application Support/PyCharm50 -Library/Preferences/PyCharm50 .PyCharm2016.1/config .PyCharm2016.2/config +.PyCharm40/config +.PyCharm50/config +.PyCharmCE2019.3/config +Library/Application Support/JetBrains/PyCharm2020.1 +Library/Application Support/JetBrains/PyCharm2020.2 +Library/Application Support/JetBrains/PyCharm2020.3 +Library/Application Support/JetBrains/PyCharm2020.4 +Library/Application Support/JetBrains/PyCharmCE2020.1 +Library/Application Support/PyCharm Library/Application Support/PyCharm2016.1 Library/Application Support/PyCharm2016.2 +Library/Application Support/PyCharm2019.2 +Library/Application Support/PyCharm2019.3 +Library/Application Support/PyCharm40 +Library/Application Support/PyCharm50 Library/Preferences/PyCharm2016.1 Library/Preferences/PyCharm2016.2 Library/Preferences/PyCharm2019.2 Library/Preferences/PyCharm2019.3 -Library/Application Support/PyCharm2019.2 -Library/Application Support/PyCharm2019.3 -.PyCharmCE2019.3/config -Library/Application Support/JetBrains/PyCharm2020.1 -Library/Application Support/JetBrains/PyCharmCE2020.1 -Library/Application Support/PyCharm -Library/Application Support/JetBrains/PyCharm2020.2 -Library/Application Support/JetBrains/PyCharm2020.3 -Library/Application Support/JetBrains/PyCharm2020.4 +Library/Preferences/PyCharm40 +Library/Preferences/PyCharm50 From 685569eba6e561c1596ef1f046e2dc5b0baea272 Mon Sep 17 00:00:00 2001 From: Josh Medeski Date: Sun, 3 Jan 2021 11:01:17 -0600 Subject: [PATCH 230/406] Add lazygit support (#1651) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/lazygit.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/lazygit.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 14d9aaa9a..dc350a8b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Updated support for Clipy (via @jclerc) - Added support for aerc (via @Crocmagnon) - Added support for espanso (via @maxandersen) +- Added support for lazygit (via @joshmedeski) - Added support for WebStorm versions 2019.4, 2020.2, 2020.3, 2020.4 (via @bdcarr) - Added support for draft (via @dfang) - Added support for Beets (via @publicarray) diff --git a/README.md b/README.md index 6029137bb..1223a7c4e 100644 --- a/README.md +++ b/README.md @@ -387,6 +387,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Kwm](https://koekeishiya.github.io/kwm/) - [LaTeXiT](http://www.chachatelier.fr/latexit/latexit-home.php?lang=en) - [LaunchBar](https://www.obdev.at/products/launchbar/index.html) +- [lazygit](https://github.com/jesseduffield/lazygit) - [Ledger](http://ledger-cli.org) - [LibreOffice](https://www.libreoffice.org/) - [Liftoff](https://github.com/thoughtbot/liftoff) diff --git a/mackup/applications/lazygit.cfg b/mackup/applications/lazygit.cfg new file mode 100644 index 000000000..e1d36345d --- /dev/null +++ b/mackup/applications/lazygit.cfg @@ -0,0 +1,5 @@ +[application] +name = lazygit + +[configuration_files] +Library/Application Support/jesseduffield/lazygit/config.yml From cd86c2cf1003fd23533cf6edf44527e828243288 Mon Sep 17 00:00:00 2001 From: Josh Medeski Date: Sun, 3 Jan 2021 11:03:03 -0600 Subject: [PATCH 231/406] Add lf application (Terminal file manager) (#1650) * Add lf application (Terminal file manager) * Remove extra text from changelog Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/lf.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/lf.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index dc350a8b9..1c410b547 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for lazygit (via @joshmedeski) - Added support for WebStorm versions 2019.4, 2020.2, 2020.3, 2020.4 (via @bdcarr) - Added support for draft (via @dfang) +- Added support for lf (via @joshmedeski) - Added support for Beets (via @publicarray) - Added support for Krew (via @exherb) - Added support for Homebrew (via @exherb) diff --git a/README.md b/README.md index 1223a7c4e..8dd908c52 100644 --- a/README.md +++ b/README.md @@ -389,6 +389,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [LaunchBar](https://www.obdev.at/products/launchbar/index.html) - [lazygit](https://github.com/jesseduffield/lazygit) - [Ledger](http://ledger-cli.org) +- [lf](https://github.com/gokcehan/lf) - [LibreOffice](https://www.libreoffice.org/) - [Liftoff](https://github.com/thoughtbot/liftoff) - [Light Table](http://lighttable.com/) diff --git a/mackup/applications/lf.cfg b/mackup/applications/lf.cfg new file mode 100644 index 000000000..21506795b --- /dev/null +++ b/mackup/applications/lf.cfg @@ -0,0 +1,5 @@ +[application] +name = lf + +[xdg_configuration_files] +lf/lfrc From 09b6bfe18d6d67d719cbcec0313fc4574a163bc3 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 3 Jan 2021 18:26:19 +0100 Subject: [PATCH 232/406] Mackup 0.8.30 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14d9aaa9a..e88921c84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.30 + - Added support for SpaceVim (via @ionlights) - Added support for clashX (via @awkj) - Added support for Brave (via @cbenv) diff --git a/mackup/constants.py b/mackup/constants.py index 2279545e7..b09f61b82 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = "0.8.29" +VERSION = "0.8.30" # Support platforms PLATFORM_DARWIN = "Darwin" From 6fb31cf5db7ed1131d84fab7fdfb103a37087aa9 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 3 Jan 2021 21:12:09 +0100 Subject: [PATCH 233/406] Order and remove webstorm entries Fix #1628 --- mackup/applications/webstorm.cfg | 44 +++++++++++++++----------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/mackup/applications/webstorm.cfg b/mackup/applications/webstorm.cfg index 9971d3a33..51ab6228e 100644 --- a/mackup/applications/webstorm.cfg +++ b/mackup/applications/webstorm.cfg @@ -2,44 +2,42 @@ name = WebStorm [configuration_files] +Library/Application Support/JetBrains/WebStorm2020.1 +Library/Application Support/JetBrains/WebStorm2020.2 +Library/Application Support/JetBrains/WebStorm2020.3 +Library/Application Support/JetBrains/WebStorm2020.4 Library/Application Support/WebStorm +Library/Application Support/WebStorm10 +Library/Application Support/WebStorm11 +Library/Application Support/WebStorm2016.1 +Library/Application Support/WebStorm2016.2 +Library/Application Support/WebStorm2016.3 +Library/Application Support/WebStorm2017.1 +Library/Application Support/WebStorm2017.2 +Library/Application Support/WebStorm2017.3 +Library/Application Support/WebStorm2018.1 +Library/Application Support/WebStorm2018.2 +Library/Application Support/WebStorm2018.3 +Library/Application Support/WebStorm2019.1 +Library/Application Support/WebStorm2019.2 +Library/Application Support/WebStorm2019.3 +Library/Application Support/WebStorm2019.4 Library/Application Support/WebStorm8 -Library/Preferences/WebStorm8 Library/Application Support/WebStorm9 -Library/Preferences/WebStorm9 -Library/Application Support/WebStorm10 Library/Preferences/WebStorm10 -Library/Application Support/WebStorm11 Library/Preferences/WebStorm11 -Library/Application Support/WebStorm2016.1 Library/Preferences/WebStorm2016.1 -Library/Application Support/WebStorm2016.2 Library/Preferences/WebStorm2016.2 -Library/Application Support/WebStorm2016.3 Library/Preferences/WebStorm2016.3 -Library/Application Support/WebStorm2017.1 Library/Preferences/WebStorm2017.1 -Library/Application Support/WebStorm2017.2 Library/Preferences/WebStorm2017.2 -Library/Application Support/WebStorm2017.3 Library/Preferences/WebStorm2017.3 -Library/Application Support/WebStorm2018.1 Library/Preferences/WebStorm2018.1 -Library/Application Support/WebStorm2018.2 Library/Preferences/WebStorm2018.2 -Library/Application Support/WebStorm2018.3 Library/Preferences/WebStorm2018.3 -Library/Application Support/WebStorm2019.1 Library/Preferences/WebStorm2019.1 -Library/Application Support/WebStorm2019.2 Library/Preferences/WebStorm2019.2 -Library/Application Support/WebStorm2019.3 -Library/Preferences/WebStorm2019.3 -Library/Application Support/WebStorm2019.3 Library/Preferences/WebStorm2019.3 -Library/Application Support/WebStorm2019.4 Library/Preferences/WebStorm2019.4 -Library/Application Support/JetBrains/WebStorm2020.1 -Library/Application Support/JetBrains/WebStorm2020.2 -Library/Application Support/JetBrains/WebStorm2020.3 -Library/Application Support/JetBrains/WebStorm2020.4 +Library/Preferences/WebStorm8 +Library/Preferences/WebStorm9 From 20d40f49e38806d34a66aaddda5be7ad54d99318 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 3 Jan 2021 21:21:25 +0100 Subject: [PATCH 234/406] Mackup 0.8.31 --- CHANGELOG.md | 4 ++++ mackup/constants.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa17a39e0..ea2d944da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## WIP +## Mackup 0.8.31 + +- Fixed an issue due to a duplicate entry in the webstorm config + ## Mackup 0.8.30 - Added support for SpaceVim (via @ionlights) diff --git a/mackup/constants.py b/mackup/constants.py index b09f61b82..2120d82c3 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = "0.8.30" +VERSION = "0.8.31" # Support platforms PLATFORM_DARWIN = "Darwin" From 7bed56b5782e3eff15d58445ff0a853936f0293d Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 4 Jan 2021 09:19:58 +0100 Subject: [PATCH 235/406] Remove duplicate config entry Fix #1677 --- mackup/applications/intellijidea.cfg | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/mackup/applications/intellijidea.cfg b/mackup/applications/intellijidea.cfg index f24688d5d..5db0c2873 100644 --- a/mackup/applications/intellijidea.cfg +++ b/mackup/applications/intellijidea.cfg @@ -25,6 +25,8 @@ IntelliJIdea2019.2/config IntelliJIdea2019.3/config Library/Application Support/IdeaIC2016.1 Library/Application Support/IdeaIC2017.1 +Library/Application Support/IdeaIC2017.2 +Library/Application Support/IdeaIC2017.3 Library/Application Support/IdeaIC2018.2 Library/Application Support/IdeaIC2018.3 Library/Application Support/IdeaIC2019.1 @@ -70,11 +72,3 @@ Library/Preferences/IntelliJIdea2018.3 Library/Preferences/IntelliJIdea2019.1 Library/Preferences/IntelliJIdea2019.2 Library/Preferences/IntelliJIdea2019.3 -Library/Application Support/IdeaIC2017.1 -Library/Application Support/IntelliJIdea2017.1 -Library/Preferences/IntelliJIdea2017.2 -Library/Application Support/IdeaIC2017.2 -Library/Application Support/IntelliJIdea2017.2 -Library/Preferences/IntelliJIdea2017.3 -Library/Application Support/IdeaIC2017.3 -Library/Application Support/IntelliJIdea2017.3 From 37f50c9d5403180d26f7746857de6b831a27c58a Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 4 Jan 2021 09:27:02 +0100 Subject: [PATCH 236/406] Update the changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea2d944da..587568841 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## WIP +## Mackup 0.8.32 + +- Fixed an issue due to a duplicate entry in the intellijidea config +- Added support for Visual Studio for Mac version 8 (via @Qythyx) + ## Mackup 0.8.31 - Fixed an issue due to a duplicate entry in the webstorm config From 53b9c8776d7f88128f706c070240e44f6530953d Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 4 Jan 2021 09:28:28 +0100 Subject: [PATCH 237/406] Mackup 0.8.32 --- mackup/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/constants.py b/mackup/constants.py index 2120d82c3..849b31e5a 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = "0.8.31" +VERSION = "0.8.32" # Support platforms PLATFORM_DARWIN = "Darwin" From 28883dcb061279eae22ede8c4a4eaa97aaa07ee8 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 4 Jan 2021 11:44:07 +0100 Subject: [PATCH 238/406] Add XDG config file for poetry --- mackup/applications/poetry.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mackup/applications/poetry.cfg b/mackup/applications/poetry.cfg index c78eec27e..ac2922707 100644 --- a/mackup/applications/poetry.cfg +++ b/mackup/applications/poetry.cfg @@ -3,3 +3,6 @@ name = poetry [configuration_files] Library/Application Support/pypoetry/config.toml + +[xdg_configuration_files] +pypoetry/config.toml From 25fdbba295c1d0a7a71774e680213c4d5a4012dd Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 4 Jan 2021 14:27:54 +0100 Subject: [PATCH 239/406] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b4bd6a0d..665c57ddb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Fixed support for poetry (via @ameyuuno) +- Added support for npm package npmrc (via @jdvivar) ## Mackup 0.8.32 From 754eeecdab81b58eeacba628a11f1e266607e770 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 5 Jan 2021 12:24:29 +0100 Subject: [PATCH 240/406] Add support for rubiTrack 5 (#1679) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/rubitrack5.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/rubitrack5.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 665c57ddb..38cffc9e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Fixed support for poetry (via @ameyuuno) - Added support for npm package npmrc (via @jdvivar) +- Added support for rubiTrack 5 (via @otherguy) ## Mackup 0.8.32 diff --git a/README.md b/README.md index c4d4d71cd..0d18c5418 100644 --- a/README.md +++ b/README.md @@ -518,6 +518,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Royal TSX](http://www.royaltsx.com/ts/osx/features) - [RStudio](https://www.rstudio.com/) - [rTorrent](http://libtorrent.rakshasa.no/) +- [rubiTrack 5](https://www.rubitrack.com) - [Rubocop](https://github.com/bbatsov/rubocop) - [Ruby Version Manager](https://rvm.io/) - [Ruby Version](https://gist.github.com/fnichol/1912050) diff --git a/mackup/applications/rubitrack5.cfg b/mackup/applications/rubitrack5.cfg new file mode 100644 index 000000000..f78e19929 --- /dev/null +++ b/mackup/applications/rubitrack5.cfg @@ -0,0 +1,5 @@ +[application] +name = rubiTrack 5 + +[configuration_files] +Library/Preferences/com.shiftoption.rubitrack5.pro.plist From af12427ee510895f2643789530c6fd42c61ec927 Mon Sep 17 00:00:00 2001 From: rlam3 Date: Wed, 6 Jan 2021 03:20:43 -0600 Subject: [PATCH 241/406] Adding documentation for installing via master branch (#1646) * Adding documentation for installing via master branch from it * fixing markdown linting * fix puncuation in header and line errors * fixing styling Co-authored-by: Laurent Raufaste --- INSTALL.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/INSTALL.md b/INSTALL.md index 23dd83af5..a52949a80 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -17,6 +17,21 @@ brew install mackup mackup -h ``` +### With Homebrew (OSX only) master branch for latest updates + +Want to install latest master releases instead of waiting on homebrew package version? + +[Homebrew reference](https://docs.brew.sh/Manpage#install-options-formulacask) + +```bash +# Install master +brew install --HEAD +# Check if are using the master or stale package +brew switch mackup + +mackup -h +``` + ### With Python's PIP ```bash From fcf885fec788721dfc2d54987576897ca70dd868 Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Wed, 6 Jan 2021 22:19:47 +0800 Subject: [PATCH 242/406] Update fisher config file (#1653) * Update fisher config file * Update CHANGELOG.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/fisher.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38cffc9e3..9e58bc6e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Fixed support for poetry (via @ameyuuno) - Added support for npm package npmrc (via @jdvivar) - Added support for rubiTrack 5 (via @otherguy) +- Updated support for Fisher (via @kidonng) ## Mackup 0.8.32 diff --git a/mackup/applications/fisher.cfg b/mackup/applications/fisher.cfg index 651146492..c95e43125 100644 --- a/mackup/applications/fisher.cfg +++ b/mackup/applications/fisher.cfg @@ -2,4 +2,4 @@ name = Fisher [xdg_configuration_files] -fish/fishfile +fish/fish_plugins From c58d58c9df73217e44626f44e13143f604205bca Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Wed, 6 Jan 2021 22:22:28 +0800 Subject: [PATCH 243/406] Add support for Qv2ray (#1654) * Update CHANGELOG.md * Update README.md * Create qv2ray.cfg * Be specific Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/qv2ray.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/qv2ray.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e58bc6e6..1b4d2594d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Added support for npm package npmrc (via @jdvivar) - Added support for rubiTrack 5 (via @otherguy) - Updated support for Fisher (via @kidonng) +- Added support for Qv2ray (via @kidonng) ## Mackup 0.8.32 diff --git a/README.md b/README.md index 0d18c5418..7def42834 100644 --- a/README.md +++ b/README.md @@ -502,6 +502,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Quicksilver](http://qsapp.com/) - [Quitter](https://marco.org/apps) - [Qutebrowser](http://qutebrowser.org/) +- [Qv2ray](https://qv2ray.net/) - [R](http://www.r-project.org/) - [Rails](http://rubyonrails.org/) - [Ranger](https://ranger.github.io/) diff --git a/mackup/applications/qv2ray.cfg b/mackup/applications/qv2ray.cfg new file mode 100644 index 000000000..25721f229 --- /dev/null +++ b/mackup/applications/qv2ray.cfg @@ -0,0 +1,6 @@ +[application] +name = Qv2ray + +[configuration_files] +Library/Preferences/qv2ray/Qv2ray.conf +Library/Preferences/qv2ray/plugin_settings From 14891324648a3dc19b92605a305fe133e6cdac41 Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Wed, 6 Jan 2021 22:26:04 +0800 Subject: [PATCH 244/406] Add support for Neofetch (#1652) * Add neofetch * Update README.md * Create neofetch.cfg Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/neofetch.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/neofetch.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b4d2594d..49134dd9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Added support for rubiTrack 5 (via @otherguy) - Updated support for Fisher (via @kidonng) - Added support for Qv2ray (via @kidonng) +- Added support for Neofetch (via @kidonng) ## Mackup 0.8.32 diff --git a/README.md b/README.md index 7def42834..879ae3356 100644 --- a/README.md +++ b/README.md @@ -441,6 +441,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Nano](http://www.nano-editor.org/) - [Navicat](http://navicat.com/) - [ncmpcpp](http://rybczak.net/ncmpcpp/) +- [Neofetch](https://github.com/dylanaraps/neofetch) - [neovim](https://github.com/neovim/neovim) - [Nethack](http://www.nethack.org) - [Netlify](https://www.netlify.com/) diff --git a/mackup/applications/neofetch.cfg b/mackup/applications/neofetch.cfg new file mode 100644 index 000000000..3c52c7644 --- /dev/null +++ b/mackup/applications/neofetch.cfg @@ -0,0 +1,5 @@ +[application] +name = Neofetch + +[xdg_configuration_files] +neofetch/config.conf From d19e7006cc37dde842f0632958c0d088a3616101 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 8 Jan 2021 09:52:32 +0100 Subject: [PATCH 245/406] Add themes and bundles for Sequel Pro (#1655) --- mackup/applications/sequel-pro.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/sequel-pro.cfg b/mackup/applications/sequel-pro.cfg index 76361d66c..81eb3be19 100644 --- a/mackup/applications/sequel-pro.cfg +++ b/mackup/applications/sequel-pro.cfg @@ -3,4 +3,6 @@ name = Sequel Pro [configuration_files] Library/Application Support/Sequel Pro/Data +Library/Application Support/Sequel Pro/Bundles +Library/Application Support/Sequel Pro/Themes Library/Preferences/com.sequelpro.SequelPro.plist From d7664d809e77b711b4da7e01fcc8a74c268e416b Mon Sep 17 00:00:00 2001 From: Johann Pardanaud Date: Fri, 8 Jan 2021 10:04:24 +0100 Subject: [PATCH 246/406] Add support for PsySH (#1681) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/psysh.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/psysh.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 49134dd9a..f95013542 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Updated support for Fisher (via @kidonng) - Added support for Qv2ray (via @kidonng) - Added support for Neofetch (via @kidonng) +- Added support for PsySH (via @nesk) ## Mackup 0.8.32 diff --git a/README.md b/README.md index 879ae3356..b3ef3a54b 100644 --- a/README.md +++ b/README.md @@ -495,6 +495,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Proselint](https://github.com/amperser/proselint) - [ProxyChains NG](http://sourceforge.net/projects/proxychains-ng/) - [ProxyChains](http://proxychains.sourceforge.net) +- [PsySH](https://psysh.org/) - [Punto Switcher](https://punto.yandex.ru/) - [PyCharm](https://www.jetbrains.com/pycharm/) - [PyPI](https://pypi.python.org/pypi) diff --git a/mackup/applications/psysh.cfg b/mackup/applications/psysh.cfg new file mode 100644 index 000000000..41542e87f --- /dev/null +++ b/mackup/applications/psysh.cfg @@ -0,0 +1,5 @@ +[application] +name = PsySH + +[xdg_configuration_files] +psysh/config.php From 88513748f02213e30c60b00e99cfc4893203b898 Mon Sep 17 00:00:00 2001 From: Hugh Chocart Date: Sat, 9 Jan 2021 10:48:40 +0100 Subject: [PATCH 247/406] Fix typo (#1684) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b3ef3a54b..018611ec8 100644 --- a/README.md +++ b/README.md @@ -156,7 +156,7 @@ See the [README](doc/README.md) file in the doc directory for more info. ## Unsupported Storages -- [Box](https://www.box.com): No longer supported is it ignores dotfiles, see +- [Box](https://www.box.com): No longer supported as it ignores dotfiles, see . ## Supported Applications From 5a2d65f12759c75a9839288745796cf24a8a27a6 Mon Sep 17 00:00:00 2001 From: Gabriel Augendre Date: Sat, 9 Jan 2021 10:51:33 +0100 Subject: [PATCH 248/406] Improve the error message when no storage is found (#1682) This relates to issue #1621. It improves the error message when the storage is not found by pointing the user to the docs. This is useful for first-time users as they could otherwise just understand that only Dropbox is supported. Co-authored-by: Laurent Raufaste --- mackup/constants.py | 13 +++++++++++++ mackup/utils.py | 12 ++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/mackup/constants.py b/mackup/constants.py index 849b31e5a..708cc63fc 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -27,3 +27,16 @@ ENGINE_FS = "file_system" ENGINE_GDRIVE = "google_drive" ENGINE_ICLOUD = "icloud" + +DOCUMENTATION_URL = "https://github.com/lra/mackup/blob/master/doc/README.md" + +# Error message displayed when mackup can't find the storage specified +# in the config (or the default one). +ERROR_UNABLE_TO_FIND_STORAGE = ( + "Unable to find your {provider} =(\n" + "If this is the first time you use %s, you may want " + "to use another provider.\n" + "Take a look at the documentation [1] to know more about " + "how to configure mackup.\n\n" + "[1]: %s" % (MACKUP_APP_NAME, DOCUMENTATION_URL) +) diff --git a/mackup/utils.py b/mackup/utils.py index bcd2977e0..addf68f3d 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -205,7 +205,7 @@ def get_dropbox_folder_location(): with open(host_db_path, "r") as f_hostdb: data = f_hostdb.read().split() except IOError: - error("Unable to find your Dropbox install =(") + error(constants.ERROR_UNABLE_TO_FIND_STORAGE.format(provider="Dropbox install")) dropbox_home = base64.b64decode(data[1]).decode() return dropbox_home @@ -244,7 +244,11 @@ def get_google_drive_folder_location(): con.close() if not googledrive_home: - error("Unable to find your Google Drive install =(") + error( + constants.ERROR_UNABLE_TO_FIND_STORAGE.format( + provider="Google Drive install" + ) + ) return googledrive_home @@ -272,7 +276,7 @@ def get_copy_folder_location(): cur.close() if not copy_home: - error("Unable to find your Copy install =(") + error(constants.ERROR_UNABLE_TO_FIND_STORAGE.format(provider="Copy install")) return copy_home @@ -289,7 +293,7 @@ def get_icloud_folder_location(): icloud_home = os.path.expanduser(yosemite_icloud_path) if not os.path.isdir(icloud_home): - error("Unable to find your iCloud Drive =(") + error(constants.ERROR_UNABLE_TO_FIND_STORAGE.format(provider="iCloud Drive")) return str(icloud_home) From 9f275ed1589c55273eac4a71ff3bf8c480860c15 Mon Sep 17 00:00:00 2001 From: Alexander Tipugin Date: Sat, 9 Jan 2021 12:54:38 +0300 Subject: [PATCH 249/406] Fix finicky typo (#1683) Co-authored-by: Laurent Raufaste --- mackup/applications/finicky.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/finicky.cfg b/mackup/applications/finicky.cfg index 7608aac24..dc8b886dd 100644 --- a/mackup/applications/finicky.cfg +++ b/mackup/applications/finicky.cfg @@ -1,5 +1,5 @@ [application] -name = fincky +name = finicky [configuration_files] .finicky.js From 442a4add4c9955c713655cc2520a876b5ac7a385 Mon Sep 17 00:00:00 2001 From: Lucas Larson <91468+LucasLarson@users.noreply.github.com> Date: Tue, 13 Apr 2021 12:55:13 -0400 Subject: [PATCH 250/406] repair punctuation spacing (#1727) (#1728) * repair punctuation spacing (#1727) * clarify what will be saved (#1727, #1728) https://github.com/lra/mackup/pull/1728#discussion_r611831501 --- mackup/application.py | 8 ++++---- mackup/config.py | 8 ++++---- mackup/mackup.py | 4 ++-- mackup/main.py | 4 ++-- mackup/utils.py | 4 ++-- tests/README.md | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/mackup/application.py b/mackup/application.py index 51d319d9c..9a0c9cd78 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -53,7 +53,7 @@ def backup(self): if exists home/file if home/file is a real file if exists mackup/file - are you sure ? + are you sure? if sure rm mackup/file mv home/file mackup/file @@ -102,7 +102,7 @@ def backup(self): if utils.confirm( "A {} named {} already exists in the" " backup.\nAre you sure that you want to" - " replace it ?".format(file_type, mackup_filepath) + " replace it?".format(file_type, mackup_filepath) ): # Delete the file in Mackup utils.delete(mackup_filepath) @@ -144,7 +144,7 @@ def restore(self): Algorithm: if exists mackup/file if exists home/file - are you sure ? + are you sure? if sure rm home/file link mackup/file home/file @@ -196,7 +196,7 @@ def restore(self): if utils.confirm( "You already have a {} named {} in your" " home.\nDo you want to replace it with" - " your backup ?".format(file_type, filename) + " your backup?".format(file_type, filename) ): utils.delete(home_filepath) utils.link(mackup_filepath, home_filepath) diff --git a/mackup/config.py b/mackup/config.py index ebcf48daa..373bef984 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -45,7 +45,7 @@ def __init__(self, filename=None): # Initialize the parser self._parser = self._setup_parser(filename) - # Do we have an old config file ? + # Do we have an old config file? self._warn_on_old_config() # Get the storage engine @@ -154,7 +154,7 @@ def _setup_parser(self, filename=None): def _warn_on_old_config(self): """Warn the user if an old config format is detected.""" - # Is an old setion is in the config file ? + # Is an old section in the config file? old_sections = ["Allowed Applications", "Ignored Applications"] for old_section in old_sections: if self._parser.has_section(old_section): @@ -253,7 +253,7 @@ def _parse_apps_to_ignore(self): # We ignore nothing by default apps_to_ignore = set() - # Is the "[applications_to_ignore]" in the cfg file ? + # Is the "[applications_to_ignore]" in the cfg file? section_title = "applications_to_ignore" if self._parser.has_section(section_title): apps_to_ignore = set(self._parser.options(section_title)) @@ -270,7 +270,7 @@ def _parse_apps_to_sync(self): # We allow nothing by default apps_to_sync = set() - # Is the "[applications_to_sync]" section in the cfg file ? + # Is the "[applications_to_sync]" section in the cfg file? section_title = "applications_to_sync" if self._parser.has_section(section_title): apps_to_sync = set(self._parser.options(section_title)) diff --git a/mackup/mackup.py b/mackup/mackup.py index c60184353..734e8ee9c 100644 --- a/mackup/mackup.py +++ b/mackup/mackup.py @@ -36,13 +36,13 @@ def check_for_usable_environment(self): " Run mackup --help for guidance." ) - # Do we have a folder to put the Mackup folder ? + # Do we have a folder set to save Mackup content into? if not os.path.isdir(self._config.path): utils.error( "Unable to find the storage folder: {}".format(self._config.path) ) - # Is Sublime Text running ? + # Is Sublime Text running? # if is_process_running('Sublime Text'): # error("Sublime Text is running. It is known to cause problems" # " when Sublime Text is running while I backup or restore" diff --git a/mackup/main.py b/mackup/main.py index b07a91224..b3d1c0996 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -129,7 +129,7 @@ def printAppHeader(app_name): "Every configuration file, setting and dotfile" " managed by Mackup will be unlinked and moved back" " to their original place, in your home folder.\n" - "Are you sure ?" + "Are you sure?" ) ): @@ -162,7 +162,7 @@ def printAppHeader(app_name): "All your files have been put back into place. You can now" " safely uninstall Mackup.\n" "\n" - "Thanks for using Mackup !" + "Thanks for using Mackup!" ) elif args["list"]: diff --git a/mackup/utils.py b/mackup/utils.py index addf68f3d..e997340a4 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -34,7 +34,7 @@ def confirm(question): return True while True: - answer = input(question + " ").lower() + answer = input(question + " ").lower() if answer == "yes" or answer == "y": confirmed = True @@ -104,7 +104,7 @@ def copy(src, dst): elif os.path.isdir(src): shutil.copytree(src, dst) - # What the heck is this ? + # What the heck is this? else: raise ValueError("Unsupported file: {}".format(src)) diff --git a/tests/README.md b/tests/README.md index 0d2ca02ee..a1d04f737 100644 --- a/tests/README.md +++ b/tests/README.md @@ -2,7 +2,7 @@ Tests are put in this folder. -Feel free to add more, the more the better ! +Feel free to add more, the more the better! ## How to run the tests @@ -23,4 +23,4 @@ OK ``` Yeah, I wrote this file when there was only 1 test, I hope there will be more -when you read it ! +when you read it! From 12086cef3124dcc0e0c7216c92339299d9035ef6 Mon Sep 17 00:00:00 2001 From: Esteban Date: Fri, 23 Apr 2021 16:57:04 -0400 Subject: [PATCH 251/406] Sublime Text 4 (#1732) --- CHANGELOG.md | 1 + mackup/applications/sublime-text.cfg | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 mackup/applications/sublime-text.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index f95013542..a3768badb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Added support for Qv2ray (via @kidonng) - Added support for Neofetch (via @kidonng) - Added support for PsySH (via @nesk) +- Added support for Sublime Text 4 (via @TCattd) ## Mackup 0.8.32 diff --git a/mackup/applications/sublime-text.cfg b/mackup/applications/sublime-text.cfg new file mode 100644 index 000000000..2728a27f1 --- /dev/null +++ b/mackup/applications/sublime-text.cfg @@ -0,0 +1,9 @@ +[application] +name = Sublime Text + +[configuration_files] +# Based on https://packagecontrol.io/docs/syncing +Library/Application Support/Sublime Text/Packages/User + +[xdg_configuration_files] +sublime-text/Packages/User From b417430dd013dc957fcdcbd24bef6ae15ea26e7f Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Thu, 6 May 2021 18:25:51 -0400 Subject: [PATCH 252/406] Change OS X to macOS (#1023) * Update copyright info * Change OS X to macOS * Update CHANGELOG Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 6 +++--- mackup/main.py | 2 +- mackup/utils.py | 2 +- setup.py | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3768badb..a5dd0c0de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -273,6 +273,7 @@ - Add support for DaisyDisk (via @cafferata) - Add support for MySQLWorkbench (via @cafferata) - Add support for Openbox (via @jpfarcy) +- Change OS X to macOS to match OS name change (via @samdoran) ## Mackup 0.8.16 diff --git a/README.md b/README.md index 018611ec8..607a74812 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Keep your application settings in sync. If you have [Dropbox](https://www.dropbox.com) installed and want to use it to save your config files, that's super easy. -On OS X, if you want an easy install, you can install +On macOS, if you want an easy install, you can install [Homebrew](http://brew.sh/) and do: ```bash @@ -35,7 +35,7 @@ brew install mackup mackup backup ``` -If not running OS X, or you don't like Homebrew, you can use [pip](https://pip.pypa.io/en/stable/). +If not running macOS, or you don't like Homebrew, you can use [pip](https://pip.pypa.io/en/stable/). > Note: The below command will check if a previous version of Mackup > is already installed on your system. @@ -695,7 +695,7 @@ And it's [GPL](http://www.gnu.org/licenses/gpl.html), of course. ## What platforms are supported -- OS X +- macOS - GNU/Linux ## What's up with the weird name diff --git a/mackup/main.py b/mackup/main.py index b3d1c0996..de241a652 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -1,7 +1,7 @@ """Mackup. Keep your application settings in sync. -Copyright (C) 2013-2019 Laurent Raufaste +Copyright (C) 2013-2021 Laurent Raufaste Usage: mackup list diff --git a/mackup/utils.py b/mackup/utils.py index e997340a4..29775253d 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -385,7 +385,7 @@ def can_file_be_synced_on_current_platform(path): # If the given path is relative, prepend home fullpath = os.path.join(os.environ["HOME"], path) - # Compute the ~/Library path on OS X + # Compute the ~/Library path on macOS # End it with a slash because we are looking for this specific folder and # not any file/folder named LibrarySomething library_path = os.path.join(os.environ["HOME"], "Library/") diff --git a/setup.py b/setup.py index 8870e2acb..6d61e73f5 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ author="Laurent Raufaste", author_email="analogue@glop.org", url="https://github.com/lra/mackup", - description="Keep your application settings in sync (OS X/Linux)", + description="Keep your application settings in sync (macOS/Linux)", keywords="configuration config dotfiles sync backup dropbox gdrive box", license="GPLv3", packages=["mackup"], From 7f0304c9c2ac8d85eda45dc475f6c2ea8450a042 Mon Sep 17 00:00:00 2001 From: Haren S Date: Thu, 6 May 2021 23:29:38 +0100 Subject: [PATCH 253/406] Added support for KeePassXC (#1611) * Added support for KeePassXC * Update keepassxc.cfg Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/keepassxc.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/keepassxc.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index a5dd0c0de..a938b1a4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Added support for KeePassXC (via @harens) - Fixed support for poetry (via @ameyuuno) - Added support for npm package npmrc (via @jdvivar) - Added support for rubiTrack 5 (via @otherguy) diff --git a/README.md b/README.md index 607a74812..2e357e37b 100644 --- a/README.md +++ b/README.md @@ -374,6 +374,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Karabiner](https://pqrs.org/osx/karabiner/) - [Kdenlive](https://kdenlive.org/) - [KeePassX](http://www.keepassx.org/) +- [KeePassXC](https://keepassxc.org/) - [KeepingYouAwake](https://github.com/newmarcel/KeepingYouAwake) - [Keka](http://www.kekaosx.com/en/) - [Keybase](https://keybase.io/) diff --git a/mackup/applications/keepassxc.cfg b/mackup/applications/keepassxc.cfg new file mode 100644 index 000000000..e68a462a3 --- /dev/null +++ b/mackup/applications/keepassxc.cfg @@ -0,0 +1,6 @@ +[application] +name = KeePassXC + +[configuration_files] +Library/Preferences/org.keepassxc.keepassxc.plist +Library/Application Support/keepassxc/keepassxc.ini From 4b999bd0f4eb32535f320f5e593e040df1a3849d Mon Sep 17 00:00:00 2001 From: Yuto Date: Sat, 8 May 2021 03:53:14 +0900 Subject: [PATCH 254/406] Add support for AltTab (#1740) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/alt-tab.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/alt-tab.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index a938b1a4a..4be07ef69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Added support for Neofetch (via @kidonng) - Added support for PsySH (via @nesk) - Added support for Sublime Text 4 (via @TCattd) +- Added support for AltTab (via @aiotter) ## Mackup 0.8.32 diff --git a/README.md b/README.md index 2e357e37b..afe08b2c4 100644 --- a/README.md +++ b/README.md @@ -172,6 +172,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [aerc](https://aerc-mail.org/) - [Airmail](http://airmailapp.com/) - [Alacritty](https://github.com/jwilm/alacritty) +- [AltTab](https://alt-tab-macos.netlify.app/) - [Amethyst](https://ianyh.com/amethyst/) - [Ancient Domains of Mystery](http://www.adom.de/home/index.html) - [Android Studio](https://developer.android.com/sdk/) diff --git a/mackup/applications/alt-tab.cfg b/mackup/applications/alt-tab.cfg new file mode 100644 index 000000000..81a2aac94 --- /dev/null +++ b/mackup/applications/alt-tab.cfg @@ -0,0 +1,5 @@ +[application] +name = AltTab + +[configuration_files] +Library/Preferences/com.lwouis.alt-tab-macos.plist From 2026abe1b3ecad838a8d809cf49da210d75119d5 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 4 Sep 2021 22:31:51 +0200 Subject: [PATCH 255/406] Upgrade a bunch of packages --- Pipfile.lock | 233 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 155 insertions(+), 78 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index ea1ec745f..e5ac1744c 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -23,92 +23,134 @@ }, "six": { "hashes": [ - "sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a", - "sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c" + "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", + "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], "index": "pypi", - "version": "==1.14.0" + "version": "==1.16.0" } }, "develop": { "bleach": { "hashes": [ - "sha256:cc8da25076a1fe56c3ac63671e2194458e0c4d9c7becfd52ca251650d517903c", - "sha256:e78e426105ac07026ba098f04de8abe9b6e3e98b5befbf89b51a5ef0a4292b03" + "sha256:0900d8b37eba61a802ee40ac0061f8c2b5dee29c1927dd1d233e075ebf5a71da", + "sha256:4d2651ab93271d1129ac9cbc679f524565cc8a1b791909c4a51eac4446a15994" ], - "version": "==3.1.4" + "markers": "python_version >= '3.6'", + "version": "==4.1.0" }, "certifi": { "hashes": [ - "sha256:1d987a998c75633c40847cc966fcf5904906c920a7f17ef374f5aa4282abd304", - "sha256:51fcb31174be6e6664c5f69e3e1691a2d72a1a12e90f872cbdb1567eb47b6519" + "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee", + "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8" ], - "version": "==2020.4.5.1" + "version": "==2021.5.30" }, - "chardet": { + "charset-normalizer": { "hashes": [ - "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae", - "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691" + "sha256:0c8911edd15d19223366a194a513099a302055a962bca2cec0f54b8b63175d8b", + "sha256:f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3" ], - "version": "==3.0.4" + "markers": "python_version >= '3'", + "version": "==2.0.4" + }, + "colorama": { + "hashes": [ + "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b", + "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==0.4.4" }, "coverage": { "hashes": [ - "sha256:00f1d23f4336efc3b311ed0d807feb45098fc86dee1ca13b3d6768cdab187c8a", - "sha256:01333e1bd22c59713ba8a79f088b3955946e293114479bbfc2e37d522be03355", - "sha256:0cb4be7e784dcdc050fc58ef05b71aa8e89b7e6636b99967fadbdba694cf2b65", - "sha256:0e61d9803d5851849c24f78227939c701ced6704f337cad0a91e0972c51c1ee7", - "sha256:1601e480b9b99697a570cea7ef749e88123c04b92d84cedaa01e117436b4a0a9", - "sha256:2742c7515b9eb368718cd091bad1a1b44135cc72468c731302b3d641895b83d1", - "sha256:2d27a3f742c98e5c6b461ee6ef7287400a1956c11421eb574d843d9ec1f772f0", - "sha256:402e1744733df483b93abbf209283898e9f0d67470707e3c7516d84f48524f55", - "sha256:5c542d1e62eece33c306d66fe0a5c4f7f7b3c08fecc46ead86d7916684b36d6c", - "sha256:5f2294dbf7875b991c381e3d5af2bcc3494d836affa52b809c91697449d0eda6", - "sha256:6402bd2fdedabbdb63a316308142597534ea8e1895f4e7d8bf7476c5e8751fef", - "sha256:66460ab1599d3cf894bb6baee8c684788819b71a5dc1e8fa2ecc152e5d752019", - "sha256:782caea581a6e9ff75eccda79287daefd1d2631cc09d642b6ee2d6da21fc0a4e", - "sha256:79a3cfd6346ce6c13145731d39db47b7a7b859c0272f02cdb89a3bdcbae233a0", - "sha256:7a5bdad4edec57b5fb8dae7d3ee58622d626fd3a0be0dfceda162a7035885ecf", - "sha256:8fa0cbc7ecad630e5b0f4f35b0f6ad419246b02bc750de7ac66db92667996d24", - "sha256:a027ef0492ede1e03a8054e3c37b8def89a1e3c471482e9f046906ba4f2aafd2", - "sha256:a3f3654d5734a3ece152636aad89f58afc9213c6520062db3978239db122f03c", - "sha256:a82b92b04a23d3c8a581fc049228bafde988abacba397d57ce95fe95e0338ab4", - "sha256:acf3763ed01af8410fc36afea23707d4ea58ba7e86a8ee915dfb9ceff9ef69d0", - "sha256:adeb4c5b608574a3d647011af36f7586811a2c1197c861aedb548dd2453b41cd", - "sha256:b83835506dfc185a319031cf853fa4bb1b3974b1f913f5bb1a0f3d98bdcded04", - "sha256:bb28a7245de68bf29f6fb199545d072d1036a1917dca17a1e75bbb919e14ee8e", - "sha256:bf9cb9a9fd8891e7efd2d44deb24b86d647394b9705b744ff6f8261e6f29a730", - "sha256:c317eaf5ff46a34305b202e73404f55f7389ef834b8dbf4da09b9b9b37f76dd2", - "sha256:dbe8c6ae7534b5b024296464f387d57c13caa942f6d8e6e0346f27e509f0f768", - "sha256:de807ae933cfb7f0c7d9d981a053772452217df2bf38e7e6267c9cbf9545a796", - "sha256:dead2ddede4c7ba6cb3a721870f5141c97dc7d85a079edb4bd8d88c3ad5b20c7", - "sha256:dec5202bfe6f672d4511086e125db035a52b00f1648d6407cc8e526912c0353a", - "sha256:e1ea316102ea1e1770724db01998d1603ed921c54a86a2efcb03428d5417e489", - "sha256:f90bfc4ad18450c80b024036eaf91e4a246ae287701aaa88eaebebf150868052" + "sha256:004d1880bed2d97151facef49f08e255a20ceb6f9432df75f4eef018fdd5a78c", + "sha256:01d84219b5cdbfc8122223b39a954820929497a1cb1422824bb86b07b74594b6", + "sha256:040af6c32813fa3eae5305d53f18875bedd079960822ef8ec067a66dd8afcd45", + "sha256:06191eb60f8d8a5bc046f3799f8a07a2d7aefb9504b0209aff0b47298333302a", + "sha256:13034c4409db851670bc9acd836243aeee299949bd5673e11844befcb0149f03", + "sha256:13c4ee887eca0f4c5a247b75398d4114c37882658300e153113dafb1d76de529", + "sha256:184a47bbe0aa6400ed2d41d8e9ed868b8205046518c52464fde713ea06e3a74a", + "sha256:18ba8bbede96a2c3dde7b868de9dcbd55670690af0988713f0603f037848418a", + "sha256:1aa846f56c3d49205c952d8318e76ccc2ae23303351d9270ab220004c580cfe2", + "sha256:217658ec7187497e3f3ebd901afdca1af062b42cfe3e0dafea4cced3983739f6", + "sha256:24d4a7de75446be83244eabbff746d66b9240ae020ced65d060815fac3423759", + "sha256:2910f4d36a6a9b4214bb7038d537f015346f413a975d57ca6b43bf23d6563b53", + "sha256:2949cad1c5208b8298d5686d5a85b66aae46d73eec2c3e08c817dd3513e5848a", + "sha256:2a3859cb82dcbda1cfd3e6f71c27081d18aa251d20a17d87d26d4cd216fb0af4", + "sha256:2cafbbb3af0733db200c9b5f798d18953b1a304d3f86a938367de1567f4b5bff", + "sha256:2e0d881ad471768bf6e6c2bf905d183543f10098e3b3640fc029509530091502", + "sha256:30c77c1dc9f253283e34c27935fded5015f7d1abe83bc7821680ac444eaf7793", + "sha256:3487286bc29a5aa4b93a072e9592f22254291ce96a9fbc5251f566b6b7343cdb", + "sha256:372da284cfd642d8e08ef606917846fa2ee350f64994bebfbd3afb0040436905", + "sha256:41179b8a845742d1eb60449bdb2992196e211341818565abded11cfa90efb821", + "sha256:44d654437b8ddd9eee7d1eaee28b7219bec228520ff809af170488fd2fed3e2b", + "sha256:4a7697d8cb0f27399b0e393c0b90f0f1e40c82023ea4d45d22bce7032a5d7b81", + "sha256:51cb9476a3987c8967ebab3f0fe144819781fca264f57f89760037a2ea191cb0", + "sha256:52596d3d0e8bdf3af43db3e9ba8dcdaac724ba7b5ca3f6358529d56f7a166f8b", + "sha256:53194af30d5bad77fcba80e23a1441c71abfb3e01192034f8246e0d8f99528f3", + "sha256:5fec2d43a2cc6965edc0bb9e83e1e4b557f76f843a77a2496cbe719583ce8184", + "sha256:6c90e11318f0d3c436a42409f2749ee1a115cd8b067d7f14c148f1ce5574d701", + "sha256:74d881fc777ebb11c63736622b60cb9e4aee5cace591ce274fb69e582a12a61a", + "sha256:7501140f755b725495941b43347ba8a2777407fc7f250d4f5a7d2a1050ba8e82", + "sha256:796c9c3c79747146ebd278dbe1e5c5c05dd6b10cc3bcb8389dfdf844f3ead638", + "sha256:869a64f53488f40fa5b5b9dcb9e9b2962a66a87dab37790f3fcfb5144b996ef5", + "sha256:8963a499849a1fc54b35b1c9f162f4108017b2e6db2c46c1bed93a72262ed083", + "sha256:8d0a0725ad7c1a0bcd8d1b437e191107d457e2ec1084b9f190630a4fb1af78e6", + "sha256:900fbf7759501bc7807fd6638c947d7a831fc9fdf742dc10f02956ff7220fa90", + "sha256:92b017ce34b68a7d67bd6d117e6d443a9bf63a2ecf8567bb3d8c6c7bc5014465", + "sha256:970284a88b99673ccb2e4e334cfb38a10aab7cd44f7457564d11898a74b62d0a", + "sha256:972c85d205b51e30e59525694670de6a8a89691186012535f9d7dbaa230e42c3", + "sha256:9a1ef3b66e38ef8618ce5fdc7bea3d9f45f3624e2a66295eea5e57966c85909e", + "sha256:af0e781009aaf59e25c5a678122391cb0f345ac0ec272c7961dc5455e1c40066", + "sha256:b6d534e4b2ab35c9f93f46229363e17f63c53ad01330df9f2d6bd1187e5eaacf", + "sha256:b7895207b4c843c76a25ab8c1e866261bcfe27bfaa20c192de5190121770672b", + "sha256:c0891a6a97b09c1f3e073a890514d5012eb256845c451bd48f7968ef939bf4ae", + "sha256:c2723d347ab06e7ddad1a58b2a821218239249a9e4365eaff6649d31180c1669", + "sha256:d1f8bf7b90ba55699b3a5e44930e93ff0189aa27186e96071fac7dd0d06a1873", + "sha256:d1f9ce122f83b2305592c11d64f181b87153fc2c2bbd3bb4a3dde8303cfb1a6b", + "sha256:d314ed732c25d29775e84a960c3c60808b682c08d86602ec2c3008e1202e3bb6", + "sha256:d636598c8305e1f90b439dbf4f66437de4a5e3c31fdf47ad29542478c8508bbb", + "sha256:deee1077aae10d8fa88cb02c845cfba9b62c55e1183f52f6ae6a2df6a2187160", + "sha256:ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c", + "sha256:f030f8873312a16414c0d8e1a1ddff2d3235655a2174e3648b4fa66b3f2f1079", + "sha256:f0b278ce10936db1a37e6954e15a3730bea96a0997c26d7fee88e6c396c2086d", + "sha256:f11642dddbb0253cc8853254301b51390ba0081750a8ac03f20ea8103f0c56b6" ], "index": "pypi", - "version": "==5.1" + "version": "==5.5" }, "docutils": { "hashes": [ - "sha256:0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af", - "sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc" + "sha256:686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125", + "sha256:cf316c8370a737a022b72b56874f6602acf974a37a9fba42ec2876387549fc61" ], - "version": "==0.16" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==0.17.1" }, "idna": { "hashes": [ - "sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb", - "sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa" + "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a", + "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3" ], - "version": "==2.9" + "markers": "python_version >= '3'", + "version": "==3.2" + }, + "importlib-metadata": { + "hashes": [ + "sha256:b618b6d2d5ffa2f16add5697cf57a46c76a56229b0ed1c438322e4e95645bd15", + "sha256:f284b3e11256ad1e5d03ab86bb2ccd6f5339688ff17a4d797a0fe7df326f23b1" + ], + "markers": "python_version >= '3.6'", + "version": "==4.8.1" }, "keyring": { "hashes": [ - "sha256:197fd5903901030ef7b82fe247f43cfed2c157a28e7747d1cfcf4bc5e699dd03", - "sha256:8179b1cdcdcbc221456b5b74e6b7cfa06f8dd9f239eb81892166d9223d82c5ba" + "sha256:b32397fd7e7063f8dd74a26db910c9862fc2109285fa16e3b5208bcb42a3e579", + "sha256:b7e0156667f5dcc73c1f63a518005cd18a4eb23fe77321194fefcc03748b21a4" ], - "version": "==21.2.0" + "markers": "python_version >= '3.6'", + "version": "==23.1.0" }, "nose": { "hashes": [ @@ -119,33 +161,51 @@ "index": "pypi", "version": "==1.3.7" }, + "packaging": { + "hashes": [ + "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7", + "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14" + ], + "markers": "python_version >= '3.6'", + "version": "==21.0" + }, "pkginfo": { "hashes": [ - "sha256:7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb", - "sha256:a6d9e40ca61ad3ebd0b72fbadd4fba16e4c0e4df0428c041e01e06eb6ee71f32" + "sha256:37ecd857b47e5f55949c41ed061eb51a0bee97a87c969219d144c0e023982779", + "sha256:e7432f81d08adec7297633191bbf0bd47faf13cd8724c3a13250e51d542635bd" ], - "version": "==1.5.0.1" + "version": "==1.7.1" }, "pygments": { "hashes": [ - "sha256:647344a061c249a3b74e230c739f434d7ea4d8b1d5f3721bc0f3558049b38f44", - "sha256:ff7a40b4860b727ab48fad6360eb351cc1b33cbf9b15a0f689ca5353e9463324" + "sha256:b8e67fe6af78f492b3c4b3e2970c0624cbf08beb1e493b2c99b9fa1b67a20380", + "sha256:f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6" ], - "version": "==2.6.1" + "markers": "python_version >= '3.5'", + "version": "==2.10.0" + }, + "pyparsing": { + "hashes": [ + "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1", + "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b" + ], + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==2.4.7" }, "readme-renderer": { "hashes": [ - "sha256:cbe9db71defedd2428a1589cdc545f9bd98e59297449f69d721ef8f1cfced68d", - "sha256:cc4957a803106e820d05d14f71033092537a22daa4f406dfbdd61177e0936376" + "sha256:63b4075c6698fcfa78e584930f07f39e05d46f3ec97f65006e430b595ca6348c", + "sha256:92fd5ac2bf8677f310f3303aa4bce5b9d5f9f2094ab98c29f13791d7b805a3db" ], - "version": "==26.0" + "version": "==29.0" }, "requests": { "hashes": [ - "sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee", - "sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6" + "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24", + "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7" ], - "version": "==2.23.0" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", + "version": "==2.26.0" }, "requests-toolbelt": { "hashes": [ @@ -154,35 +214,44 @@ ], "version": "==0.9.1" }, + "rfc3986": { + "hashes": [ + "sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835", + "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97" + ], + "version": "==1.5.0" + }, "six": { "hashes": [ - "sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a", - "sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c" + "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", + "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], "index": "pypi", - "version": "==1.14.0" + "version": "==1.16.0" }, "tqdm": { "hashes": [ - "sha256:00339634a22c10a7a22476ee946bbde2dbe48d042ded784e4d88e0236eca5d81", - "sha256:ea9e3fd6bd9a37e8783d75bfc4c1faf3c6813da6bd1c3e776488b41ec683af94" + "sha256:80aead664e6c1672c4ae20dc50e1cdc5e20eeff9b14aa23ecd426375b28be588", + "sha256:a4d6d112e507ef98513ac119ead1159d286deab17dffedd96921412c2d236ff5" ], - "version": "==4.45.0" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==4.62.2" }, "twine": { "hashes": [ - "sha256:c1af8ca391e43b0a06bbc155f7f67db0bf0d19d284bfc88d1675da497a946124", - "sha256:d561a5e511f70275e5a485a6275ff61851c16ffcb3a95a602189161112d9f160" + "sha256:087328e9bb405e7ce18527a2dca4042a84c7918658f951110b38bc135acab218", + "sha256:4caec0f1ed78dc4c9b83ad537e453d03ce485725f2aea57f1bb3fdde78dae936" ], "index": "pypi", - "version": "==3.1.1" + "version": "==3.4.2" }, "urllib3": { "hashes": [ - "sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527", - "sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115" + "sha256:39fb8672126159acb139a7718dd10806104dec1e2f0f6c88aab05d17df10c8d4", + "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f" ], - "version": "==1.25.9" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", + "version": "==1.26.6" }, "webencodings": { "hashes": [ @@ -190,6 +259,14 @@ "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923" ], "version": "==0.5.1" + }, + "zipp": { + "hashes": [ + "sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3", + "sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4" + ], + "markers": "python_version >= '3.6'", + "version": "==3.5.0" } } } From ca64bef6c43b4ac6eed00edfbfea19d58e7e6d5a Mon Sep 17 00:00:00 2001 From: Kristian Matthews Date: Sat, 4 Sep 2021 21:37:41 +0100 Subject: [PATCH 256/406] Added support for Affinity (#1754) * Add support for Affinity * Update affinity-designer.cfg * Update affinity-photo.cfg * Update affinity-publisher.cfg Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 3 +++ README.md | 3 +++ mackup/applications/affinity-designer.cfg | 5 +++++ mackup/applications/affinity-photo.cfg | 5 +++++ mackup/applications/affinity-publisher.cfg | 5 +++++ 5 files changed, 21 insertions(+) create mode 100644 mackup/applications/affinity-designer.cfg create mode 100644 mackup/applications/affinity-photo.cfg create mode 100644 mackup/applications/affinity-publisher.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 4be07ef69..211789660 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ - Added support for PsySH (via @nesk) - Added support for Sublime Text 4 (via @TCattd) - Added support for AltTab (via @aiotter) +- Added support for Affinity Designer (via @EpicKris) +- Added support for Affinity Photo (via @EpicKris) +- Added support for Affinity Publisher (via @EpicKris) ## Mackup 0.8.32 diff --git a/README.md b/README.md index afe08b2c4..6fd7029bf 100644 --- a/README.md +++ b/README.md @@ -170,6 +170,9 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adobe Photoshop CC](http://www.adobe.com/products/photoshop.html) - [Adobe Photoshop Lightroom CC](https://www.adobe.com/products/photoshop-lightroom.html) - [aerc](https://aerc-mail.org/) +- [Affinity Designer](https://affinity.serif.com/designer) +- [Affinity Photo](https://affinity.serif.com/photo) +- [Affinity Publisher](https://affinity.serif.com/publisher) - [Airmail](http://airmailapp.com/) - [Alacritty](https://github.com/jwilm/alacritty) - [AltTab](https://alt-tab-macos.netlify.app/) diff --git a/mackup/applications/affinity-designer.cfg b/mackup/applications/affinity-designer.cfg new file mode 100644 index 000000000..2835e5eac --- /dev/null +++ b/mackup/applications/affinity-designer.cfg @@ -0,0 +1,5 @@ +[application] +name = Affinity Designer + +[configuration_files] +Library/Containers/Affinity Designer/Data/Library/Application Support/user diff --git a/mackup/applications/affinity-photo.cfg b/mackup/applications/affinity-photo.cfg new file mode 100644 index 000000000..3fe5214ba --- /dev/null +++ b/mackup/applications/affinity-photo.cfg @@ -0,0 +1,5 @@ +[application] +name = Affinity Photo + +[configuration_files] +Library/Containers/Affinity Photo/Data/Library/Application Support/user diff --git a/mackup/applications/affinity-publisher.cfg b/mackup/applications/affinity-publisher.cfg new file mode 100644 index 000000000..09067fe57 --- /dev/null +++ b/mackup/applications/affinity-publisher.cfg @@ -0,0 +1,5 @@ +[application] +name = Affinity Publisher + +[configuration_files] +Library/Containers/Affinity Publisher/Data/Library/Application Support/user From 52c74d3c51ea4af2b6edf469d5a028628549d768 Mon Sep 17 00:00:00 2001 From: steffenmalisi Date: Sun, 5 Sep 2021 21:38:09 +0200 Subject: [PATCH 257/406] Update support for IntelliJIdea version 2021.1 (#1729) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/intellijidea.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 211789660..eaeead627 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Added support for Qv2ray (via @kidonng) - Added support for Neofetch (via @kidonng) - Added support for PsySH (via @nesk) +- Updated support for IntelliJIdea version 2021.1 (via @steffenmalisi) - Added support for Sublime Text 4 (via @TCattd) - Added support for AltTab (via @aiotter) - Added support for Affinity Designer (via @EpicKris) diff --git a/mackup/applications/intellijidea.cfg b/mackup/applications/intellijidea.cfg index 5db0c2873..f8b80b9a1 100644 --- a/mackup/applications/intellijidea.cfg +++ b/mackup/applications/intellijidea.cfg @@ -47,6 +47,7 @@ Library/Application Support/IntelliJIdea2019.1 Library/Application Support/IntelliJIdea2019.2 Library/Application Support/IntelliJIdea2019.3 Library/Application Support/JetBrains/IntelliJIdea2020.1 +Library/Application Support/JetBrains/IntelliJIdea2021.1 Library/Preferences/IdeaIC2016.1 Library/Preferences/IdeaIC2016.2 Library/Preferences/IdeaIC2016.3 From 12e8795b4f715351cf0a7ba1d1847af874833df0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Ord=C3=B3=C3=B1ez?= Date: Sun, 5 Sep 2021 12:40:09 -0700 Subject: [PATCH 258/406] Add IntelliJ 2020.2, 2020.3, 2021.1 (#1731) Co-authored-by: Laurent Raufaste --- mackup/applications/intellijidea.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/intellijidea.cfg b/mackup/applications/intellijidea.cfg index f8b80b9a1..a908b6b8d 100644 --- a/mackup/applications/intellijidea.cfg +++ b/mackup/applications/intellijidea.cfg @@ -47,6 +47,8 @@ Library/Application Support/IntelliJIdea2019.1 Library/Application Support/IntelliJIdea2019.2 Library/Application Support/IntelliJIdea2019.3 Library/Application Support/JetBrains/IntelliJIdea2020.1 +Library/Application Support/JetBrains/IntelliJIdea2020.2 +Library/Application Support/JetBrains/IntelliJIdea2020.3 Library/Application Support/JetBrains/IntelliJIdea2021.1 Library/Preferences/IdeaIC2016.1 Library/Preferences/IdeaIC2016.2 From a446afdbf79239320c491a77e45782f6b04cc608 Mon Sep 17 00:00:00 2001 From: Darren Wedgwood Date: Mon, 6 Sep 2021 03:42:12 +0800 Subject: [PATCH 259/406] Add Support for FastScripts (#1750) * Add support for FastScripts * Update README * Update Changelog * Fix typo Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/fastscripts.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/fastscripts.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index eaeead627..ed23d2136 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Updated support for IntelliJIdea version 2021.1 (via @steffenmalisi) - Added support for Sublime Text 4 (via @TCattd) - Added support for AltTab (via @aiotter) +- Added support for FastScripts (via @darrenbkl) - Added support for Affinity Designer (via @EpicKris) - Added support for Affinity Photo (via @EpicKris) - Added support for Affinity Publisher (via @EpicKris) diff --git a/README.md b/README.md index 6fd7029bf..916e3ea70 100644 --- a/README.md +++ b/README.md @@ -293,6 +293,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Fantastical](http://flexibits.com/fantastical) - [fasd](https://github.com/clvv/fasd) - [fastlane](https://fastlane.tools) +- [FastScripts](https://redsweater.com/fastscripts/) - [Feeds](http://www.feedsapp.com/) - [FileZilla](https://filezilla-project.org/) - [Finicky](https://github.com/johnste/finicky) diff --git a/mackup/applications/fastscripts.cfg b/mackup/applications/fastscripts.cfg new file mode 100644 index 000000000..059c0a254 --- /dev/null +++ b/mackup/applications/fastscripts.cfg @@ -0,0 +1,6 @@ +[application] +name = FastScripts + +[configuration_files] +Library/Preferences/com.red-sweater.fastscripts.plist +Library/Application Support/FastScripts From cae97628c1593c6c6ee8f16eae1a62a4bda0dfe7 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Sun, 5 Sep 2021 21:44:34 +0200 Subject: [PATCH 260/406] Update phpstorm.cfg (#1749) Co-authored-by: Laurent Raufaste --- mackup/applications/phpstorm.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg index 2913e82d6..57f6d1da4 100644 --- a/mackup/applications/phpstorm.cfg +++ b/mackup/applications/phpstorm.cfg @@ -2,6 +2,10 @@ name = PhpStorm [configuration_files] +Library/Application Support/JetBrains/PhpStorm2020.1 +Library/Application Support/JetBrains/PhpStorm2020.2 +Library/Application Support/JetBrains/PhpStorm2020.3 +Library/Application Support/JetBrains/PhpStorm2021.1 Library/Application Support/PhpStorm2016.1 Library/Application Support/PhpStorm2016.2 Library/Application Support/PhpStorm2016.3 From f636f29a09949c8ad8a078efab4e0f0ab38fac82 Mon Sep 17 00:00:00 2001 From: Anirudh Bagri Date: Mon, 6 Sep 2021 01:17:24 +0530 Subject: [PATCH 261/406] add support for akamai-cli (#1746) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/akamai-cli.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/akamai-cli.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ed23d2136..2987d325f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Updated support for IntelliJIdea version 2021.1 (via @steffenmalisi) - Added support for Sublime Text 4 (via @TCattd) - Added support for AltTab (via @aiotter) +- Added support for Akamai CLI (via @anirudhbagri) - Added support for FastScripts (via @darrenbkl) - Added support for Affinity Designer (via @EpicKris) - Added support for Affinity Photo (via @EpicKris) diff --git a/README.md b/README.md index 916e3ea70..c9662f950 100644 --- a/README.md +++ b/README.md @@ -174,6 +174,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Affinity Photo](https://affinity.serif.com/photo) - [Affinity Publisher](https://affinity.serif.com/publisher) - [Airmail](http://airmailapp.com/) +- [Akamai-CLI](https://developer.akamai.com/cli) - [Alacritty](https://github.com/jwilm/alacritty) - [AltTab](https://alt-tab-macos.netlify.app/) - [Amethyst](https://ianyh.com/amethyst/) diff --git a/mackup/applications/akamai-cli.cfg b/mackup/applications/akamai-cli.cfg new file mode 100644 index 000000000..849d7d751 --- /dev/null +++ b/mackup/applications/akamai-cli.cfg @@ -0,0 +1,5 @@ +[application] +name = Akamai-CLI + +[configuration_files] +.edgerc From f8ebf439b4ad54febd01f8f8fc07bfb7de930d67 Mon Sep 17 00:00:00 2001 From: Antoni K Date: Mon, 6 Sep 2021 03:52:33 +0800 Subject: [PATCH 262/406] Add support for Swish (#1734) * Added support for Swish * Added Swish to README * Add Swish to changelong Co-authored-by: Antoni Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/swish.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/swish.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 2987d325f..ed1e2c4f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for PsySH (via @nesk) - Updated support for IntelliJIdea version 2021.1 (via @steffenmalisi) - Added support for Sublime Text 4 (via @TCattd) +- Added support for Swish (via @antoni-k) - Added support for AltTab (via @aiotter) - Added support for Akamai CLI (via @anirudhbagri) - Added support for FastScripts (via @darrenbkl) diff --git a/README.md b/README.md index c9662f950..6c43be4f6 100644 --- a/README.md +++ b/README.md @@ -586,6 +586,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Surge](http://surge.run/manual/) - [Sway](https://swaywm.org/) - [Swinsian](http://swinsian.com/) +- [Swish](https://highlyopinionated.co/swish/) - [T](http://sferik.github.io/t/) - [TablePlus](https://tableplus.io) - [TaskPaper](http://www.hogbaysoftware.com/products/taskpaper) diff --git a/mackup/applications/swish.cfg b/mackup/applications/swish.cfg new file mode 100644 index 000000000..575109a74 --- /dev/null +++ b/mackup/applications/swish.cfg @@ -0,0 +1,5 @@ +[application] +name = Swish + +[configuration_files] +Library/Preferences/co.highlyopinionated.swish.plist From ae0b675d1af49b270e8d36368a852ffaa2e7b526 Mon Sep 17 00:00:00 2001 From: Antoni K Date: Mon, 6 Sep 2021 03:56:57 +0800 Subject: [PATCH 263/406] Added support for Contexts (#1735) Co-authored-by: Antoni Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/contexts.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/contexts.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ed1e2c4f4..cd900800f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for PsySH (via @nesk) - Updated support for IntelliJIdea version 2021.1 (via @steffenmalisi) - Added support for Sublime Text 4 (via @TCattd) +- Added support for Contexts (via @antoni-k) - Added support for Swish (via @antoni-k) - Added support for AltTab (via @aiotter) - Added support for Akamai CLI (via @anirudhbagri) diff --git a/README.md b/README.md index 6c43be4f6..c440e416b 100644 --- a/README.md +++ b/README.md @@ -250,6 +250,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Concentrate](http://www.getconcentrating.com/) - [Conky](https://github.com/brndnmtthws/conky) - [Consular](https://github.com/achiu/consular) +- [Contexts](https://contexts.co) - [ControlPlane](http://www.controlplaneapp.com/) - [CopyQ](https://github.com/hluk/CopyQ) - [CoRD](http://cord.sourceforge.net/) diff --git a/mackup/applications/contexts.cfg b/mackup/applications/contexts.cfg new file mode 100644 index 000000000..43fedfaee --- /dev/null +++ b/mackup/applications/contexts.cfg @@ -0,0 +1,5 @@ +[application] +name = Contexts + +[configuration_files] +Library/Preferences/com.contextsformac.Contexts.plist From 246c745e45c8e14282a0ec47523d50fbfa363b2a Mon Sep 17 00:00:00 2001 From: dec0dOS Date: Mon, 3 May 2021 00:00:10 +0300 Subject: [PATCH 264/406] Add MTMR support --- mackup/applications/mtmr.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/mtmr.cfg diff --git a/mackup/applications/mtmr.cfg b/mackup/applications/mtmr.cfg new file mode 100644 index 000000000..04691eafc --- /dev/null +++ b/mackup/applications/mtmr.cfg @@ -0,0 +1,5 @@ +[application] +name = mtmr + +[configuration_files] +Library/Application Support/MTMR/items.json From 0d75de2a60f53d75580113b4139cef3847fa863b Mon Sep 17 00:00:00 2001 From: dec0dOS Date: Mon, 3 May 2021 00:01:34 +0300 Subject: [PATCH 265/406] Add MTMR entry to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd900800f..61bcafc7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ - Added support for Affinity Designer (via @EpicKris) - Added support for Affinity Photo (via @EpicKris) - Added support for Affinity Publisher (via @EpicKris) +- Added support for MTMR (via @dec0dOS) ## Mackup 0.8.32 From aeab4ba0fc8b6687eb28691de99a8e7c6180f836 Mon Sep 17 00:00:00 2001 From: dec0dOS Date: Mon, 3 May 2021 00:06:49 +0300 Subject: [PATCH 266/406] Add MTMR entry to readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c440e416b..c4fede164 100644 --- a/README.md +++ b/README.md @@ -439,6 +439,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [MPlayerX](http://mplayerx.org) - [MPS Youtube](https://github.com/mps-youtube/mps-youtube) - [MPV](https://mpv.io/) +- [MTMR](https://github.com/Toxblh/MTMR) - [Multitouch](https://multitouch.app/) - [MusicBrainz Picard](https://picard.musicbrainz.org/) - [mycli](https://www.mycli.net/) From 56ec36745976bca3e5cbc5dbeee2c38ac1f1465c Mon Sep 17 00:00:00 2001 From: Oli M Date: Sun, 12 Sep 2021 11:46:09 +0100 Subject: [PATCH 267/406] Update neovim to support init.lua (#1695) * Update neovim to support init.lua Neovim from v0.5 onwards will support an init.lua config file (as per this commit https://github.com/neovim/neovim/commit/72c22862dc2199462aef0d450a49d29a9d0680b9). This pull request adds support for this. * Update neovim to include lua directory --- mackup/applications/neovim.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/neovim.cfg b/mackup/applications/neovim.cfg index 01f0ce9f5..5b24d6eff 100644 --- a/mackup/applications/neovim.cfg +++ b/mackup/applications/neovim.cfg @@ -7,3 +7,5 @@ name = neovim [xdg_configuration_files] nvim/init.vim +nvim/init.lua +nvim/lua From 017e25f9bd69c3eb38dbb43f3fa09998b1951cf2 Mon Sep 17 00:00:00 2001 From: Beng Eu Date: Sun, 12 Sep 2021 18:48:55 +0800 Subject: [PATCH 268/406] Add support for Goku (#1747) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/goku.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/goku.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 61bcafc7f..f8c9f11be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Added support for Contexts (via @antoni-k) - Added support for Swish (via @antoni-k) - Added support for AltTab (via @aiotter) +- Added support for Goku (via @thebengeu) - Added support for Akamai CLI (via @anirudhbagri) - Added support for FastScripts (via @darrenbkl) - Added support for Affinity Designer (via @EpicKris) diff --git a/README.md b/README.md index c4fede164..a92089606 100644 --- a/README.md +++ b/README.md @@ -326,6 +326,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Gnome SSH Tunnel Manager](http://sourceforge.net/projects/gstm/) - [GnuPG](https://www.gnupg.org/) - [Go2Shell](http://zipzapmac.com/Go2Shell) +- [Goku](https://github.com/yqrashawn/GokuRakuJoudo) - [GoLand](https://www.jetbrains.com/go/) - [Goldendict](http://goldendict.org/) - [GoodSync](https://goodsync.com/) diff --git a/mackup/applications/goku.cfg b/mackup/applications/goku.cfg new file mode 100644 index 000000000..4c33e547e --- /dev/null +++ b/mackup/applications/goku.cfg @@ -0,0 +1,5 @@ +[application] +name = Goku + +[xdg_configuration_files] +karabiner.edn From 136dbf903d1014b7dd1a62e4ac742893697af7a4 Mon Sep 17 00:00:00 2001 From: yamatsum <42740055+yamatsum@users.noreply.github.com> Date: Mon, 13 Sep 2021 00:06:28 +0900 Subject: [PATCH 269/406] fix: update neovim.cfg. (#1759) --- mackup/applications/neovim.cfg | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mackup/applications/neovim.cfg b/mackup/applications/neovim.cfg index 5b24d6eff..424df0fcc 100644 --- a/mackup/applications/neovim.cfg +++ b/mackup/applications/neovim.cfg @@ -9,3 +9,10 @@ name = neovim nvim/init.vim nvim/init.lua nvim/lua +nvim/colors +nvim/compiler +nvim/ftplugin +nvim/ftdetect +nvim/indent +nvim/plugin +nvim/syntax From 489938795f6541c41e601befada521bd7a81fa02 Mon Sep 17 00:00:00 2001 From: Haren S Date: Sun, 12 Sep 2021 19:39:11 +0100 Subject: [PATCH 270/406] Add Pull Request Template (#1617) --- .github/PULL_REQUEST_TEMPLATE.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..21d33b5c7 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,22 @@ +### All submissions + +* [ ] I have followed the [Contributing Guidelines](https://github.com/lra/mackup/blob/master/.github/CONTRIBUTING.md) +* [ ] I have checked to ensure there aren't other open [Pull Requests](https://github.com/lra/mackup/pulls) for the same update/change + +### Adding/updating Application X Support + +* [ ] This PR is only for one application +* [ ] It has been added to the list of supported applications in the [README](https://github.com/lra/mackup/blob/master/README.md) +* [ ] Changes have been added to the WIP section of the [CHANGELOG](https://github.com/lra/mackup/blob/master/CHANGELOG.md) +* [ ] Syncing does not break the application +* [ ] Syncing does not compete with any syncing functionality internal to the application +* [ ] The configuration syncs the minimal set of data +* [ ] No file specific to the local workstation is synced +* [ ] No sensitive data is synced + +### Improving the Mackup codebase + +* [ ] My submission passes the [tests](https://github.com/lra/mackup/tree/master/tests) +* [ ] I have linted the code locally prior to submission +* [ ] I have written new tests as applicable +* [ ] I have added an explanation of what the changes do From b5d6a2eef7ca845e1ca66a1b4f46743c7bf8fe9f Mon Sep 17 00:00:00 2001 From: Josh Medeski Date: Tue, 5 Oct 2021 08:34:15 -0500 Subject: [PATCH 271/406] Add instructions for switching storage (#1757) * Add instructions for switching storage Related to https://github.com/lra/mackup/issues/1756 Adding detailed instructions for how to switch storage solutions if Mackup is already set up and someone wants to change storage solutions. * Fix mdl errors --- doc/README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/doc/README.md b/doc/README.md index 566d32908..22c179027 100644 --- a/doc/README.md +++ b/doc/README.md @@ -13,7 +13,8 @@ vi ~/.mackup.cfg You can specify the storage type Mackup will use to store your configuration files. -For now you have 4 options: `dropbox`, `google_drive`, `icloud`, `copy` and `file_system`. + +For now, you have 4 options: `dropbox`, `google_drive`, `icloud`, `copy` and `file_system`. If none is specified, Mackup will try to use the default: `dropbox`. With the `dropbox` storage engine, Mackup will automatically figure out your @@ -107,6 +108,16 @@ engine = icloud directory = .config/mackup ``` +### Switching Storage + +If you ever change your mind and switch storage solutions after Mackup is +already setup (ex: from `dropbox` to `icloud`), complete the following steps. + +1. Run `mackup uninstall` on all computers +1. Copy your Mackup files to the new storage location +1. Change the storage provider details in your `.mackup.cfg` file (see above) +1. Run `mackup backup` on the main computer and `mackup restore` on all others + ## Applications ### Only sync one or two applications From bfa413bffb899b055450bb2f8076762a9045613a Mon Sep 17 00:00:00 2001 From: Iulian Onofrei <5748627+revolter@users.noreply.github.com> Date: Fri, 29 Oct 2021 14:26:55 +0300 Subject: [PATCH 272/406] Added support for Rocket (#1767) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/rocket.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/rocket.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index f8c9f11be..c1b4f5f93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ - Added support for Affinity Photo (via @EpicKris) - Added support for Affinity Publisher (via @EpicKris) - Added support for MTMR (via @dec0dOS) +- Added support for Rocket (via @revolter) ## Mackup 0.8.32 diff --git a/README.md b/README.md index a92089606..6e4e7aef4 100644 --- a/README.md +++ b/README.md @@ -527,6 +527,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Rime](http://rime.im/) - [ripgrep](https://github.com/BurntSushi/ripgrep) - [Robomongo](http://robomongo.org/) +- [Rocket](https://matthewpalmer.net/rocket/) - [Rofi](https://github.com/DaveDavenport/rofi) - [Royal TSX](http://www.royaltsx.com/ts/osx/features) - [RStudio](https://www.rstudio.com/) diff --git a/mackup/applications/rocket.cfg b/mackup/applications/rocket.cfg new file mode 100644 index 000000000..b1e402c0d --- /dev/null +++ b/mackup/applications/rocket.cfg @@ -0,0 +1,6 @@ +[application] +name = Rocket + +[configuration_files] +Library/Preferences/net.matthewpalmer.Rocket.plist +Library/Application Support/Rocket From 1fe60c16e6c2c296ad8de7ed6875a86d9d7ea1ea Mon Sep 17 00:00:00 2001 From: Jamie Rolfs Date: Fri, 29 Oct 2021 04:28:14 -0700 Subject: [PATCH 273/406] Fix Hocus Focus (#1765) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add missing directory separators for Hocus Focus 😞 * Sort Hocus Focus entry in readme * Add WIP entry to changelog for Hocus Focus fix Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 2 +- mackup/applications/hocus-focus.cfg | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1b4f5f93..ebe3400b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Fixed support for Hocus Focus (via @jrolfs) - Added support for KeePassXC (via @harens) - Fixed support for poetry (via @ameyuuno) - Added support for npm package npmrc (via @jdvivar) diff --git a/README.md b/README.md index 6e4e7aef4..95f14cf72 100644 --- a/README.md +++ b/README.md @@ -182,7 +182,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Android Studio](https://developer.android.com/sdk/) - [Ansible](http://www.ansible.com/) - [AppCleaner](http://freemacsoft.net/appcleaner/) -- [Hocus Focus](http://hocusfoc.us/) - [AppCode](http://www.jetbrains.com/objc/) - [Apple Music](https://www.apple.com/apple-music/) - [Apptivate](http://www.apptivateapp.com/) @@ -342,6 +341,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Heroku](https://www.heroku.com/) - [HexChat](https://hexchat.github.io/) - [Hexels](http://hexraystudios.com/hexels/) +- [Hocus Focus](http://hocusfoc.us/) - [Homebridge](https://github.com/nfarina/homebridge) - [Homebrew](https://brew.sh) - [Houdini](http://uglyapps.co.uk/houdini/) diff --git a/mackup/applications/hocus-focus.cfg b/mackup/applications/hocus-focus.cfg index a0820d335..e516091a8 100644 --- a/mackup/applications/hocus-focus.cfg +++ b/mackup/applications/hocus-focus.cfg @@ -3,6 +3,6 @@ name = Hocus Focus [configuration_files] Library/Preferences/com.uglyapps.HocusFocus.plist -Library/Application Support/com.uglyapps.HocusFocusHocusFocus.db -Library/Application Support/com.uglyapps.HocusFocusHocusFocus.db-shm -Library/Application Support/com.uglyapps.HocusFocusHocusFocus.db-wal +Library/Application Support/com.uglyapps.HocusFocus/HocusFocus.db +Library/Application Support/com.uglyapps.HocusFocus/HocusFocus.db-shm +Library/Application Support/com.uglyapps.HocusFocus/HocusFocus.db-wal From 97c3d59a5932d4e512736e06bd7be1539147a7c8 Mon Sep 17 00:00:00 2001 From: Benjamin K <53038537+treee111@users.noreply.github.com> Date: Fri, 29 Oct 2021 13:30:28 +0200 Subject: [PATCH 274/406] Add support for Adobe Lightroom Classic (v.10) (#1739) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/lightroom-classic.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/lightroom-classic.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ebe3400b7..52b6b02e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Added support for Lightroom Classic (via @treee111) - Fixed support for Hocus Focus (via @jrolfs) - Added support for KeePassXC (via @harens) - Fixed support for poetry (via @ameyuuno) diff --git a/README.md b/README.md index 95f14cf72..a721abd4a 100644 --- a/README.md +++ b/README.md @@ -169,6 +169,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adobe Illustrator CC](https://www.adobe.com/products/illustrator.html) - [Adobe Photoshop CC](http://www.adobe.com/products/photoshop.html) - [Adobe Photoshop Lightroom CC](https://www.adobe.com/products/photoshop-lightroom.html) +- [Adobe Photoshop Lightroom Classic](https://www.adobe.com/de/products/photoshop-lightroom-classic.html) - [aerc](https://aerc-mail.org/) - [Affinity Designer](https://affinity.serif.com/designer) - [Affinity Photo](https://affinity.serif.com/photo) diff --git a/mackup/applications/lightroom-classic.cfg b/mackup/applications/lightroom-classic.cfg new file mode 100644 index 000000000..94a7a42af --- /dev/null +++ b/mackup/applications/lightroom-classic.cfg @@ -0,0 +1,5 @@ +[application] +name = Adobe Lightroom Classic + +[configuration_files] +Library/Preferences/com.adobe.LightroomClassicCC7.plist From 3cc1172563757c2dacfb3794eae80487e7cad7d3 Mon Sep 17 00:00:00 2001 From: Nghia Tran Date: Fri, 29 Oct 2021 18:31:52 +0700 Subject: [PATCH 275/406] Add Support for Proxyman (#1724) * Add Proxyman app * Update changelog * Adding missing newline Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/proxyman.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/proxyman.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 52b6b02e6..a16011462 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for Qv2ray (via @kidonng) - Added support for Neofetch (via @kidonng) - Added support for PsySH (via @nesk) +- Added support for Proxyman (via @NghiaTranUIT) - Updated support for IntelliJIdea version 2021.1 (via @steffenmalisi) - Added support for Sublime Text 4 (via @TCattd) - Added support for Contexts (via @antoni-k) diff --git a/README.md b/README.md index a721abd4a..629b4ffcc 100644 --- a/README.md +++ b/README.md @@ -506,6 +506,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Proselint](https://github.com/amperser/proselint) - [ProxyChains NG](http://sourceforge.net/projects/proxychains-ng/) - [ProxyChains](http://proxychains.sourceforge.net) +- [Proxyman](https://proxyman.io) - [PsySH](https://psysh.org/) - [Punto Switcher](https://punto.yandex.ru/) - [PyCharm](https://www.jetbrains.com/pycharm/) diff --git a/mackup/applications/proxyman.cfg b/mackup/applications/proxyman.cfg new file mode 100644 index 000000000..c539c8fbd --- /dev/null +++ b/mackup/applications/proxyman.cfg @@ -0,0 +1,6 @@ +[application] +name = Proxyman + +[configuration_files] +Library/Application Support/com.proxyman.NSProxy +Library/Preferences/com.proxyman.NSProxy.plist From 638f22e82d9bd6234d7ea3af621967cf1c4ac9bd Mon Sep 17 00:00:00 2001 From: Dhaval Soneji Date: Fri, 29 Oct 2021 12:33:19 +0100 Subject: [PATCH 276/406] Fix the first usability issue in #1608 (#1718) * Fix #1608 * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/main.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a16011462..341f12eff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for Qv2ray (via @kidonng) - Added support for Neofetch (via @kidonng) - Added support for PsySH (via @nesk) +- Update uninstall prompt for accuracy (via @soneji) - Added support for Proxyman (via @NghiaTranUIT) - Updated support for IntelliJIdea version 2021.1 (via @steffenmalisi) - Added support for Sublime Text 4 (via @TCattd) diff --git a/mackup/main.py b/mackup/main.py index de241a652..9e55fba3f 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -127,7 +127,7 @@ def printAppHeader(app_name): utils.confirm( "You are going to uninstall Mackup.\n" "Every configuration file, setting and dotfile" - " managed by Mackup will be unlinked and moved back" + " managed by Mackup will be unlinked and copied back" " to their original place, in your home folder.\n" "Are you sure?" ) From f52e75cdd186560b36a55ed4fea774aac56c7fe8 Mon Sep 17 00:00:00 2001 From: Damiano Amatruda Date: Fri, 29 Oct 2021 13:34:44 +0200 Subject: [PATCH 277/406] Add support for OBS (#1717) * Create obs.cfg * Update CHANGELOG.md * Update README.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/obs.cfg | 7 +++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/obs.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 341f12eff..3df7a31cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for Qv2ray (via @kidonng) - Added support for Neofetch (via @kidonng) - Added support for PsySH (via @nesk) +- Added support for OBS (via @damianoamatruda) - Update uninstall prompt for accuracy (via @soneji) - Added support for Proxyman (via @NghiaTranUIT) - Updated support for IntelliJIdea version 2021.1 (via @steffenmalisi) diff --git a/README.md b/README.md index 629b4ffcc..66c4ee23c 100644 --- a/README.md +++ b/README.md @@ -465,6 +465,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Nushell](https://www.nushell.sh/) - [nvALT](http://brettterpstra.com/projects/nvalt/) - [nvpy](https://github.com/cpbotha/nvpy) +- [OBS](https://obsproject.com) - [Oh My Fish](https://github.com/bpinto/oh-my-fish) - [Oh My Tmux](https://github.com/gpakosz/.tmux) - [OmniFocus](https://www.omnigroup.com/omnifocus/) diff --git a/mackup/applications/obs.cfg b/mackup/applications/obs.cfg new file mode 100644 index 000000000..48b0e5036 --- /dev/null +++ b/mackup/applications/obs.cfg @@ -0,0 +1,7 @@ +[application] +name = OBS + +[configuration_files] +Library/Preferences/com.obsproject.obs-studio.plist +Library/Application Support/obs-studio/global.ini +Library/Application Support/obs-studio/basic From bfedd6614ff66e188186d76342d23de198967a7b Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 29 Oct 2021 06:35:55 -0500 Subject: [PATCH 278/406] Fix broken link for git-hooks (#1764) Co-authored-by: Laurent Raufaste --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 66c4ee23c..98f4a90cf 100644 --- a/README.md +++ b/README.md @@ -316,7 +316,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [GHCi](https://wiki.haskell.org/GHC/GHCi) - [Ghostwriter](https://wereturtle.github.io/ghostwriter/) - [Gimp](https://www.gimp.org/) -- [Git Hooks](https://github.com/icefox/git-hooks) +- [Git Hooks](https://github.com/git-hooks/git-hooks) - [Git](http://git-scm.com/) - [Gitbox](http://gitboxapp.com/) - [GitKraken](https://www.gitkraken.com) From a8782a2f4d611d381aa18673b647b7669978cfbf Mon Sep 17 00:00:00 2001 From: Damiano Amatruda Date: Fri, 29 Oct 2021 13:42:12 +0200 Subject: [PATCH 279/406] Add support for Logitech Options (#1716) * Create logitech-options.cfg * Update CHANGELOG.md * Update README.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/logitech-options.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/logitech-options.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 3df7a31cc..7cfd94830 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for Qv2ray (via @kidonng) - Added support for Neofetch (via @kidonng) - Added support for PsySH (via @nesk) +- Added support for Logitech Options (via @damianoamatruda) - Added support for OBS (via @damianoamatruda) - Update uninstall prompt for accuracy (via @soneji) - Added support for Proxyman (via @NghiaTranUIT) diff --git a/README.md b/README.md index 98f4a90cf..061824424 100644 --- a/README.md +++ b/README.md @@ -407,6 +407,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Liquid Prompt](https://github.com/nojhan/liquidprompt) - [LittleSnitch](http://www.obdev.at/products/littlesnitch/) - [Livestreamer](http://livestreamer.tanuki.se/) +- [Logitech Options](https://www.logitech.com/en-us/product/options) - [Lollypop](https://gnumdk.github.io/lollypop-web/) - [Luftrausers](http://luftrausers.com) - [MacDive](http://www.mac-dive.com/) diff --git a/mackup/applications/logitech-options.cfg b/mackup/applications/logitech-options.cfg new file mode 100644 index 000000000..751d1ec15 --- /dev/null +++ b/mackup/applications/logitech-options.cfg @@ -0,0 +1,5 @@ +[application] +name = Logitech Options + +[configuration_files] +Library/Preferences/com.logitech.manager.setting.ffff.plist From 3c06a0b9e60cc398422162f32dc8e6297599b16c Mon Sep 17 00:00:00 2001 From: Damiano Amatruda Date: Fri, 29 Oct 2021 13:47:22 +0200 Subject: [PATCH 280/406] Add support for Ghidra (#1715) * Create ghidra.cfg * Update CHANGELOG.md * Update README.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/ghidra.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/ghidra.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cfd94830..ac2cae61a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for Qv2ray (via @kidonng) - Added support for Neofetch (via @kidonng) - Added support for PsySH (via @nesk) +- Added support for Ghidra (via @damianoamatruda) - Added support for Logitech Options (via @damianoamatruda) - Added support for OBS (via @damianoamatruda) - Update uninstall prompt for accuracy (via @soneji) diff --git a/README.md b/README.md index 061824424..df5fc2fa2 100644 --- a/README.md +++ b/README.md @@ -314,6 +314,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Gear Player](https://www.gearmusicplayer.com/) - [GeekTool](http://projects.tynsoe.org/en/geektool/) - [GHCi](https://wiki.haskell.org/GHC/GHCi) +- [Ghidra](https://ghidra-sre.org) - [Ghostwriter](https://wereturtle.github.io/ghostwriter/) - [Gimp](https://www.gimp.org/) - [Git Hooks](https://github.com/git-hooks/git-hooks) diff --git a/mackup/applications/ghidra.cfg b/mackup/applications/ghidra.cfg new file mode 100644 index 000000000..f052c909c --- /dev/null +++ b/mackup/applications/ghidra.cfg @@ -0,0 +1,5 @@ +[application] +name = Ghidra + +[configuration_files] +.ghidra From af3620162cad2bc22264dd63bb05f51b1eae18fb Mon Sep 17 00:00:00 2001 From: Damiano Amatruda Date: Fri, 29 Oct 2021 13:49:22 +0200 Subject: [PATCH 281/406] Add support for MuteSpotifyAds (#1710) * Create mutespotifyads.cfg * Update CHANGELOG.md * Update README.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/mutespotifyads.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/mutespotifyads.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ac2cae61a..fcd403eba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for Qv2ray (via @kidonng) - Added support for Neofetch (via @kidonng) - Added support for PsySH (via @nesk) +- Added support for MuteSpotifyAds (via @damianoamatruda) - Added support for Ghidra (via @damianoamatruda) - Added support for Logitech Options (via @damianoamatruda) - Added support for OBS (via @damianoamatruda) diff --git a/README.md b/README.md index df5fc2fa2..d550f4741 100644 --- a/README.md +++ b/README.md @@ -446,6 +446,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [MTMR](https://github.com/Toxblh/MTMR) - [Multitouch](https://multitouch.app/) - [MusicBrainz Picard](https://picard.musicbrainz.org/) +- [MuteSpotifyAds](https://github.com/simonmeusel/MuteSpotifyAds) - [mycli](https://www.mycli.net/) - [myrepos](https://github.com/joeyh/myrepos) - [MySQL Workbench](https://www.mysql.com/products/workbench/) diff --git a/mackup/applications/mutespotifyads.cfg b/mackup/applications/mutespotifyads.cfg new file mode 100644 index 000000000..f8d3b8614 --- /dev/null +++ b/mackup/applications/mutespotifyads.cfg @@ -0,0 +1,5 @@ +[application] +name = MuteSpotifyAds + +[configuration_files] +Library/Preferences/de.simonmeusel.MuteSpotifyAds.plist From 5f00c605f80e042f0f55349794310ffc491953dd Mon Sep 17 00:00:00 2001 From: Damiano Amatruda Date: Fri, 29 Oct 2021 13:53:45 +0200 Subject: [PATCH 282/406] Add support for IDA Pro (#1714) * Create idapro.cfg * Update CHANGELOG.md * Update README.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/idapro.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/idapro.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index fcd403eba..b23df9277 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for Qv2ray (via @kidonng) - Added support for Neofetch (via @kidonng) - Added support for PsySH (via @nesk) +- Added support for IDA Pro (via @damianoamatruda) - Added support for MuteSpotifyAds (via @damianoamatruda) - Added support for Ghidra (via @damianoamatruda) - Added support for Logitech Options (via @damianoamatruda) diff --git a/README.md b/README.md index d550f4741..921838521 100644 --- a/README.md +++ b/README.md @@ -356,6 +356,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [HyperSwitch](https://bahoom.com/hyperswitch) - [i2cssh](https://github.com/wouterdebie/i2cssh) - [i3](https://i3wm.org/) +- [IDA Pro](https://www.hex-rays.com/products/ida/) - [IdeaVim](https://github.com/JetBrains/ideavim) - [IINA](https://iina.io) - [Inkscape](https://inkscape.org/) diff --git a/mackup/applications/idapro.cfg b/mackup/applications/idapro.cfg new file mode 100644 index 000000000..332b892d3 --- /dev/null +++ b/mackup/applications/idapro.cfg @@ -0,0 +1,5 @@ +[application] +name = IDA Pro + +[configuration_files] +.idapro From f10ad1b0c9e6bfaf79235604f9361232121bc49c Mon Sep 17 00:00:00 2001 From: Damiano Amatruda Date: Fri, 29 Oct 2021 13:54:59 +0200 Subject: [PATCH 283/406] Add support for Loopback (#1711) * Create loopback.cfg * Update CHANGELOG.md * Update README.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/loopback.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/loopback.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b23df9277..eebf124f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for Qv2ray (via @kidonng) - Added support for Neofetch (via @kidonng) - Added support for PsySH (via @nesk) +- Added support for Loopback (via @damianoamatruda) - Added support for IDA Pro (via @damianoamatruda) - Added support for MuteSpotifyAds (via @damianoamatruda) - Added support for Ghidra (via @damianoamatruda) diff --git a/README.md b/README.md index 921838521..be55ad77e 100644 --- a/README.md +++ b/README.md @@ -411,6 +411,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Livestreamer](http://livestreamer.tanuki.se/) - [Logitech Options](https://www.logitech.com/en-us/product/options) - [Lollypop](https://gnumdk.github.io/lollypop-web/) +- [Loopback](https://rogueamoeba.com/loopback/) - [Luftrausers](http://luftrausers.com) - [MacDive](http://www.mac-dive.com/) - [MacDown](http://macdown.uranusjr.com/) diff --git a/mackup/applications/loopback.cfg b/mackup/applications/loopback.cfg new file mode 100644 index 000000000..930dc5e53 --- /dev/null +++ b/mackup/applications/loopback.cfg @@ -0,0 +1,6 @@ +[application] +name = Loopback + +[configuration_files] +Library/Preferences/com.rogueamoeba.Loopback.plist +Library/Application Support/Loopback/Devices.plist From 064aadebd2a699d7b836225365b849035b5538c4 Mon Sep 17 00:00:00 2001 From: Damiano Amatruda Date: Fri, 29 Oct 2021 13:57:49 +0200 Subject: [PATCH 284/406] Fix support for HandBrake (#1712) * Update handbrake.cfg * Update CHANGELOG.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/handbrake.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eebf124f3..053710010 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for Qv2ray (via @kidonng) - Added support for Neofetch (via @kidonng) - Added support for PsySH (via @nesk) +- Fixed support for HandBrake (via @damianoamatruda) - Added support for Loopback (via @damianoamatruda) - Added support for IDA Pro (via @damianoamatruda) - Added support for MuteSpotifyAds (via @damianoamatruda) diff --git a/mackup/applications/handbrake.cfg b/mackup/applications/handbrake.cfg index b9e27dd09..9040592ba 100644 --- a/mackup/applications/handbrake.cfg +++ b/mackup/applications/handbrake.cfg @@ -2,4 +2,4 @@ name = HandBrake [configuration_files] -Library/Application Support/HandBrake/UserPresets.plist +Library/Containers/fr.handbrake.HandBrake/Data/Library/Application Support/HandBrake/UserPresets.json From e6e9b6944a9225c8bd4294cc7c981c38735f9cf6 Mon Sep 17 00:00:00 2001 From: Qiangning Hong Date: Fri, 29 Oct 2021 20:00:35 +0800 Subject: [PATCH 285/406] Add support for Flake8 (#1701) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/flake8.cfg | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 mackup/applications/flake8.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 053710010..bea6da62f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for Qv2ray (via @kidonng) - Added support for Neofetch (via @kidonng) - Added support for PsySH (via @nesk) +- Added support for Flake8 (via @hongqn) - Fixed support for HandBrake (via @damianoamatruda) - Added support for Loopback (via @damianoamatruda) - Added support for IDA Pro (via @damianoamatruda) diff --git a/README.md b/README.md index be55ad77e..c374af4b1 100644 --- a/README.md +++ b/README.md @@ -301,6 +301,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Finicky](https://github.com/johnste/finicky) - [Fish](http://fishshell.com/) - [Fisher](https://github.com/jorgebucaran/fisher) +- [Flake8](https://flake8.pycqa.org/) - [FlexGet](http://flexget.com/) - [Flux](https://justgetflux.com/) - [Focus](https://heyfocus.com) diff --git a/mackup/applications/flake8.cfg b/mackup/applications/flake8.cfg new file mode 100644 index 000000000..14019fbba --- /dev/null +++ b/mackup/applications/flake8.cfg @@ -0,0 +1,8 @@ +[application] +name = flake8 + +[configuration_files] +.flake8 + +[xdg_configuration_files] +flake8 From 2242dce9d650b395d9586b9e0e444dd8a8cfd656 Mon Sep 17 00:00:00 2001 From: Damiano Amatruda Date: Fri, 29 Oct 2021 14:06:16 +0200 Subject: [PATCH 286/406] Add support for Tiles (#1709) * Create tiles.cfg * Update CHANGELOG.md * Update README.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/tiles.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/tiles.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index bea6da62f..02bf2c4be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for Qv2ray (via @kidonng) - Added support for Neofetch (via @kidonng) - Added support for PsySH (via @nesk) +- Added support for Tiles (via @damianoamatruda) - Added support for Flake8 (via @hongqn) - Fixed support for HandBrake (via @damianoamatruda) - Added support for Loopback (via @damianoamatruda) diff --git a/README.md b/README.md index c374af4b1..5d483f4bf 100644 --- a/README.md +++ b/README.md @@ -613,6 +613,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [TextMate](http://macromates.com/) - [Textual](http://www.codeux.com/textual/) - [Tig](https://github.com/jonas/tig) +- [Tiles](https://www.sempliva.com/tiles/) - [Tilix](https://github.com/gnunn1/tilix) - [Timeout](https://www.dejal.com/timeout/) - [tint2](https://code.google.com/p/tint2/) diff --git a/mackup/applications/tiles.cfg b/mackup/applications/tiles.cfg new file mode 100644 index 000000000..6da97d757 --- /dev/null +++ b/mackup/applications/tiles.cfg @@ -0,0 +1,5 @@ +[application] +name = Tiles + +[configuration_files] +Library/Preferences/com.sempliva.Tiles.plist From 0c66057f167dbc3f88e4ffcd30e26eecc92daf77 Mon Sep 17 00:00:00 2001 From: vincent Date: Fri, 29 Oct 2021 20:32:10 +0800 Subject: [PATCH 287/406] Add support for universal-ctags (#1703) * Add support for universal-ctags According https://github.com/universal-ctags/ctags/pull/1519/files, universal-ctags use ~/.ctags.d/*.ctags instead ~/.ctags * Missing newline Co-authored-by: Laurent Raufaste --- mackup/applications/ctags.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/ctags.cfg b/mackup/applications/ctags.cfg index d2727d579..5d9d3b997 100644 --- a/mackup/applications/ctags.cfg +++ b/mackup/applications/ctags.cfg @@ -3,3 +3,4 @@ name = Ctags [configuration_files] .ctags +.ctags.d From b23618e953ca473dc610e603edc5f097add81ac5 Mon Sep 17 00:00:00 2001 From: james_lin Date: Fri, 29 Oct 2021 20:34:12 +0800 Subject: [PATCH 288/406] feat(polybar): Add support for polybar (#1697) * feat(polybar): Add support for polybar https://github.com/polybar/polybar * Update README.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/polybar.cfg | 11 +++++++++++ 3 files changed, 13 insertions(+) create mode 100644 mackup/applications/polybar.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 02bf2c4be..08e7da8be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for Qv2ray (via @kidonng) - Added support for Neofetch (via @kidonng) - Added support for PsySH (via @nesk) +- Added support for polybar(via @jneo8) - Added support for Tiles (via @damianoamatruda) - Added support for Flake8 (via @hongqn) - Fixed support for HandBrake (via @damianoamatruda) diff --git a/README.md b/README.md index 5d483f4bf..e026f0012 100644 --- a/README.md +++ b/README.md @@ -500,6 +500,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Poedit](http://poedit.net/) - [Poetry](https://python-poetry.org) - [PokerStars](https://www.pokerstars.com/) +- [Polybar](https://polybar.github.io/) - [PopClip](http://pilotmoon.com/popclip/) - [Popcorn-Time](https://popcorntime.io/) - [PostgreSQL](http://www.postgresql.org/) diff --git a/mackup/applications/polybar.cfg b/mackup/applications/polybar.cfg new file mode 100644 index 000000000..7798d4ae0 --- /dev/null +++ b/mackup/applications/polybar.cfg @@ -0,0 +1,11 @@ +[application] +name = polybar + +[configuration_files] +.polybar/config +.polybar/launch.sh + +[xdg_configuration_files] +polybar/config +polybar/launch.sh +polybar/scripts From 9240f784b0ed8927bc29eeffac680ed55b010cf6 Mon Sep 17 00:00:00 2001 From: Lucas Larson <91468+LucasLarson@users.noreply.github.com> Date: Fri, 29 Oct 2021 08:43:38 -0400 Subject: [PATCH 289/406] repair `.cfg` file reference to Powerlevel10k (#1637) Co-authored-by: Laurent Raufaste --- mackup/applications/p10k.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/p10k.cfg b/mackup/applications/p10k.cfg index 4703fa661..a5e377bc5 100644 --- a/mackup/applications/p10k.cfg +++ b/mackup/applications/p10k.cfg @@ -1,5 +1,5 @@ [application] -name = p10k +name = Powerlevel10k [configuration_files] .p10k.zsh From 701ceb4db67cd363f099292b607bfa78f5afe67a Mon Sep 17 00:00:00 2001 From: fang duan Date: Fri, 29 Oct 2021 20:45:36 +0800 Subject: [PATCH 290/406] Add rbenv support (#1616) * Add rbenv support * Update Changelog and Readme Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/rbenv.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/rbenv.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 08e7da8be..807f379a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ - Added support for espanso (via @maxandersen) - Added support for lazygit (via @joshmedeski) - Added support for WebStorm versions 2019.4, 2020.2, 2020.3, 2020.4 (via @bdcarr) +- Added support for rbenv (via @dfang) - Added support for draft (via @dfang) - Added support for lf (via @joshmedeski) - Added support for Beets (via @publicarray) diff --git a/README.md b/README.md index e026f0012..fd52570cc 100644 --- a/README.md +++ b/README.md @@ -529,6 +529,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Rails](http://rubyonrails.org/) - [Ranger](https://ranger.github.io/) - [Raycast](https://raycast.com/) +- [Rbenv](https://www.github.com/rbenv/rbenv) - [Rclone](https://rclone.org/) - [Rectangle](https://rectangleapp.com/) - [Redshift Scheduler](https://github.com/spantaleev/redshift-scheduler) diff --git a/mackup/applications/rbenv.cfg b/mackup/applications/rbenv.cfg new file mode 100644 index 000000000..75d007814 --- /dev/null +++ b/mackup/applications/rbenv.cfg @@ -0,0 +1,5 @@ +[application] +name = rbenv + +[configuration_files] +.rbenv/default_gems From 3427528a661efad7c7fff2d6c5ca81f2bed7e4d3 Mon Sep 17 00:00:00 2001 From: fang duan Date: Fri, 29 Oct 2021 20:47:26 +0800 Subject: [PATCH 291/406] Add k9s support (#1612) * Create k9s.cfg * Update readme and changelog * Update README.md * Update CHANGELOG.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 2 +- mackup/applications/k9s.cfg | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 807f379a7..3c217790e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ - Added support for Affinity Publisher (via @EpicKris) - Added support for MTMR (via @dec0dOS) - Added support for Rocket (via @revolter) +- Updated support for k9s (via @dfang) ## Mackup 0.8.32 diff --git a/README.md b/README.md index fd52570cc..806037c10 100644 --- a/README.md +++ b/README.md @@ -379,7 +379,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Julia](http://julialang.org) - [Jumpcut](http://jumpcut.sourceforge.net/) - [Jupyter](http://jupyter.org/) -- [K9s](https://github.com/derailed/k9s) +- [k9s](https://k9scli.io/) - [Kaggle](https://kaggle.com/) - [Kaleidoscope](http://www.kaleidoscopeapp.com/) - [Karabiner Elements](https://github.com/tekezo/Karabiner-Elements) diff --git a/mackup/applications/k9s.cfg b/mackup/applications/k9s.cfg index b19ae9011..741eda1a7 100644 --- a/mackup/applications/k9s.cfg +++ b/mackup/applications/k9s.cfg @@ -1,5 +1,5 @@ [application] -name = K9s +name = k9s [configuration_files] -.k9s +.k9s/config.yml From 56ff8880c542bd080e5b3dc4e15a4085e6ae17fa Mon Sep 17 00:00:00 2001 From: tillhainbach <33448151+tillhainbach@users.noreply.github.com> Date: Fri, 29 Oct 2021 14:48:53 +0200 Subject: [PATCH 292/406] Add Note files and dirs should be rooted in $HOME (#1601) Co-authored-by: Laurent Raufaste --- doc/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/README.md b/doc/README.md index 22c179027..286b71227 100644 --- a/doc/README.md +++ b/doc/README.md @@ -174,11 +174,13 @@ The stock application configs are in the `mackup/applications` directory. Remember to follow the guidelines in [CONTRIBUTING.md](https://github.com/lra/mackup/blob/master/.github/CONTRIBUTING.md) to get your Pull Request merged faster. -### Add support for an application or any file or directory +### Add support for an application or (almost) any file or directory You can customize the Mackup engine and add support for unsupported applications or just custom files and directories you'd like to sync. +NOTE: Files and directory to be synced should be rooted at $HOME. + Let's say that you'd like to add support for Nethack (config file: `.nethackrc`) and for the `bin` and `.hidden` directories you keep in your home. From 301f63d4690401714e657e7fd32b54852b094f83 Mon Sep 17 00:00:00 2001 From: TLZ Date: Fri, 29 Oct 2021 16:08:20 +0000 Subject: [PATCH 293/406] Add .default-npm-packages to asdf (#1688) --- mackup/applications/asdf.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/asdf.cfg b/mackup/applications/asdf.cfg index 109799dd3..8f8496621 100644 --- a/mackup/applications/asdf.cfg +++ b/mackup/applications/asdf.cfg @@ -5,3 +5,4 @@ name = asdf .asdfrc .tool-versions .default-gems +.default-npm-packages From 89cc932d83f3388a16d127b5bb1736438f0ec061 Mon Sep 17 00:00:00 2001 From: Thomas Kahle Date: Fri, 29 Oct 2021 18:58:01 +0200 Subject: [PATCH 294/406] Include custom key bindings for MailMate (#1689) Custom Keybindings can be created by editing .plist files located in the folder Library/Application Support/Mailmate/Resources/KeyBindings. These should sync as well. Documentation of this feature is here: https://manual.mailmate-app.com/custom_key_bindings Co-authored-by: Laurent Raufaste --- mackup/applications/mailmate.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/mailmate.cfg b/mackup/applications/mailmate.cfg index a49ed2c87..c122a2c17 100644 --- a/mackup/applications/mailmate.cfg +++ b/mackup/applications/mailmate.cfg @@ -10,3 +10,4 @@ Library/Application Support/Mailmate/Signatures.plist Library/Application Support/Mailmate/Sources.plist Library/Application Support/Mailmate/Submission.plist Library/Application Support/Mailmate/Tags.plist +Library/Application Support/Mailmate/Resources/KeyBindings From 2a284bf5780ff34509024fd1708069bf5477910b Mon Sep 17 00:00:00 2001 From: Yuto Date: Sat, 30 Oct 2021 01:59:25 +0900 Subject: [PATCH 295/406] Add support for Mendeley Desktop (#1618) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/mendeley.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/mendeley.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c217790e..77228f7a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ - Added support for MTMR (via @dec0dOS) - Added support for Rocket (via @revolter) - Updated support for k9s (via @dfang) +- Added support for Mendeley Desktop (via @aiotter) ## Mackup 0.8.32 diff --git a/README.md b/README.md index 806037c10..a10a7be27 100644 --- a/README.md +++ b/README.md @@ -430,6 +430,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [MATLAB](http://www.mathworks.com/products/matlab/) - [Maven](http://maven.apache.org) - [Max](http://sbooth.org/Max/) +- [Mendeley Desktop](https://www.mendeley.com) - [MenuMeters](http://www.ragingmenace.com/software/menumeters/) - [Mercurial](https://www.mercurial-scm.org/) - [MercuryMover](http://www.heliumfoot.com/mercurymover/) diff --git a/mackup/applications/mendeley.cfg b/mackup/applications/mendeley.cfg new file mode 100644 index 000000000..b33797eb7 --- /dev/null +++ b/mackup/applications/mendeley.cfg @@ -0,0 +1,5 @@ +[application] +name = Mendelay Desktop + +[configuration_files] +Library/Application Support/Mendeley Desktop From 4560cc879c493032e497b812d9d19c99a9cfab1d Mon Sep 17 00:00:00 2001 From: grapswiz Date: Sat, 30 Oct 2021 05:52:48 +0900 Subject: [PATCH 296/406] Add additional license file support for BetterTouchTool (#1633) This app generates file with different name via BetterSnapTool Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/bettertouchtool.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77228f7a5..582dd147d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ - Added support for Affinity Publisher (via @EpicKris) - Added support for MTMR (via @dec0dOS) - Added support for Rocket (via @revolter) +- Updated support for BetterTouchTool (via @grapswiz) - Updated support for k9s (via @dfang) - Added support for Mendeley Desktop (via @aiotter) diff --git a/mackup/applications/bettertouchtool.cfg b/mackup/applications/bettertouchtool.cfg index 04d3d074c..bcc5ba49c 100644 --- a/mackup/applications/bettertouchtool.cfg +++ b/mackup/applications/bettertouchtool.cfg @@ -8,3 +8,4 @@ Library/Application Support/BetterTouchTool/btt_data_store.v2-shm Library/Application Support/BetterTouchTool/btt_data_store.v2-wal Library/Application Support/BetterTouchTool/bttdata2 Library/Preferences/com.hegenberg.BetterTouchTool.plist +Library/Application Support/BetterTouchTool/bettersnaptool.bttlicense From d6d2b61bc87ee484d44d04b25b11daf08dcc2785 Mon Sep 17 00:00:00 2001 From: Robert Barat Date: Sat, 30 Oct 2021 09:37:20 -0400 Subject: [PATCH 297/406] Specify command to edit (rather than simply concatenate) config files (#1748) --- doc/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/README.md b/doc/README.md index 286b71227..605182b8a 100644 --- a/doc/README.md +++ b/doc/README.md @@ -197,7 +197,7 @@ touch ~/.mackup/my-files.cfg Edit those files ```bash -$ cat ~/.mackup/nethack.cfg +$ nano ~/.mackup/nethack.cfg [application] name = Nethack @@ -206,7 +206,7 @@ name = Nethack ``` ```bash -$ cat ~/.mackup/my-files.cfg +$ nano ~/.mackup/my-files.cfg [application] name = My personal synced files and dirs From 82f6db9e7e225738ac10411a366e13a45c73bbb9 Mon Sep 17 00:00:00 2001 From: ye4241 <6803102+ye4241@users.noreply.github.com> Date: Sat, 30 Oct 2021 21:38:46 +0800 Subject: [PATCH 298/406] add support for CleanShot (#1707) * add cleanshot.cfg for https://cleanshot.com/ * update readme.md for CleanShot; * Missing newline Co-authored-by: ye4241 Co-authored-by: Laurent Raufaste --- README.md | 1 + mackup/applications/cleanshot.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/cleanshot.cfg diff --git a/README.md b/README.md index a10a7be27..9922be5da 100644 --- a/README.md +++ b/README.md @@ -236,6 +236,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Cider](https://github.com/msanders/cider) - [ClashX](https://github.com/yichengchen/clashX) - [Clasp](https://github.com/google/clasp) +- [CleanShot](https://cleanshot.com/) - [Clementine](https://www.clementine-player.org/) - [CLion](https://www.jetbrains.com/clion/) - [ClipMenu](http://www.clipmenu.com/) diff --git a/mackup/applications/cleanshot.cfg b/mackup/applications/cleanshot.cfg new file mode 100644 index 000000000..c068d5acd --- /dev/null +++ b/mackup/applications/cleanshot.cfg @@ -0,0 +1,5 @@ +[application] +name = CleanShot + +[configuration_files] +Library/Preferences/com.getcleanshot.app-setapp.plist From 9cb5ef5d58aef6a521fce8b42cfcbd5623b6338d Mon Sep 17 00:00:00 2001 From: ye4241 <6803102+ye4241@users.noreply.github.com> Date: Sat, 30 Oct 2021 21:41:56 +0800 Subject: [PATCH 299/406] add support for Eagle (ogdesign) (#1705) * add eagle.cfg for https://eagle.cool/ * update readme.md for eagle (ogdesign); Co-authored-by: ye4241 Co-authored-by: Laurent Raufaste --- README.md | 1 + mackup/applications/ogdesign-eagle.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/ogdesign-eagle.cfg diff --git a/README.md b/README.md index 9922be5da..951247eee 100644 --- a/README.md +++ b/README.md @@ -282,6 +282,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Droplr](https://droplr.com/) - [Dropzone 3](https://aptonic.com/dropzone3/) - [Drush](http://www.drush.org/) +- [Eagle (ogdesign)](https://eagle.cool/) - [EditorConfig](http://editorconfig.org/) - [Electrum](https://electrum.org/#home) - [Emacs](http://www.gnu.org/software/emacs/) diff --git a/mackup/applications/ogdesign-eagle.cfg b/mackup/applications/ogdesign-eagle.cfg new file mode 100644 index 000000000..9fba0defe --- /dev/null +++ b/mackup/applications/ogdesign-eagle.cfg @@ -0,0 +1,5 @@ +[application] +name = Eagle (ogdesign) + +[configuration_files] +Library/Application Support/Eagle/Settings From 054358c5548dca0a4cc69bc6a98b1a665e46feac Mon Sep 17 00:00:00 2001 From: ye4241 <6803102+ye4241@users.noreply.github.com> Date: Sat, 30 Oct 2021 21:44:07 +0800 Subject: [PATCH 300/406] add support for nuget (#1704) * add nuget.cfg for https://www.nuget.org/ * update readme.md for nuget; Co-authored-by: ye4241 Co-authored-by: Laurent Raufaste --- README.md | 1 + mackup/applications/nuget.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/nuget.cfg diff --git a/README.md b/README.md index 951247eee..53b473d0a 100644 --- a/README.md +++ b/README.md @@ -471,6 +471,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [NoSQLBooster for MongoDB](https://www.nosqlbooster.com/) - [npm](https://www.npmjs.com/) - [npmrc](https://github.com/deoxxa/npmrc/) +- [nuget](https://www.nuget.org/) - [Nushell](https://www.nushell.sh/) - [nvALT](http://brettterpstra.com/projects/nvalt/) - [nvpy](https://github.com/cpbotha/nvpy) diff --git a/mackup/applications/nuget.cfg b/mackup/applications/nuget.cfg new file mode 100644 index 000000000..317651a84 --- /dev/null +++ b/mackup/applications/nuget.cfg @@ -0,0 +1,5 @@ +[application] +name = nuget + +[configuration_files] +.nuget/NuGet/NuGet.Config From fdc50f628c8c81d4c2616fba44273e50863a06da Mon Sep 17 00:00:00 2001 From: ye4241 <6803102+ye4241@users.noreply.github.com> Date: Sat, 30 Oct 2021 21:45:59 +0800 Subject: [PATCH 301/406] add support for Mosaic (#1706) * add mosaic.cfg for https://lightpillar.com/mosaic.html * update readme.md for Mosaic; Co-authored-by: ye4241 Co-authored-by: Laurent Raufaste --- README.md | 1 + mackup/applications/mosaic.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/mosaic.cfg diff --git a/README.md b/README.md index 53b473d0a..8a41c76c0 100644 --- a/README.md +++ b/README.md @@ -444,6 +444,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [mkcert](https://github.com/FiloSottile/mkcert) - [MonoDevelop](http://www.monodevelop.com) - [Moom](http://manytricks.com/moom/) +- [Mosaic](https://lightpillar.com/mosaic.html) - [Mou](http://25.io/mou/) - [mpd](http://www.musicpd.org) - [MPlayerX](http://mplayerx.org) diff --git a/mackup/applications/mosaic.cfg b/mackup/applications/mosaic.cfg new file mode 100644 index 000000000..51d1bfd5a --- /dev/null +++ b/mackup/applications/mosaic.cfg @@ -0,0 +1,5 @@ +[application] +name = Mosaic + +[configuration_files] +Library/Application Support/com.lightpillar.Mosaic/MosaicCoreData.storedata From 5e5ee726dc02a7aad2340eeb39d9a53113345cf0 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 30 Oct 2021 15:47:17 +0200 Subject: [PATCH 302/406] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 582dd147d..0b5e5b92f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ - Updated support for BetterTouchTool (via @grapswiz) - Updated support for k9s (via @dfang) - Added support for Mendeley Desktop (via @aiotter) +- Added support for CleanShot, Mosaic, Eagle and Nuget (via @ye4241) ## Mackup 0.8.32 From cd43c8955d89929b14a9aba2a6d5be8fb3e84796 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 30 Oct 2021 15:48:15 +0200 Subject: [PATCH 303/406] Mackup 0.8.33 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b5e5b92f..73ae44791 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.33 + - Added support for Lightroom Classic (via @treee111) - Fixed support for Hocus Focus (via @jrolfs) - Added support for KeePassXC (via @harens) diff --git a/mackup/constants.py b/mackup/constants.py index 708cc63fc..0971ff919 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = "0.8.32" +VERSION = "0.8.33" # Support platforms PLATFORM_DARWIN = "Darwin" From 577071a212451c413ececcddeca7181b5f2b1c4d Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 3 Nov 2021 17:10:21 +0100 Subject: [PATCH 304/406] Jpmat296 remote desktop manager (#1772) * Add support for Remote Desktop Manager * Add missing changes Co-authored-by: Jean-Pierre Matsumoto --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/remote-desktop-manager.cfg | 6 ++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/remote-desktop-manager.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 73ae44791..c5f1d906e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Added support for Remote Desktop Manager (via @jpmat296) + ## Mackup 0.8.33 - Added support for Lightroom Classic (via @treee111) diff --git a/README.md b/README.md index 8a41c76c0..df9f70e0f 100644 --- a/README.md +++ b/README.md @@ -539,6 +539,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Rectangle](https://rectangleapp.com/) - [Redshift Scheduler](https://github.com/spantaleev/redshift-scheduler) - [Redshift](http://jonls.dk/redshift/) +- [Remote Desktop Manager](https://remotedesktopmanager.com/) - [Rhythmbox](https://wiki.gnome.org/Apps/Rhythmbox) - [Rime](http://rime.im/) - [ripgrep](https://github.com/BurntSushi/ripgrep) diff --git a/mackup/applications/remote-desktop-manager.cfg b/mackup/applications/remote-desktop-manager.cfg new file mode 100644 index 000000000..372542c9d --- /dev/null +++ b/mackup/applications/remote-desktop-manager.cfg @@ -0,0 +1,6 @@ +[application] +name = Remote Desktop Manager + +[configuration_files] +Library/Application Support/com.devolutions.remotedesktopmanager.free/Connections.db +Library/Application Support/com.devolutions.remotedesktopmanager/Connections.db From 03d98cb4e0f0b925bf744f6e20cb824288c8c273 Mon Sep 17 00:00:00 2001 From: Iulian Onofrei <5748627+revolter@users.noreply.github.com> Date: Wed, 3 Nov 2021 23:27:22 +0200 Subject: [PATCH 305/406] Fixed support for asciinema (#1768) * Fixed incorrect asciinema config directory path * Updated the changelog * Fix error-prone configuration Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/asciinema.cfg | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5f1d906e..43aafc76d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Added support for Remote Desktop Manager (via @jpmat296) +- Fixed support for asciinema (via @revolter) ## Mackup 0.8.33 diff --git a/mackup/applications/asciinema.cfg b/mackup/applications/asciinema.cfg index 2aa216805..de4200b3b 100644 --- a/mackup/applications/asciinema.cfg +++ b/mackup/applications/asciinema.cfg @@ -1,5 +1,5 @@ [application] name = asciinema -[configuration_files] -.asciinema +[xdg_configuration_files] +asciinema From ead74f799b0400a7fc494661511ac3d51719d6b5 Mon Sep 17 00:00:00 2001 From: Jaume Sala Date: Wed, 17 Nov 2021 12:06:07 +0100 Subject: [PATCH 306/406] Update phpstorm.cfg (#1776) --- mackup/applications/phpstorm.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg index 57f6d1da4..409ee86c1 100644 --- a/mackup/applications/phpstorm.cfg +++ b/mackup/applications/phpstorm.cfg @@ -6,6 +6,8 @@ Library/Application Support/JetBrains/PhpStorm2020.1 Library/Application Support/JetBrains/PhpStorm2020.2 Library/Application Support/JetBrains/PhpStorm2020.3 Library/Application Support/JetBrains/PhpStorm2021.1 +Library/Application Support/JetBrains/PhpStorm2021.2 +Library/Application Support/JetBrains/PhpStorm2021.3 Library/Application Support/PhpStorm2016.1 Library/Application Support/PhpStorm2016.2 Library/Application Support/PhpStorm2016.3 From a91ec5aacfdec94603bc19cc0ccca2511384f169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Harper?= Date: Thu, 18 Nov 2021 18:38:45 -0500 Subject: [PATCH 307/406] add Mumu support (#1777) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/mumu.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/mumu.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 43aafc76d..3e28d9548 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Added support for Remote Desktop Manager (via @jpmat296) - Fixed support for asciinema (via @revolter) +- Added support for Mumu (via @fharper) ## Mackup 0.8.33 diff --git a/README.md b/README.md index df9f70e0f..8663cde8e 100644 --- a/README.md +++ b/README.md @@ -452,6 +452,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [MPV](https://mpv.io/) - [MTMR](https://github.com/Toxblh/MTMR) - [Multitouch](https://multitouch.app/) +- [Mumu](https://getmumu.com) - [MusicBrainz Picard](https://picard.musicbrainz.org/) - [MuteSpotifyAds](https://github.com/simonmeusel/MuteSpotifyAds) - [mycli](https://www.mycli.net/) diff --git a/mackup/applications/mumu.cfg b/mackup/applications/mumu.cfg new file mode 100644 index 000000000..1a388a63b --- /dev/null +++ b/mackup/applications/mumu.cfg @@ -0,0 +1,5 @@ +[application] +name = Mumu + +[configuration_files] +Library/Application Support/Mumu From f0efcf606328272e968002e3845f1a27d24ef3ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=81uczy=C5=84ski?= Date: Mon, 22 Nov 2021 08:35:46 +0100 Subject: [PATCH 308/406] Fasd support updated (#1041) Added .fasdrc to configuration_files. --- CHANGELOG.md | 1 + mackup/applications/fasd.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e28d9548..1ac919a88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Added support for Remote Desktop Manager (via @jpmat296) - Fixed support for asciinema (via @revolter) - Added support for Mumu (via @fharper) +- Updated support for fasd (via @doubleloop) ## Mackup 0.8.33 diff --git a/mackup/applications/fasd.cfg b/mackup/applications/fasd.cfg index 4bcb0321e..e4e84bff7 100644 --- a/mackup/applications/fasd.cfg +++ b/mackup/applications/fasd.cfg @@ -3,3 +3,4 @@ name = fasd [configuration_files] .fasd +.fasdrc From e826a37e41537be1762bb097ee3fd820efc3a9ae Mon Sep 17 00:00:00 2001 From: Guillaume Algis Date: Tue, 7 Dec 2021 09:23:56 +0100 Subject: [PATCH 309/406] Add support for Panic's Nova (#1784) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/nova.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/nova.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ac919a88..d0bc95332 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Fixed support for asciinema (via @revolter) - Added support for Mumu (via @fharper) - Updated support for fasd (via @doubleloop) +- Added support for Nova (via @guillaumealgis) ## Mackup 0.8.33 diff --git a/README.md b/README.md index 8663cde8e..b4064f0a2 100644 --- a/README.md +++ b/README.md @@ -471,6 +471,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [ngrok](https://ngrok.com/) - [Nomacs](http://nomacs.org/) - [NoSQLBooster for MongoDB](https://www.nosqlbooster.com/) +- [Nova](https://www.nova.app/) - [npm](https://www.npmjs.com/) - [npmrc](https://github.com/deoxxa/npmrc/) - [nuget](https://www.nuget.org/) diff --git a/mackup/applications/nova.cfg b/mackup/applications/nova.cfg new file mode 100644 index 000000000..16970eb58 --- /dev/null +++ b/mackup/applications/nova.cfg @@ -0,0 +1,5 @@ +[application] +name = Nova + +[configuration_files] +Library/Preferences/com.panic.Nova.plist From 41a52473e093a93ae2fec14e3cf93556389b49c8 Mon Sep 17 00:00:00 2001 From: SSBun Date: Fri, 17 Dec 2021 16:22:26 +0800 Subject: [PATCH 310/406] Added PicGo support (#1785) * Added PicGo support * Update picgo.cfg * order the list Co-authored-by: caishilin Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/picgo.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/picgo.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index d0bc95332..e501ef70b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Added support for Mumu (via @fharper) - Updated support for fasd (via @doubleloop) - Added support for Nova (via @guillaumealgis) +- Added support for PicGo (via @SSBun) ## Mackup 0.8.33 diff --git a/README.md b/README.md index b4064f0a2..2e206336f 100644 --- a/README.md +++ b/README.md @@ -498,6 +498,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Phoenix](https://github.com/kasper/phoenix) - [PhoneView](https://www.ecamm.com/mac/phoneview/) - [PhpStorm](http://www.jetbrains.com/phpstorm/) +- [PicGo](https://github.com/Molunerfinn/PicGo) - [Pidgin](https://www.pidgin.im) - [PIP](http://www.pip-installer.org/) - [PixelSnap](https://getpixelsnap.com/) diff --git a/mackup/applications/picgo.cfg b/mackup/applications/picgo.cfg new file mode 100644 index 000000000..23d3c307f --- /dev/null +++ b/mackup/applications/picgo.cfg @@ -0,0 +1,5 @@ +[application] +name = PicGo + +[configuration_files] +Library/Application Support/picgo/data.json From 683c151fff4a8e703ee6ec35c0479a250f3420b2 Mon Sep 17 00:00:00 2001 From: Can Yilmaz Date: Mon, 20 Dec 2021 12:17:30 +0000 Subject: [PATCH 311/406] Add support for Planner (#1787) * Add support for Planner * Update planner.cfg Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 5 +++-- README.md | 1 + mackup/applications/planner.cfg | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 mackup/applications/planner.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e501ef70b..9cd7a99ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Updated support for fasd (via @doubleloop) - Added support for Nova (via @guillaumealgis) - Added support for PicGo (via @SSBun) +- Added support for Planner (via @spawnedc) ## Mackup 0.8.33 @@ -500,7 +501,7 @@ - Added support of WebStorm 10 (via @morphinewan) - Added support of Gnome SSH Tunnel Manager (via @skyrocknroll) - Added support for Hammerspoon (via @jkaan) -- Added support for Bitchx (via @troywilson_) +- Added support for Bitchx (via @troywilson\_) - Added support for EditorConfig (via @chadluo) - Add com.agilebits.onepassword4.plist in 1Password (via @amatos) - Added support for Versions (via @amatos) @@ -810,7 +811,7 @@ - Added support for Ack (via @adamlogic) - Added support for Stata and SelfControl (via @kfinlay) - Added support for LaTeXiT (via @twsh) -- Do not link ~/Library/* files on GNU/Linux, should fix #104 +- Do not link ~/Library/\* files on GNU/Linux, should fix #104 ## Mackup 0.5 diff --git a/README.md b/README.md index 2e206336f..eb2c94160 100644 --- a/README.md +++ b/README.md @@ -503,6 +503,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [PIP](http://www.pip-installer.org/) - [PixelSnap](https://getpixelsnap.com/) - [PixelSnap 2](https://getpixelsnap.com/) +- [Planner](https://useplanner.com/) - [Pnpm](https://pnpm.js.org/) - [Pock](https://pock.pigigaldi.com) - [Poedit](http://poedit.net/) diff --git a/mackup/applications/planner.cfg b/mackup/applications/planner.cfg new file mode 100644 index 000000000..ed5863382 --- /dev/null +++ b/mackup/applications/planner.cfg @@ -0,0 +1,6 @@ +[application] +name = Planner + +[configuration_files] +.var/app/com.github.alainm23.planner/config +.var/app/com.github.alainm23.planner/data From 3c4b0f382ab8c000a79fcd75bd7ed7446b52855d Mon Sep 17 00:00:00 2001 From: Viktor Gamov Date: Tue, 11 Jan 2022 20:03:02 -0500 Subject: [PATCH 312/406] Fixed k9s config location (#1793) * Fixed paths for k9s * addressing @Lra comment https://github.com/lra/mackup/tree/master/doc#add-support-for-an-application-using-the-xdg-directory * removed config section --- CHANGELOG.md | 1 + mackup/applications/k9s.cfg | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cd7a99ff..5f0c3027d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Added support for Nova (via @guillaumealgis) - Added support for PicGo (via @SSBun) - Added support for Planner (via @spawnedc) +- Fixed support for k9s (via @gamussa) ## Mackup 0.8.33 diff --git a/mackup/applications/k9s.cfg b/mackup/applications/k9s.cfg index 741eda1a7..5a5f29fe0 100644 --- a/mackup/applications/k9s.cfg +++ b/mackup/applications/k9s.cfg @@ -1,5 +1,6 @@ [application] name = k9s -[configuration_files] -.k9s/config.yml +[xdg_configuration_files] +k9s/config.yml +k9s/skin.yml From fedf26a3d4185acd30b29bba8076ea421aeabbc6 Mon Sep 17 00:00:00 2001 From: Avi Miller Date: Thu, 13 Jan 2022 03:28:24 +1100 Subject: [PATCH 313/406] Add support for Oracle Cloud Infrastructure CLI (#1791) Signed-off-by: Avi Miller Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 30 +++++++++++++++++++----------- mackup/applications/oci.cfg | 6 ++++++ 3 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 mackup/applications/oci.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f0c3027d..ff4bf8a10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Added support for Mumu (via @fharper) - Updated support for fasd (via @doubleloop) - Added support for Nova (via @guillaumealgis) +- Added support for Oracle Cloud Infrastructure CLI (via @Djelibeybi) - Added support for PicGo (via @SSBun) - Added support for Planner (via @spawnedc) - Fixed support for k9s (via @gamussa) diff --git a/README.md b/README.md index eb2c94160..b5b499271 100644 --- a/README.md +++ b/README.md @@ -7,17 +7,24 @@ Keep your application settings in sync. ## Table of content -- [Quickstart](#quickstart) -- [Usage](#usage) -- [What does it do](#what-does-it-do) -- [Bullsh\*t, what does it really do to my files](#bullsht-what-does-it-really-do-to-my-files) -- [Supported Storages](#supported-storages) -- [Supported Applications](#supported-applications) -- [Can you support application X](#can-you-support-application-x) -- [Why did you do this](#why-did-you-do-this) -- [What platforms are supported](#what-platforms-are-supported) -- [What's up with the weird name](#whats-up-with-the-weird-name) -- [Where can I find more information](#where-can-i-find-more-information) +- [Mackup](#mackup) + - [Table of content](#table-of-content) + - [Quickstart](#quickstart) + - [Usage](#usage) + - [What does it do](#what-does-it-do) + - [Bullsh\*t, what does it really do to my files](#bullsht-what-does-it-really-do-to-my-files) + - [Backup](#backup) + - [Restore](#restore) + - [Uninstall](#uninstall) + - [Supported Storages](#supported-storages) + - [Unsupported Storages](#unsupported-storages) + - [Supported Applications](#supported-applications) + - [Can you support application X](#can-you-support-application-x) + - [Personalization & configuration](#personalization--configuration) + - [Why did you do this](#why-did-you-do-this) + - [What platforms are supported](#what-platforms-are-supported) + - [What's up with the weird name](#whats-up-with-the-weird-name) + - [Where can I find more information](#where-can-i-find-more-information) ## Quickstart @@ -486,6 +493,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Openbox](http://openbox.org) - [OpenEmu](http://openemu.org) - [OpenSSH](http://www.openssh.com/) +- [Oracle Cloud Infrastructure CLI](https://docs.oracle.com/en-us/iaas/Content/API/Concepts/cliconcepts.htm) - [Paintbrush](http://paintbrush.sourceforge.net/) - [Pandoc](http://pandoc.org) - [Pass](http://www.passwordstore.org/) diff --git a/mackup/applications/oci.cfg b/mackup/applications/oci.cfg new file mode 100644 index 000000000..3b144903c --- /dev/null +++ b/mackup/applications/oci.cfg @@ -0,0 +1,6 @@ +[application] +name = Oracle Cloud Infrastructure CLI + +[configuration_files] +.oci/config +.oci/oci_cli_rc From 563231051cbee287eb2c8c5472acd5a929db37c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Harper?= Date: Thu, 3 Feb 2022 19:43:01 -0500 Subject: [PATCH 314/406] add support for notion-enhancer (#1799) * add support for notion-enhancer * Extra nl Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/notion-enhancer.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/notion-enhancer.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ff4bf8a10..7d657533d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Added support for PicGo (via @SSBun) - Added support for Planner (via @spawnedc) - Fixed support for k9s (via @gamussa) +- Added support for notion-enhancer (via @fharper) ## Mackup 0.8.33 diff --git a/README.md b/README.md index b5b499271..23a7d0e44 100644 --- a/README.md +++ b/README.md @@ -478,6 +478,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [ngrok](https://ngrok.com/) - [Nomacs](http://nomacs.org/) - [NoSQLBooster for MongoDB](https://www.nosqlbooster.com/) +- [notion-enhancer](https://notion-enhancer.github.io/) - [Nova](https://www.nova.app/) - [npm](https://www.npmjs.com/) - [npmrc](https://github.com/deoxxa/npmrc/) diff --git a/mackup/applications/notion-enhancer.cfg b/mackup/applications/notion-enhancer.cfg new file mode 100644 index 000000000..78a892afd --- /dev/null +++ b/mackup/applications/notion-enhancer.cfg @@ -0,0 +1,5 @@ +[application] +name = notion-enhancer + +[configuration_files] +.notion-enhancer From ad68fb3006c80772c546ad7e71564640a2bd5785 Mon Sep 17 00:00:00 2001 From: Asen Lekov Date: Tue, 15 Feb 2022 10:08:41 +0200 Subject: [PATCH 315/406] Add support GitFox (#1802) * Add support for GitFox * Add entries for GitFox --- CHANGELOG.md | 1 + README.md | 1 + mackup/application | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/application diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d657533d..e0ba949e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for Planner (via @spawnedc) - Fixed support for k9s (via @gamussa) - Added support for notion-enhancer (via @fharper) +- Added support for GitFox (via @L3K0V) ## Mackup 0.8.33 diff --git a/README.md b/README.md index 23a7d0e44..b9a229999 100644 --- a/README.md +++ b/README.md @@ -330,6 +330,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Git Hooks](https://github.com/git-hooks/git-hooks) - [Git](http://git-scm.com/) - [Gitbox](http://gitboxapp.com/) +- [GitFox](https://www.gitfox.app) - [GitKraken](https://www.gitkraken.com) - [GitUp](http://gitup.co/) - [Gmail Notifr](http://ashchan.com/projects/gmail-notifr) diff --git a/mackup/application b/mackup/application new file mode 100644 index 000000000..274953be2 --- /dev/null +++ b/mackup/application @@ -0,0 +1,6 @@ +[application] +name = GitFox + +[configuration_files] +Library/Preferences/com.bytieful.Gitfox.plist +Library/Preferences/com.bytieful.Gitfox-setapp.plist From 79c702aa1c13228e537af6ebe4a31c7ec8939fe4 Mon Sep 17 00:00:00 2001 From: Asen Lekov Date: Wed, 16 Feb 2022 19:11:05 +0200 Subject: [PATCH 316/406] Update gitfox handle different installations (#1803) --- mackup/{application => applications/gitfox.cfg} | 1 + 1 file changed, 1 insertion(+) rename mackup/{application => applications/gitfox.cfg} (73%) diff --git a/mackup/application b/mackup/applications/gitfox.cfg similarity index 73% rename from mackup/application rename to mackup/applications/gitfox.cfg index 274953be2..199f097b6 100644 --- a/mackup/application +++ b/mackup/applications/gitfox.cfg @@ -3,4 +3,5 @@ name = GitFox [configuration_files] Library/Preferences/com.bytieful.Gitfox.plist +Library/Preferences/com.bytieful.Gitfox-retail.plist Library/Preferences/com.bytieful.Gitfox-setapp.plist From a432ce7b693375f1f26d20e442370089df3f978e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Harper?= Date: Fri, 18 Feb 2022 11:57:26 -0500 Subject: [PATCH 317/406] add support for act (#1804) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/act.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/act.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e0ba949e5..f8576e7c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Added support for PicGo (via @SSBun) - Added support for Planner (via @spawnedc) - Fixed support for k9s (via @gamussa) +- Added support for act (via @fharper) - Added support for notion-enhancer (via @fharper) - Added support for GitFox (via @L3K0V) diff --git a/README.md b/README.md index b9a229999..70f8ce395 100644 --- a/README.md +++ b/README.md @@ -171,6 +171,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [1Password 4](https://agilebits.com/onepassword) - [2Do](http://www.2doapp.com/) - [Ack](http://beyondgrep.com/) +- [act](https://github.com/nektos/act) - [Adium](https://adium.im/) - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - [Adobe Illustrator CC](https://www.adobe.com/products/illustrator.html) diff --git a/mackup/applications/act.cfg b/mackup/applications/act.cfg new file mode 100644 index 000000000..6e15b606f --- /dev/null +++ b/mackup/applications/act.cfg @@ -0,0 +1,5 @@ +[application] +name = act + +[configuration_files] +.actrc From 23acfd218520bb9f09d51fb14a6873b5805a902c Mon Sep 17 00:00:00 2001 From: Lucas Freitas <4260591+lucasff@users.noreply.github.com> Date: Sat, 19 Feb 2022 14:20:32 +0100 Subject: [PATCH 318/406] Update webstorm.cfg (#1805) --- mackup/applications/webstorm.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mackup/applications/webstorm.cfg b/mackup/applications/webstorm.cfg index 51ab6228e..9b474d822 100644 --- a/mackup/applications/webstorm.cfg +++ b/mackup/applications/webstorm.cfg @@ -6,6 +6,9 @@ Library/Application Support/JetBrains/WebStorm2020.1 Library/Application Support/JetBrains/WebStorm2020.2 Library/Application Support/JetBrains/WebStorm2020.3 Library/Application Support/JetBrains/WebStorm2020.4 +Library/Application Support/JetBrains/WebStorm2021.1 +Library/Application Support/JetBrains/WebStorm2021.2 +Library/Application Support/JetBrains/WebStorm2021.3 Library/Application Support/WebStorm Library/Application Support/WebStorm10 Library/Application Support/WebStorm11 From 9f973294c02d4c713729c49f0a7b1f69382eaad5 Mon Sep 17 00:00:00 2001 From: Daniel Hagen Date: Mon, 21 Feb 2022 17:43:01 -0600 Subject: [PATCH 319/406] Bartender patch (#1806) * Adding Setapp variation, BartenderPreferences file * Updating Changelog * missing newline Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/bartender.cfg | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8576e7c7..2b987a2b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Added support for act (via @fharper) - Added support for notion-enhancer (via @fharper) - Added support for GitFox (via @L3K0V) +- Updated support for Bartender through SetApp (via @dbhagen) ## Mackup 0.8.33 diff --git a/mackup/applications/bartender.cfg b/mackup/applications/bartender.cfg index 3fe09640d..85ce1a68e 100644 --- a/mackup/applications/bartender.cfg +++ b/mackup/applications/bartender.cfg @@ -3,3 +3,5 @@ name = Bartender [configuration_files] Library/Preferences/com.surteesstudios.Bartender.plist +Library/Preferences/com.surteesstudios.Bartender-setapp.plist +Library/Application Support/Bartender/Bartender.BartenderPreferences From 9f7b8473c509831ccc489e2b7842f8682136ed76 Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Tue, 29 Mar 2022 19:35:14 +0200 Subject: [PATCH 320/406] Update black target version (#1814) --- .github/workflows/lint.yaml | 2 +- Makefile | 2 +- tests/config_tests.py | 60 ++++++++++++++++++------------------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 4502ca383..31d79f6c1 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -11,4 +11,4 @@ jobs: steps: - run: pip install black - uses: actions/checkout@v2 - - run: black --check --target-version py27 . + - run: black --check --target-version py310 . diff --git a/Makefile b/Makefile index 1a6c23485..bfb486c88 100644 --- a/Makefile +++ b/Makefile @@ -20,4 +20,4 @@ release: clean pipenv run twine upload dist/* black: - black --target-version py27 . + black --target-version py310 . diff --git a/tests/config_tests.py b/tests/config_tests.py index 6f5bab59d..fa07c8c2c 100644 --- a/tests/config_tests.py +++ b/tests/config_tests.py @@ -28,10 +28,10 @@ def test_config_no_config(self): assert cfg.path == "/home/some_user/Dropbox" assert isinstance(cfg.directory, str) - assert cfg.directory == u"Mackup" + assert cfg.directory == "Mackup" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath == u"/home/some_user/Dropbox/Mackup" + assert cfg.fullpath == "/home/some_user/Dropbox/Mackup" assert cfg.apps_to_ignore == set() assert cfg.apps_to_sync == set() @@ -43,13 +43,13 @@ def test_config_empty(self): assert cfg.engine == ENGINE_DROPBOX assert isinstance(cfg.path, str) - assert cfg.path == u"/home/some_user/Dropbox" + assert cfg.path == "/home/some_user/Dropbox" assert isinstance(cfg.directory, str) - assert cfg.directory == u"Mackup" + assert cfg.directory == "Mackup" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath == u"/home/some_user/Dropbox/Mackup" + assert cfg.fullpath == "/home/some_user/Dropbox/Mackup" assert cfg.apps_to_ignore == set() assert cfg.apps_to_sync == set() @@ -61,13 +61,13 @@ def test_config_engine_dropbox(self): assert cfg.engine == ENGINE_DROPBOX assert isinstance(cfg.path, str) - assert cfg.path == u"/home/some_user/Dropbox" + assert cfg.path == "/home/some_user/Dropbox" assert isinstance(cfg.directory, str) - assert cfg.directory == u"some_weirld_name" + assert cfg.directory == "some_weirld_name" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath == u"/home/some_user/Dropbox/some_weirld_name" + assert cfg.fullpath == "/home/some_user/Dropbox/some_weirld_name" assert cfg.apps_to_ignore == set() assert cfg.apps_to_sync == set() @@ -79,13 +79,13 @@ def test_config_engine_filesystem_absolute(self): assert cfg.engine == ENGINE_FS assert isinstance(cfg.path, str) - assert cfg.path == u"/some/absolute/folder" + assert cfg.path == "/some/absolute/folder" assert isinstance(cfg.directory, str) - assert cfg.directory == u"custom_folder" + assert cfg.directory == "custom_folder" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath == u"/some/absolute/folder/custom_folder" + assert cfg.fullpath == "/some/absolute/folder/custom_folder" assert cfg.apps_to_ignore == set(["subversion", "sequel-pro"]) assert cfg.apps_to_sync == set() @@ -98,15 +98,15 @@ def test_config_engine_filesystem(self): assert isinstance(cfg.path, str) assert cfg.path.endswith( - os.path.join(os.environ[u"HOME"], u"some/relative/folder") + os.path.join(os.environ["HOME"], "some/relative/folder") ) assert isinstance(cfg.directory, str) - assert cfg.directory == u"Mackup" + assert cfg.directory == "Mackup" assert isinstance(cfg.fullpath, str) assert cfg.fullpath == os.path.join( - os.environ[u"HOME"], u"some/relative/folder", u"Mackup" + os.environ["HOME"], "some/relative/folder", "Mackup" ) assert cfg.apps_to_ignore == set() @@ -119,13 +119,13 @@ def test_config_engine_google_drive(self): assert cfg.engine == ENGINE_GDRIVE assert isinstance(cfg.path, str) - assert cfg.path == u"/Users/whatever/Google Drive" + assert cfg.path == "/Users/whatever/Google Drive" assert isinstance(cfg.directory, str) - assert cfg.directory == u"Mackup" + assert cfg.directory == "Mackup" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath.endswith(u"/Google Drive/Mackup") + assert cfg.fullpath.endswith("/Google Drive/Mackup") assert cfg.apps_to_ignore == set(["subversion", "sequel-pro", "sabnzbd"]) assert cfg.apps_to_sync == set(["sublime-text-3", "x11", "sabnzbd"]) @@ -137,13 +137,13 @@ def test_config_engine_copy(self): assert cfg.engine == ENGINE_COPY assert isinstance(cfg.path, str) - assert cfg.path == u"/Users/someuser/Copy" + assert cfg.path == "/Users/someuser/Copy" assert isinstance(cfg.directory, str) - assert cfg.directory == u"Mackup" + assert cfg.directory == "Mackup" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath.endswith(u"/Copy/Mackup") + assert cfg.fullpath.endswith("/Copy/Mackup") assert cfg.apps_to_ignore == set(["subversion", "sequel-pro", "sabnzbd"]) assert cfg.apps_to_sync == set(["sublime-text-3", "x11", "sabnzbd"]) @@ -160,10 +160,10 @@ def test_config_engine_icloud(self): ) assert isinstance(cfg.directory, str) - assert cfg.directory == u"Mackup" + assert cfg.directory == "Mackup" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath.endswith(u"/com~apple~CloudDocs/Mackup") + assert cfg.fullpath.endswith("/com~apple~CloudDocs/Mackup") assert cfg.apps_to_ignore == set(["subversion", "sequel-pro", "sabnzbd"]) assert cfg.apps_to_sync == set(["sublime-text-3", "x11", "sabnzbd"]) @@ -186,10 +186,10 @@ def test_config_apps_to_ignore(self): assert cfg.path == "/home/some_user/Dropbox" assert isinstance(cfg.directory, str) - assert cfg.directory == u"Mackup" + assert cfg.directory == "Mackup" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath == u"/home/some_user/Dropbox/Mackup" + assert cfg.fullpath == "/home/some_user/Dropbox/Mackup" assert cfg.apps_to_ignore == set(["subversion", "sequel-pro", "sabnzbd"]) assert cfg.apps_to_sync == set() @@ -201,13 +201,13 @@ def test_config_apps_to_sync(self): assert cfg.engine == ENGINE_DROPBOX assert isinstance(cfg.path, str) - assert cfg.path == u"/home/some_user/Dropbox" + assert cfg.path == "/home/some_user/Dropbox" assert isinstance(cfg.directory, str) - assert cfg.directory == u"Mackup" + assert cfg.directory == "Mackup" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath == u"/home/some_user/Dropbox/Mackup" + assert cfg.fullpath == "/home/some_user/Dropbox/Mackup" assert cfg.apps_to_ignore == set() assert cfg.apps_to_sync == set(["sabnzbd", "sublime-text-3", "x11"]) @@ -219,13 +219,13 @@ def test_config_apps_to_ignore_and_sync(self): assert cfg.engine == ENGINE_DROPBOX assert isinstance(cfg.path, str) - assert cfg.path == u"/home/some_user/Dropbox" + assert cfg.path == "/home/some_user/Dropbox" assert isinstance(cfg.directory, str) - assert cfg.directory == u"Mackup" + assert cfg.directory == "Mackup" assert isinstance(cfg.fullpath, str) - assert cfg.fullpath == u"/home/some_user/Dropbox/Mackup" + assert cfg.fullpath == "/home/some_user/Dropbox/Mackup" assert cfg.apps_to_ignore == set(["subversion", "sequel-pro", "sabnzbd"]) assert cfg.apps_to_sync == set(["sabnzbd", "sublime-text-3", "x11", "vim"]) From 7c3e232737ef6004d7c540ded6a9e0d75e18443d Mon Sep 17 00:00:00 2001 From: Josh Medeski Date: Sat, 28 May 2022 17:17:06 -0500 Subject: [PATCH 321/406] Updated support for lazygit (#1818) * Update lazygit configuration * feat: add CHANGELOG entry --- CHANGELOG.md | 1 + mackup/applications/lazygit.cfg | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b987a2b2..ad9da6b00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Fixed support for asciinema (via @revolter) - Added support for Mumu (via @fharper) - Updated support for fasd (via @doubleloop) +- Updated support for lazygit (via @joshmedeski) - Added support for Nova (via @guillaumealgis) - Added support for Oracle Cloud Infrastructure CLI (via @Djelibeybi) - Added support for PicGo (via @SSBun) diff --git a/mackup/applications/lazygit.cfg b/mackup/applications/lazygit.cfg index e1d36345d..0488a8afc 100644 --- a/mackup/applications/lazygit.cfg +++ b/mackup/applications/lazygit.cfg @@ -3,3 +3,7 @@ name = lazygit [configuration_files] Library/Application Support/jesseduffield/lazygit/config.yml +Library/Application Support/lazygit/config.yml + +[xdg_configuration_files] +lazygit/config.yml From e82af823ef7193a60d8c553c1d6895a7f089c76f Mon Sep 17 00:00:00 2001 From: Jaume Sala Date: Wed, 29 Jun 2022 12:41:56 +0200 Subject: [PATCH 322/406] Update phpstorm.cfg (#1835) Add PhpStorm 2022.x support. --- mackup/applications/phpstorm.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg index 409ee86c1..2f3e5bd78 100644 --- a/mackup/applications/phpstorm.cfg +++ b/mackup/applications/phpstorm.cfg @@ -8,6 +8,9 @@ Library/Application Support/JetBrains/PhpStorm2020.3 Library/Application Support/JetBrains/PhpStorm2021.1 Library/Application Support/JetBrains/PhpStorm2021.2 Library/Application Support/JetBrains/PhpStorm2021.3 +Library/Application Support/JetBrains/PhpStorm2022.1 +Library/Application Support/JetBrains/PhpStorm2022.2 +Library/Application Support/JetBrains/PhpStorm2022.3 Library/Application Support/PhpStorm2016.1 Library/Application Support/PhpStorm2016.2 Library/Application Support/PhpStorm2016.3 From f427a0f234b0523500ab3f4d2e84cc24f2a9ab59 Mon Sep 17 00:00:00 2001 From: G Date: Thu, 7 Jul 2022 19:36:21 +0800 Subject: [PATCH 323/406] add kindaVim (#1811) * add kindaVim app * add kindaVim to README * update CHANGELOG with adding kindaVim Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/kindavim.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/kindavim.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ad9da6b00..8e7c2189b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Added support for notion-enhancer (via @fharper) - Added support for GitFox (via @L3K0V) - Updated support for Bartender through SetApp (via @dbhagen) +- Added support for kindaVim (via @godbout) ## Mackup 0.8.33 diff --git a/README.md b/README.md index 70f8ce395..e124ad201 100644 --- a/README.md +++ b/README.md @@ -405,6 +405,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Keymo](http://manytricks.com/keymo/) - [KeyRemap4MacBook](https://pqrs.org/osx/karabiner/) - [Khd](https://github.com/koekeishiya/khd/) +- [kindaVim](https://kindavim.app) - [kitty](https://sw.kovidgoyal.net/kitty/) - [Krew](https://github.com/kubernetes-sigs/krew) - [Kubectl](https://kubernetes.io/docs/reference/kubectl/overview/) diff --git a/mackup/applications/kindavim.cfg b/mackup/applications/kindavim.cfg new file mode 100644 index 000000000..265e8de1e --- /dev/null +++ b/mackup/applications/kindavim.cfg @@ -0,0 +1,5 @@ +[application] +name = kindaVim + +[configuration_files] +Library/Preferences/mo.com.sleeplessmind.kindaVim.plist From f9e0bb7d159d22514f4577cbc1fd5eaf98496168 Mon Sep 17 00:00:00 2001 From: Josh Medeski Date: Thu, 7 Jul 2022 14:38:14 -0500 Subject: [PATCH 324/406] Added support for Flameshot (#1828) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/flameshot.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/flameshot.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e7c2189b..9aa9954cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Added support for Nova (via @guillaumealgis) - Added support for Oracle Cloud Infrastructure CLI (via @Djelibeybi) - Added support for PicGo (via @SSBun) +- Added support for Flameshot (via @joshmedeski) - Added support for Planner (via @spawnedc) - Fixed support for k9s (via @gamussa) - Added support for act (via @fharper) diff --git a/README.md b/README.md index e124ad201..e66027a3e 100644 --- a/README.md +++ b/README.md @@ -312,6 +312,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Fish](http://fishshell.com/) - [Fisher](https://github.com/jorgebucaran/fisher) - [Flake8](https://flake8.pycqa.org/) +- [Flameshot](https://flameshot.org) - [FlexGet](http://flexget.com/) - [Flux](https://justgetflux.com/) - [Focus](https://heyfocus.com) diff --git a/mackup/applications/flameshot.cfg b/mackup/applications/flameshot.cfg new file mode 100644 index 000000000..df42a3e6c --- /dev/null +++ b/mackup/applications/flameshot.cfg @@ -0,0 +1,5 @@ +[application] +name = Flameshot + +[xdg_configuration_files] +flameshot/flameshot.ini From 28811b74400b1983dc76e4b35c509f697f9760a4 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 9 Jul 2022 12:09:52 +0200 Subject: [PATCH 325/406] Make sure that all text files end with a newline character. (#1836) * Make sure that all text files end with a newline character. * Ignore legit files without newlines * enable all rules * Update .linelint.yml --- .github/workflows/linelint.yaml | 16 ++++++++++++++++ .linelint.yml | 19 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 .github/workflows/linelint.yaml create mode 100644 .linelint.yml diff --git a/.github/workflows/linelint.yaml b/.github/workflows/linelint.yaml new file mode 100644 index 000000000..f7ee8c00b --- /dev/null +++ b/.github/workflows/linelint.yaml @@ -0,0 +1,16 @@ +# Make sure that all text files end with a newline character. +# Configure your editor to end every file with a newline character. +# See +on: + - pull_request + - push +name: linelint +jobs: + linelint: + runs-on: ubuntu-latest + name: Check if all files end with a newline character + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Linelint + uses: fernandrone/linelint@master diff --git a/.linelint.yml b/.linelint.yml new file mode 100644 index 000000000..83277987c --- /dev/null +++ b/.linelint.yml @@ -0,0 +1,19 @@ +# 'true' will fix files +autofix: false + +# list of paths to ignore, uses gitignore syntaxes (executes before any rule) +ignore: + - tests/fixtures/Library/Application Support/Box/Box Sync/sync_root_folder.txt + - tests/fixtures/Library/Mobile Documents/com~apple~CloudDocs/_blank_.md + +rules: + # checks if file ends in a newline character + end-of-file: + # set to true to enable this rule + enable: true + + # set to true to disable autofix (if enabled globally) + disable-autofix: true + + # if true also checks if file ends in a single newline character + single-new-line: true From edf529c4719de97b85e81b5ff2f8d9400362b148 Mon Sep 17 00:00:00 2001 From: Flavio De Stefano Date: Sat, 9 Jul 2022 12:15:54 +0200 Subject: [PATCH 326/406] Add support for Mail (#1826) * Add support for Mail * Update mail.cfg Co-authored-by: Laurent Raufaste --- README.md | 1 + mackup/applications/mail.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/mail.cfg diff --git a/README.md b/README.md index e66027a3e..e21750c77 100644 --- a/README.md +++ b/README.md @@ -435,6 +435,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [MagicPrefs](http://magicprefs.com/) - [Magnet](https://magnet.crowdcafe.com/) - [Maid](https://github.com/benjaminoakes/maid/) +- [Mail](https://support.apple.com/guide/mail/welcome/mac) - [Mailmate](http://freron.com/) - [Mailplane](http://mailplaneapp.com/) - [mako](https://wayland.emersion.fr/mako/) diff --git a/mackup/applications/mail.cfg b/mackup/applications/mail.cfg new file mode 100644 index 000000000..cd75971f7 --- /dev/null +++ b/mackup/applications/mail.cfg @@ -0,0 +1,5 @@ +[application] +name = Mail + +[configuration_files] +Library/Preferences/com.apple.mail.plist From f0e839be269464f2329b67aef6e43e36d2ca1c33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20Tunal=C4=B1?= Date: Sat, 9 Jul 2022 13:17:02 +0300 Subject: [PATCH 327/406] Update Bash it to sync minimal data (#1822) * Update bash-it.cfg This folder is a git repository, therefore, leading to constant issues across computers. To avoid these and speed up the sync operation should be preferences specific. * Update CHANGELOG.md --- CHANGELOG.md | 1 + mackup/applications/bash-it.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9aa9954cd..feb093c61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Updated support for Bash it (via @jacopkane) - Added support for Remote Desktop Manager (via @jpmat296) - Fixed support for asciinema (via @revolter) - Added support for Mumu (via @fharper) diff --git a/mackup/applications/bash-it.cfg b/mackup/applications/bash-it.cfg index 6736e1871..9eca56631 100644 --- a/mackup/applications/bash-it.cfg +++ b/mackup/applications/bash-it.cfg @@ -2,4 +2,4 @@ name = Bash it [configuration_files] -.bash_it +.bash_it/enabled From dee91d72abcbedf713ce52b327ca84644a519f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E6=98=82?= Date: Sat, 9 Jul 2022 18:17:36 +0800 Subject: [PATCH 328/406] Update mackup/applications/mpv.cfg (#1817) --- mackup/applications/mpv.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/mpv.cfg b/mackup/applications/mpv.cfg index c6f993541..e8151585a 100644 --- a/mackup/applications/mpv.cfg +++ b/mackup/applications/mpv.cfg @@ -10,5 +10,6 @@ name = MPV mpv/config mpv/mpv.conf mpv/scripts +mpv/script-opts mpv/input.conf mpv/watch_later From 53a68bd0099e58e7453c95ea37b7ba6e8e0fa752 Mon Sep 17 00:00:00 2001 From: Michael Graham Date: Sat, 9 Jul 2022 06:20:45 -0400 Subject: [PATCH 329/406] Add support for Beyond Compare (#1816) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/beyond-compare.cfg | 9 +++++++++ 3 files changed, 11 insertions(+) create mode 100644 mackup/applications/beyond-compare.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index feb093c61..55944a045 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Added support for notion-enhancer (via @fharper) - Added support for GitFox (via @L3K0V) - Updated support for Bartender through SetApp (via @dbhagen) +- Added support for Beyond Compare (via @mgraham) - Added support for kindaVim (via @godbout) ## Mackup 0.8.33 diff --git a/README.md b/README.md index e21750c77..3b21c093a 100644 --- a/README.md +++ b/README.md @@ -217,6 +217,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Beets](http://beets.io/) - [BetterSnapTool](http://www.boastr.net/) - [BetterTouchTool](http://www.boastr.net/) +- [Beyond Compare](https://scootersoftware.com/) - [BibDesk](http://bibdesk.sourceforge.net/) - [Billings Pro Server Admin](https://www.marketcircle.com/billingspro/download/billingspro-server/) - [BitBar](https://getbitbar.com/) diff --git a/mackup/applications/beyond-compare.cfg b/mackup/applications/beyond-compare.cfg new file mode 100644 index 000000000..404bd8a39 --- /dev/null +++ b/mackup/applications/beyond-compare.cfg @@ -0,0 +1,9 @@ +[application] +name = Beyond Compare + +[configuration_files] +Library/Preferences/com.ScooterSoftware.BeyondCompare.plist +Library/Application Support/Beyond Compare/BC4Key.txt +Library/Application Support/Beyond Compare/BCColors.xml +Library/Application Support/Beyond Compare/BCCommands.xml +Library/Application Support/Beyond Compare/BCPreferences.xml From 7f9a990ad11ae1481b08af490e3aad8ce2933620 Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Sat, 9 Jul 2022 12:32:26 +0200 Subject: [PATCH 330/406] Add support for xbar (#1812) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/xbar.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/xbar.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 55944a045..aa90cf06f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Added support for notion-enhancer (via @fharper) - Added support for GitFox (via @L3K0V) - Updated support for Bartender through SetApp (via @dbhagen) +- Added support for xbar (via @dnicolson) - Added support for Beyond Compare (via @mgraham) - Added support for kindaVim (via @godbout) diff --git a/README.md b/README.md index 3b21c093a..437d1f8cd 100644 --- a/README.md +++ b/README.md @@ -688,6 +688,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [X11](http://www.x.org/) - [Xee](https://theunarchiver.com/xee) - [Xamarin Studio](https://xamarin.com/studio) +- [xbar](https://xbarapp.com/) - [XBindKeys](http://www.nongnu.org/xbindkeys/) - [Xchat](http://xchat.org/) - [Xcode](https://developer.apple.com/xcode/) diff --git a/mackup/applications/xbar.cfg b/mackup/applications/xbar.cfg new file mode 100644 index 000000000..e1de62f4d --- /dev/null +++ b/mackup/applications/xbar.cfg @@ -0,0 +1,6 @@ +[application] +name = xbar + +[configuration_files] +Library/Application Support/xbar/xbar.config.json +Library/Application Support/xbar/plugins From 653e475171beb95d57e78ef550507d13b07df0d3 Mon Sep 17 00:00:00 2001 From: Anne van de Venis Date: Sat, 9 Jul 2022 12:33:53 +0200 Subject: [PATCH 331/406] Add support to backup TablePlus history (#1809) * Sync TablePlus history * Update CHANGELOG.md Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/tableplus.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa90cf06f..e2d694c32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Added support for notion-enhancer (via @fharper) - Added support for GitFox (via @L3K0V) - Updated support for Bartender through SetApp (via @dbhagen) +- Added support for TablePlus history (via @annuh) - Added support for xbar (via @dnicolson) - Added support for Beyond Compare (via @mgraham) - Added support for kindaVim (via @godbout) diff --git a/mackup/applications/tableplus.cfg b/mackup/applications/tableplus.cfg index b35733094..3a1e5c956 100644 --- a/mackup/applications/tableplus.cfg +++ b/mackup/applications/tableplus.cfg @@ -5,3 +5,4 @@ name = TablePlus Library/Application Support/com.tinyapp.TablePlus/Data Library/Application Support/com.tinyapp.TablePlus/Plugins Library/Preferences/com.tinyapp.TablePlus.plist +Library/Application Support/com.tinyapp.TablePlus/Cache/History From 7b7ab4f9a23b5469f45e60b3b20fd9c4783cfef8 Mon Sep 17 00:00:00 2001 From: weiyang Date: Sat, 9 Jul 2022 18:48:56 +0800 Subject: [PATCH 332/406] [xonsh] Add 'xdg_configuration_files' (#1810) Signed-off-by: weiyang Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/xonsh.cfg | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2d694c32..fe3934dfa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Added support for notion-enhancer (via @fharper) - Added support for GitFox (via @L3K0V) - Updated support for Bartender through SetApp (via @dbhagen) +- Updated support for Xonsh (via @wy-z) - Added support for TablePlus history (via @annuh) - Added support for xbar (via @dnicolson) - Added support for Beyond Compare (via @mgraham) diff --git a/mackup/applications/xonsh.cfg b/mackup/applications/xonsh.cfg index 7f06fe8db..7f760b258 100644 --- a/mackup/applications/xonsh.cfg +++ b/mackup/applications/xonsh.cfg @@ -3,3 +3,6 @@ name = Xonsh [configuration_files] .xonshrc + +[xdg_configuration_files] +xonsh From 467c7a00b20ba533770d35f02d3f391df498c3f9 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 9 Jul 2022 12:56:31 +0200 Subject: [PATCH 333/406] Mackup 0.8.34 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe3934dfa..c6e2837b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.34 + - Updated support for Bash it (via @jacopkane) - Added support for Remote Desktop Manager (via @jpmat296) - Fixed support for asciinema (via @revolter) diff --git a/mackup/constants.py b/mackup/constants.py index 0971ff919..cf4dad6e9 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = "0.8.33" +VERSION = "0.8.34" # Support platforms PLATFORM_DARWIN = "Darwin" From 690f401e7965c292b9b7ecf0232c68d7018fe875 Mon Sep 17 00:00:00 2001 From: Gandalf Saxe Date: Sat, 9 Jul 2022 13:01:23 +0200 Subject: [PATCH 334/406] Updated link to taskpaper (#1551) Co-authored-by: Laurent Raufaste --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 437d1f8cd..a5c942996 100644 --- a/README.md +++ b/README.md @@ -629,7 +629,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Swish](https://highlyopinionated.co/swish/) - [T](http://sferik.github.io/t/) - [TablePlus](https://tableplus.io) -- [TaskPaper](http://www.hogbaysoftware.com/products/taskpaper) +- [TaskPaper](https://www.taskpaper.com) - [Taskwarrior](http://taskwarrior.org/) - [Teamocil](http://remiprev.github.io/teamocil/) - [Telegram for macOS](https://macos.telegram.org) From 87cc6dbebf2eb26a0111cd4dfb787e3aa9aed3d1 Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Sat, 9 Jul 2022 15:57:03 +0200 Subject: [PATCH 335/406] Update test documentation and fix tests on Python 3.10 (#1813) * Fix tests on Python 3.10 * Update test documentation * Update Python test versions --- .github/workflows/install.yaml | 10 +- .github/workflows/test.yaml | 8 +- Pipfile | 3 +- Pipfile.lock | 244 ++++++++++++++++++--------------- tests/README.md | 6 +- 5 files changed, 146 insertions(+), 125 deletions(-) diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml index 07615349d..c4f821523 100644 --- a/.github/workflows/install.yaml +++ b/.github/workflows/install.yaml @@ -9,10 +9,12 @@ jobs: strategy: matrix: python-version: - - 2.7 - - 3.6 - - 3.7 - - 3.8 + - "2.7" + - "3.6" + - "3.7" + - "3.8" + - "3.9" + - "3.10" runs-on: ubuntu-latest container: python:${{ matrix.python-version }} steps: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 430fe795d..229b40d61 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -18,9 +18,11 @@ jobs: strategy: matrix: python-version: - - 3.6 - - 3.7 - - 3.8 + - "3.6" + - "3.7" + - "3.8" + - "3.9" + - "3.10" container: python:${{ matrix.python-version }} steps: - run: pip install pipenv diff --git a/Pipfile b/Pipfile index 000429f63..4deb01b1b 100644 --- a/Pipfile +++ b/Pipfile @@ -11,5 +11,6 @@ six = "*" # Black is still a pre-release. Replaced with `brew install black` for now. # black = "*" coverage = "*" -nose = "*" +nose-py3 = "*" +numpy = "*" twine = "*" diff --git a/Pipfile.lock b/Pipfile.lock index e5ac1744c..7d979236a 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "b7c480e641440c1617f3beb17e1085abc0bcbbaa937da6f7ffe8fa50f2eeb2b1" + "sha256": "276a19b23934fb06f67d63b3766aad3db659ee76201ed86dc50d167722195f9d" }, "pipfile-spec": 6, "requires": {}, @@ -41,18 +41,18 @@ }, "certifi": { "hashes": [ - "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee", - "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8" + "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872", + "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569" ], - "version": "==2021.5.30" + "version": "==2021.10.8" }, "charset-normalizer": { "hashes": [ - "sha256:0c8911edd15d19223366a194a513099a302055a962bca2cec0f54b8b63175d8b", - "sha256:f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3" + "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597", + "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df" ], "markers": "python_version >= '3'", - "version": "==2.0.4" + "version": "==2.0.12" }, "colorama": { "hashes": [ @@ -64,148 +64,163 @@ }, "coverage": { "hashes": [ - "sha256:004d1880bed2d97151facef49f08e255a20ceb6f9432df75f4eef018fdd5a78c", - "sha256:01d84219b5cdbfc8122223b39a954820929497a1cb1422824bb86b07b74594b6", - "sha256:040af6c32813fa3eae5305d53f18875bedd079960822ef8ec067a66dd8afcd45", - "sha256:06191eb60f8d8a5bc046f3799f8a07a2d7aefb9504b0209aff0b47298333302a", - "sha256:13034c4409db851670bc9acd836243aeee299949bd5673e11844befcb0149f03", - "sha256:13c4ee887eca0f4c5a247b75398d4114c37882658300e153113dafb1d76de529", - "sha256:184a47bbe0aa6400ed2d41d8e9ed868b8205046518c52464fde713ea06e3a74a", - "sha256:18ba8bbede96a2c3dde7b868de9dcbd55670690af0988713f0603f037848418a", - "sha256:1aa846f56c3d49205c952d8318e76ccc2ae23303351d9270ab220004c580cfe2", - "sha256:217658ec7187497e3f3ebd901afdca1af062b42cfe3e0dafea4cced3983739f6", - "sha256:24d4a7de75446be83244eabbff746d66b9240ae020ced65d060815fac3423759", - "sha256:2910f4d36a6a9b4214bb7038d537f015346f413a975d57ca6b43bf23d6563b53", - "sha256:2949cad1c5208b8298d5686d5a85b66aae46d73eec2c3e08c817dd3513e5848a", - "sha256:2a3859cb82dcbda1cfd3e6f71c27081d18aa251d20a17d87d26d4cd216fb0af4", - "sha256:2cafbbb3af0733db200c9b5f798d18953b1a304d3f86a938367de1567f4b5bff", - "sha256:2e0d881ad471768bf6e6c2bf905d183543f10098e3b3640fc029509530091502", - "sha256:30c77c1dc9f253283e34c27935fded5015f7d1abe83bc7821680ac444eaf7793", - "sha256:3487286bc29a5aa4b93a072e9592f22254291ce96a9fbc5251f566b6b7343cdb", - "sha256:372da284cfd642d8e08ef606917846fa2ee350f64994bebfbd3afb0040436905", - "sha256:41179b8a845742d1eb60449bdb2992196e211341818565abded11cfa90efb821", - "sha256:44d654437b8ddd9eee7d1eaee28b7219bec228520ff809af170488fd2fed3e2b", - "sha256:4a7697d8cb0f27399b0e393c0b90f0f1e40c82023ea4d45d22bce7032a5d7b81", - "sha256:51cb9476a3987c8967ebab3f0fe144819781fca264f57f89760037a2ea191cb0", - "sha256:52596d3d0e8bdf3af43db3e9ba8dcdaac724ba7b5ca3f6358529d56f7a166f8b", - "sha256:53194af30d5bad77fcba80e23a1441c71abfb3e01192034f8246e0d8f99528f3", - "sha256:5fec2d43a2cc6965edc0bb9e83e1e4b557f76f843a77a2496cbe719583ce8184", - "sha256:6c90e11318f0d3c436a42409f2749ee1a115cd8b067d7f14c148f1ce5574d701", - "sha256:74d881fc777ebb11c63736622b60cb9e4aee5cace591ce274fb69e582a12a61a", - "sha256:7501140f755b725495941b43347ba8a2777407fc7f250d4f5a7d2a1050ba8e82", - "sha256:796c9c3c79747146ebd278dbe1e5c5c05dd6b10cc3bcb8389dfdf844f3ead638", - "sha256:869a64f53488f40fa5b5b9dcb9e9b2962a66a87dab37790f3fcfb5144b996ef5", - "sha256:8963a499849a1fc54b35b1c9f162f4108017b2e6db2c46c1bed93a72262ed083", - "sha256:8d0a0725ad7c1a0bcd8d1b437e191107d457e2ec1084b9f190630a4fb1af78e6", - "sha256:900fbf7759501bc7807fd6638c947d7a831fc9fdf742dc10f02956ff7220fa90", - "sha256:92b017ce34b68a7d67bd6d117e6d443a9bf63a2ecf8567bb3d8c6c7bc5014465", - "sha256:970284a88b99673ccb2e4e334cfb38a10aab7cd44f7457564d11898a74b62d0a", - "sha256:972c85d205b51e30e59525694670de6a8a89691186012535f9d7dbaa230e42c3", - "sha256:9a1ef3b66e38ef8618ce5fdc7bea3d9f45f3624e2a66295eea5e57966c85909e", - "sha256:af0e781009aaf59e25c5a678122391cb0f345ac0ec272c7961dc5455e1c40066", - "sha256:b6d534e4b2ab35c9f93f46229363e17f63c53ad01330df9f2d6bd1187e5eaacf", - "sha256:b7895207b4c843c76a25ab8c1e866261bcfe27bfaa20c192de5190121770672b", - "sha256:c0891a6a97b09c1f3e073a890514d5012eb256845c451bd48f7968ef939bf4ae", - "sha256:c2723d347ab06e7ddad1a58b2a821218239249a9e4365eaff6649d31180c1669", - "sha256:d1f8bf7b90ba55699b3a5e44930e93ff0189aa27186e96071fac7dd0d06a1873", - "sha256:d1f9ce122f83b2305592c11d64f181b87153fc2c2bbd3bb4a3dde8303cfb1a6b", - "sha256:d314ed732c25d29775e84a960c3c60808b682c08d86602ec2c3008e1202e3bb6", - "sha256:d636598c8305e1f90b439dbf4f66437de4a5e3c31fdf47ad29542478c8508bbb", - "sha256:deee1077aae10d8fa88cb02c845cfba9b62c55e1183f52f6ae6a2df6a2187160", - "sha256:ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c", - "sha256:f030f8873312a16414c0d8e1a1ddff2d3235655a2174e3648b4fa66b3f2f1079", - "sha256:f0b278ce10936db1a37e6954e15a3730bea96a0997c26d7fee88e6c396c2086d", - "sha256:f11642dddbb0253cc8853254301b51390ba0081750a8ac03f20ea8103f0c56b6" + "sha256:03e2a7826086b91ef345ff18742ee9fc47a6839ccd517061ef8fa1976e652ce9", + "sha256:07e6db90cd9686c767dcc593dff16c8c09f9814f5e9c51034066cad3373b914d", + "sha256:18d520c6860515a771708937d2f78f63cc47ab3b80cb78e86573b0a760161faf", + "sha256:1ebf730d2381158ecf3dfd4453fbca0613e16eaa547b4170e2450c9707665ce7", + "sha256:21b7745788866028adeb1e0eca3bf1101109e2dc58456cb49d2d9b99a8c516e6", + "sha256:26e2deacd414fc2f97dd9f7676ee3eaecd299ca751412d89f40bc01557a6b1b4", + "sha256:2c6dbb42f3ad25760010c45191e9757e7dce981cbfb90e42feef301d71540059", + "sha256:2fea046bfb455510e05be95e879f0e768d45c10c11509e20e06d8fcaa31d9e39", + "sha256:34626a7eee2a3da12af0507780bb51eb52dca0e1751fd1471d0810539cefb536", + "sha256:37d1141ad6b2466a7b53a22e08fe76994c2d35a5b6b469590424a9953155afac", + "sha256:46191097ebc381fbf89bdce207a6c107ac4ec0890d8d20f3360345ff5976155c", + "sha256:4dd8bafa458b5c7d061540f1ee9f18025a68e2d8471b3e858a9dad47c8d41903", + "sha256:4e21876082ed887baed0146fe222f861b5815455ada3b33b890f4105d806128d", + "sha256:58303469e9a272b4abdb9e302a780072c0633cdcc0165db7eec0f9e32f901e05", + "sha256:5ca5aeb4344b30d0bec47481536b8ba1181d50dbe783b0e4ad03c95dc1296684", + "sha256:68353fe7cdf91f109fc7d474461b46e7f1f14e533e911a2a2cbb8b0fc8613cf1", + "sha256:6f89d05e028d274ce4fa1a86887b071ae1755082ef94a6740238cd7a8178804f", + "sha256:7a15dc0a14008f1da3d1ebd44bdda3e357dbabdf5a0b5034d38fcde0b5c234b7", + "sha256:8bdde1177f2311ee552f47ae6e5aa7750c0e3291ca6b75f71f7ffe1f1dab3dca", + "sha256:8ce257cac556cb03be4a248d92ed36904a59a4a5ff55a994e92214cde15c5bad", + "sha256:8cf5cfcb1521dc3255d845d9dca3ff204b3229401994ef8d1984b32746bb45ca", + "sha256:8fbbdc8d55990eac1b0919ca69eb5a988a802b854488c34b8f37f3e2025fa90d", + "sha256:9548f10d8be799551eb3a9c74bbf2b4934ddb330e08a73320123c07f95cc2d92", + "sha256:96f8a1cb43ca1422f36492bebe63312d396491a9165ed3b9231e778d43a7fca4", + "sha256:9b27d894748475fa858f9597c0ee1d4829f44683f3813633aaf94b19cb5453cf", + "sha256:9baff2a45ae1f17c8078452e9e5962e518eab705e50a0aa8083733ea7d45f3a6", + "sha256:a2a8b8bcc399edb4347a5ca8b9b87e7524c0967b335fbb08a83c8421489ddee1", + "sha256:acf53bc2cf7282ab9b8ba346746afe703474004d9e566ad164c91a7a59f188a4", + "sha256:b0be84e5a6209858a1d3e8d1806c46214e867ce1b0fd32e4ea03f4bd8b2e3359", + "sha256:b31651d018b23ec463e95cf10070d0b2c548aa950a03d0b559eaa11c7e5a6fa3", + "sha256:b78e5afb39941572209f71866aa0b206c12f0109835aa0d601e41552f9b3e620", + "sha256:c76aeef1b95aff3905fb2ae2d96e319caca5b76fa41d3470b19d4e4a3a313512", + "sha256:dd035edafefee4d573140a76fdc785dc38829fe5a455c4bb12bac8c20cfc3d69", + "sha256:dd6fe30bd519694b356cbfcaca9bd5c1737cddd20778c6a581ae20dc8c04def2", + "sha256:e5f4e1edcf57ce94e5475fe09e5afa3e3145081318e5fd1a43a6b4539a97e518", + "sha256:ec6bc7fe73a938933d4178c9b23c4e0568e43e220aef9472c4f6044bfc6dd0f0", + "sha256:f1555ea6d6da108e1999b2463ea1003fe03f29213e459145e70edbaf3e004aaa", + "sha256:f5fa5803f47e095d7ad8443d28b01d48c0359484fec1b9d8606d0e3282084bc4", + "sha256:f7331dbf301b7289013175087636bbaf5b2405e57259dd2c42fdcc9fcc47325e", + "sha256:f9987b0354b06d4df0f4d3e0ec1ae76d7ce7cbca9a2f98c25041eb79eec766f1", + "sha256:fd9e830e9d8d89b20ab1e5af09b32d33e1a08ef4c4e14411e559556fd788e6b2" ], "index": "pypi", - "version": "==5.5" + "version": "==6.3.2" }, "docutils": { "hashes": [ - "sha256:686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125", - "sha256:cf316c8370a737a022b72b56874f6602acf974a37a9fba42ec2876387549fc61" + "sha256:23010f129180089fbcd3bc08cfefccb3b890b0050e1ca00c867036e9d161b98c", + "sha256:679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==0.17.1" + "version": "==0.18.1" }, "idna": { "hashes": [ - "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a", - "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3" + "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff", + "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" ], "markers": "python_version >= '3'", - "version": "==3.2" + "version": "==3.3" }, "importlib-metadata": { "hashes": [ - "sha256:b618b6d2d5ffa2f16add5697cf57a46c76a56229b0ed1c438322e4e95645bd15", - "sha256:f284b3e11256ad1e5d03ab86bb2ccd6f5339688ff17a4d797a0fe7df326f23b1" + "sha256:1208431ca90a8cca1a6b8af391bb53c1a2db74e5d1cef6ddced95d4b2062edc6", + "sha256:ea4c597ebf37142f827b8f39299579e31685c31d3a438b59f469406afd0f2539" ], - "markers": "python_version >= '3.6'", - "version": "==4.8.1" + "markers": "python_version >= '3.7'", + "version": "==4.11.3" }, "keyring": { "hashes": [ - "sha256:b32397fd7e7063f8dd74a26db910c9862fc2109285fa16e3b5208bcb42a3e579", - "sha256:b7e0156667f5dcc73c1f63a518005cd18a4eb23fe77321194fefcc03748b21a4" + "sha256:9012508e141a80bd1c0b6778d5c610dd9f8c464d75ac6774248500503f972fb9", + "sha256:b0d28928ac3ec8e42ef4cc227822647a19f1d544f21f96457965dc01cf555261" ], - "markers": "python_version >= '3.6'", - "version": "==23.1.0" + "markers": "python_version >= '3.7'", + "version": "==23.5.0" }, - "nose": { + "nose-py3": { "hashes": [ - "sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac", - "sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a", - "sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98" + "sha256:560de1e49a1dbd677ff5b2858c683bba32345d468c962e534fb2e5830d3d24ed", + "sha256:ce0b8ffa7dec78158dba58dc4fce26465a341a36acacbeaa1ce1149b9ff1b963" ], "index": "pypi", - "version": "==1.3.7" + "version": "==1.4.0" + }, + "numpy": { + "hashes": [ + "sha256:07a8c89a04997625236c5ecb7afe35a02af3896c8aa01890a849913a2309c676", + "sha256:08d9b008d0156c70dc392bb3ab3abb6e7a711383c3247b410b39962263576cd4", + "sha256:201b4d0552831f7250a08d3b38de0d989d6f6e4658b709a02a73c524ccc6ffce", + "sha256:2c10a93606e0b4b95c9b04b77dc349b398fdfbda382d2a39ba5a822f669a0123", + "sha256:3ca688e1b9b95d80250bca34b11a05e389b1420d00e87a0d12dc45f131f704a1", + "sha256:48a3aecd3b997bf452a2dedb11f4e79bc5bfd21a1d4cc760e703c31d57c84b3e", + "sha256:568dfd16224abddafb1cbcce2ff14f522abe037268514dd7e42c6776a1c3f8e5", + "sha256:5bfb1bb598e8229c2d5d48db1860bcf4311337864ea3efdbe1171fb0c5da515d", + "sha256:639b54cdf6aa4f82fe37ebf70401bbb74b8508fddcf4797f9fe59615b8c5813a", + "sha256:8251ed96f38b47b4295b1ae51631de7ffa8260b5b087808ef09a39a9d66c97ab", + "sha256:92bfa69cfbdf7dfc3040978ad09a48091143cffb778ec3b03fa170c494118d75", + "sha256:97098b95aa4e418529099c26558eeb8486e66bd1e53a6b606d684d0c3616b168", + "sha256:a3bae1a2ed00e90b3ba5f7bd0a7c7999b55d609e0c54ceb2b076a25e345fa9f4", + "sha256:c34ea7e9d13a70bf2ab64a2532fe149a9aced424cd05a2c4ba662fd989e3e45f", + "sha256:dbc7601a3b7472d559dc7b933b18b4b66f9aa7452c120e87dfb33d02008c8a18", + "sha256:e7927a589df200c5e23c57970bafbd0cd322459aa7b1ff73b7c2e84d6e3eae62", + "sha256:f8c1f39caad2c896bc0018f699882b345b2a63708008be29b1f355ebf6f933fe", + "sha256:f950f8845b480cffe522913d35567e29dd381b0dc7e4ce6a4a9f9156417d2430", + "sha256:fade0d4f4d292b6f39951b6836d7a3c7ef5b2347f3c420cd9820a1d90d794802", + "sha256:fdf3c08bce27132395d3c3ba1503cac12e17282358cb4bddc25cc46b0aca07aa" + ], + "index": "pypi", + "version": "==1.22.3" }, "packaging": { "hashes": [ - "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7", - "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14" + "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb", + "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522" ], "markers": "python_version >= '3.6'", - "version": "==21.0" + "version": "==21.3" }, "pkginfo": { "hashes": [ - "sha256:37ecd857b47e5f55949c41ed061eb51a0bee97a87c969219d144c0e023982779", - "sha256:e7432f81d08adec7297633191bbf0bd47faf13cd8724c3a13250e51d542635bd" + "sha256:542e0d0b6750e2e21c20179803e40ab50598d8066d51097a0e382cba9eb02bff", + "sha256:c24c487c6a7f72c66e816ab1796b96ac6c3d14d49338293d2141664330b55ffc" ], - "version": "==1.7.1" + "version": "==1.8.2" }, "pygments": { "hashes": [ - "sha256:b8e67fe6af78f492b3c4b3e2970c0624cbf08beb1e493b2c99b9fa1b67a20380", - "sha256:f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6" + "sha256:44238f1b60a76d78fc8ca0528ee429702aae011c265fe6a8dd8b63049ae41c65", + "sha256:4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a" ], "markers": "python_version >= '3.5'", - "version": "==2.10.0" + "version": "==2.11.2" }, "pyparsing": { "hashes": [ - "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1", - "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b" + "sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea", + "sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484" ], - "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==2.4.7" + "markers": "python_version >= '3.6'", + "version": "==3.0.7" }, "readme-renderer": { "hashes": [ - "sha256:63b4075c6698fcfa78e584930f07f39e05d46f3ec97f65006e430b595ca6348c", - "sha256:92fd5ac2bf8677f310f3303aa4bce5b9d5f9f2094ab98c29f13791d7b805a3db" + "sha256:262510fe6aae81ed4e94d8b169077f325614c0b1a45916a80442c6576264a9c2", + "sha256:dfb4d17f21706d145f7473e0b61ca245ba58e810cf9b2209a48239677f82e5b0" ], - "version": "==29.0" + "markers": "python_version >= '3.6'", + "version": "==34.0" }, "requests": { "hashes": [ - "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24", - "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7" + "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61", + "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", - "version": "==2.26.0" + "version": "==2.27.1" }, "requests-toolbelt": { "hashes": [ @@ -216,10 +231,11 @@ }, "rfc3986": { "hashes": [ - "sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835", - "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97" + "sha256:50b1502b60e289cb37883f3dfd34532b8873c7de9f49bb546641ce9cbd256ebd", + "sha256:97aacf9dbd4bfd829baad6e6309fa6573aaf1be3f6fa735c8ab05e46cecb261c" ], - "version": "==1.5.0" + "markers": "python_version >= '3.7'", + "version": "==2.0.0" }, "six": { "hashes": [ @@ -231,27 +247,27 @@ }, "tqdm": { "hashes": [ - "sha256:80aead664e6c1672c4ae20dc50e1cdc5e20eeff9b14aa23ecd426375b28be588", - "sha256:a4d6d112e507ef98513ac119ead1159d286deab17dffedd96921412c2d236ff5" + "sha256:4230a49119a416c88cc47d0d2d32d5d90f1a282d5e497d49801950704e49863d", + "sha256:6461b009d6792008d0000e1b0c7ca50195ec78c0e808a3a6b668a56a3236c3a5" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==4.62.2" + "version": "==4.63.1" }, "twine": { "hashes": [ - "sha256:087328e9bb405e7ce18527a2dca4042a84c7918658f951110b38bc135acab218", - "sha256:4caec0f1ed78dc4c9b83ad537e453d03ce485725f2aea57f1bb3fdde78dae936" + "sha256:8efa52658e0ae770686a13b675569328f1fba9837e5de1867bfe5f46a9aefe19", + "sha256:d0550fca9dc19f3d5e8eadfce0c227294df0a2a951251a4385797c8a6198b7c8" ], "index": "pypi", - "version": "==3.4.2" + "version": "==3.8.0" }, "urllib3": { "hashes": [ - "sha256:39fb8672126159acb139a7718dd10806104dec1e2f0f6c88aab05d17df10c8d4", - "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f" + "sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14", + "sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", - "version": "==1.26.6" + "version": "==1.26.9" }, "webencodings": { "hashes": [ @@ -262,11 +278,11 @@ }, "zipp": { "hashes": [ - "sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3", - "sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4" + "sha256:9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d", + "sha256:b47250dd24f92b7dd6a0a8fc5244da14608f3ca90a5efcd37a3b1642fac9a375" ], - "markers": "python_version >= '3.6'", - "version": "==3.5.0" + "markers": "python_version >= '3.7'", + "version": "==3.7.0" } } } diff --git a/tests/README.md b/tests/README.md index a1d04f737..da7f90054 100644 --- a/tests/README.md +++ b/tests/README.md @@ -7,9 +7,9 @@ Feel free to add more, the more the better! ## How to run the tests ```bash -cd src/mackup -pip install -r requirements.txt -nosetests +pip install pipenv +pipenv install -d +pipenv run make test ``` And you should see From 3728658ea810b40fe10bfbe14ef2396aae33c07a Mon Sep 17 00:00:00 2001 From: Michiel Gerritsen Date: Sat, 9 Jul 2022 16:05:55 +0200 Subject: [PATCH 336/406] Add dynamic profiles for iTerm2 (#1830) * Add dynamic profiles for iTerm2 * Update iterm2.cfg Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 2 ++ mackup/applications/iterm2.cfg | 1 + 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6e2837b1..a87dbd30f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Updated support for iTerm2 (via @michielgerritsen) + ## Mackup 0.8.34 - Updated support for Bash it (via @jacopkane) diff --git a/mackup/applications/iterm2.cfg b/mackup/applications/iterm2.cfg index 02e826fe3..47742f80b 100644 --- a/mackup/applications/iterm2.cfg +++ b/mackup/applications/iterm2.cfg @@ -3,3 +3,4 @@ name = iTerm2 [configuration_files] Library/Preferences/com.googlecode.iterm2.plist +Library/Application Support/iTerm2/DynamicProfiles From 81350f0fdb3b87a88ce29505e4ecca62e4d71283 Mon Sep 17 00:00:00 2001 From: Josh Medeski Date: Fri, 15 Jul 2022 15:25:08 -0500 Subject: [PATCH 337/406] feat: configure parser to support inline comments (#1838) * feat: configure parser to support inline comments * fix: lint long line --- mackup/config.py | 4 +++- tests/fixtures/mackup-apps_to_ignore.cfg | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mackup/config.py b/mackup/config.py index 373bef984..5fbbc9140 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -147,7 +147,9 @@ def _setup_parser(self, filename=None): if not filename: filename = MACKUP_CONFIG_FILE - parser = configparser.SafeConfigParser(allow_no_value=True) + parser = configparser.SafeConfigParser( + allow_no_value=True, inline_comment_prefixes=(";", "#") + ) parser.read(os.path.join(os.path.join(os.environ["HOME"], filename))) return parser diff --git a/tests/fixtures/mackup-apps_to_ignore.cfg b/tests/fixtures/mackup-apps_to_ignore.cfg index be205c742..b3c69e181 100644 --- a/tests/fixtures/mackup-apps_to_ignore.cfg +++ b/tests/fixtures/mackup-apps_to_ignore.cfg @@ -1,4 +1,4 @@ [applications_to_ignore] -subversion -sequel-pro +subversion ; inline comment +sequel-pro # inline comment sabnzbd From 3715d557a2fdef767d7078d9961db6dbc90fc4fc Mon Sep 17 00:00:00 2001 From: Lavare <3128357+LavareX@users.noreply.github.com> Date: Wed, 20 Jul 2022 22:01:29 +0800 Subject: [PATCH 338/406] Add support for fork (#1839) * Add support for fork * fix lint issue --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/fork.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/fork.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index a87dbd30f..3a2e93e93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Updated support for iTerm2 (via @michielgerritsen) +- Added support for Fork (via @lavareX) ## Mackup 0.8.34 diff --git a/README.md b/README.md index a5c942996..dcb8875fc 100644 --- a/README.md +++ b/README.md @@ -320,6 +320,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Fontconfig](https://www.freedesktop.org/wiki/Software/fontconfig/) - [FontExplorer X](http://www.fontexplorerx.com/) - [Forge](http://www.slightlymagic.net/wiki/Forge) +- [Fork](https://git-fork.com/) - [ForkLift](http://www.binarynights.com/forklift/) - [Franz](https://meetfranz.com) - [Gas Mask](https://github.com/2ndalpha/gasmask/) diff --git a/mackup/applications/fork.cfg b/mackup/applications/fork.cfg new file mode 100644 index 000000000..6f7a10649 --- /dev/null +++ b/mackup/applications/fork.cfg @@ -0,0 +1,6 @@ +[application] +name = Fork + +[configuration_files] +Library/Application Support/com.DanPristupov.Fork/custom-commands.json +Library/Preferences/com.DanPristupov.Fork.plist From 5f3046ce9e6c62cab0e4ba92150875b251e0d829 Mon Sep 17 00:00:00 2001 From: Lavare <3128357+LavareX@users.noreply.github.com> Date: Wed, 20 Jul 2022 22:14:32 +0800 Subject: [PATCH 339/406] Add support for NSLogger (#1840) * Add support for NSLogger * fix lint issue Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/nslogger.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/nslogger.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a2e93e93..8c7216606 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Updated support for iTerm2 (via @michielgerritsen) +- Added support for NSLogger (via @lavareX) - Added support for Fork (via @lavareX) ## Mackup 0.8.34 diff --git a/README.md b/README.md index dcb8875fc..f11c7e707 100644 --- a/README.md +++ b/README.md @@ -489,6 +489,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Nova](https://www.nova.app/) - [npm](https://www.npmjs.com/) - [npmrc](https://github.com/deoxxa/npmrc/) +- [NSLogger](https://github.com/fpillet/NSLogger) - [nuget](https://www.nuget.org/) - [Nushell](https://www.nushell.sh/) - [nvALT](http://brettterpstra.com/projects/nvalt/) diff --git a/mackup/applications/nslogger.cfg b/mackup/applications/nslogger.cfg new file mode 100644 index 000000000..56932ecae --- /dev/null +++ b/mackup/applications/nslogger.cfg @@ -0,0 +1,5 @@ +[application] +name = NSLogger + +[configuration_files] +Library/Preferences/com.florentpillet.NSLogger.plist From 6a25918474479601061dc1d13e45e4670bcfff37 Mon Sep 17 00:00:00 2001 From: Ihor Date: Fri, 22 Jul 2022 15:17:44 +0200 Subject: [PATCH 340/406] Update Espanso path (#1841) https://espanso.org/docs/get-started/#configuration --- mackup/applications/espanso.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/espanso.cfg b/mackup/applications/espanso.cfg index 5d0e073ae..1fb26d2f3 100644 --- a/mackup/applications/espanso.cfg +++ b/mackup/applications/espanso.cfg @@ -2,7 +2,7 @@ name = espanso [configuration_files] -Library/Preferences/espanso +Library/Application Support/espanso [xdg_configuration_files] espanso From 6036f93a43626709f5d84bd0c9870dc578d8a162 Mon Sep 17 00:00:00 2001 From: Mersid Date: Tue, 26 Jul 2022 07:35:03 -0700 Subject: [PATCH 341/406] Added support for btop (#1842) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/btop.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/btop.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c7216606..508396495 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Updated support for iTerm2 (via @michielgerritsen) - Added support for NSLogger (via @lavareX) - Added support for Fork (via @lavareX) +- Added support for Btop (via @Mersid) ## Mackup 0.8.34 diff --git a/README.md b/README.md index f11c7e707..415cf39c0 100644 --- a/README.md +++ b/README.md @@ -228,6 +228,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Boxer](http://boxerapp.com) - [Brackets](http://brackets.io/) - [Brave](https://brave.com/) +- [Btop](https://github.com/aristocratos/btop) - [Bump](https://github.com/fabiospampinato/bump) - [Bundler](http://bundler.io) - [Byobu](http://byobu.co/) diff --git a/mackup/applications/btop.cfg b/mackup/applications/btop.cfg new file mode 100644 index 000000000..e066c25eb --- /dev/null +++ b/mackup/applications/btop.cfg @@ -0,0 +1,5 @@ +[application] +name = btop + +[xdg_configuration_files] +btop From c30d6513f84dbd5ed39a09998b84217b51012aee Mon Sep 17 00:00:00 2001 From: Jan Chaloupecky Date: Tue, 26 Jul 2022 16:37:29 +0200 Subject: [PATCH 342/406] Added support for Proxyman Setapp (#1843) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/proxyman.cfg | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 508396495..4f47b7d4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Updated support for iTerm2 (via @michielgerritsen) - Added support for NSLogger (via @lavareX) - Added support for Fork (via @lavareX) +- Updated support for Proxymann Setapp version (via @JanC) - Added support for Btop (via @Mersid) ## Mackup 0.8.34 diff --git a/mackup/applications/proxyman.cfg b/mackup/applications/proxyman.cfg index c539c8fbd..424a882cd 100644 --- a/mackup/applications/proxyman.cfg +++ b/mackup/applications/proxyman.cfg @@ -4,3 +4,5 @@ name = Proxyman [configuration_files] Library/Application Support/com.proxyman.NSProxy Library/Preferences/com.proxyman.NSProxy.plist +Library/Application Support/com.proxyman.NSProxy-setapp +Library/Preferences/com.proxyman.NSProxy-setapp.plist From 125408fd81f615d1604171ee36c831e725ecad52 Mon Sep 17 00:00:00 2001 From: maradude Date: Sun, 31 Jul 2022 18:08:10 +0000 Subject: [PATCH 343/406] Update Nushell config paths (#1844) * update default nushell config files 0.60 and 0.61 changed config files https://www.nushell.sh/blog/2022-03-22-nushell_0_60.html https://www.nushell.sh/blog/2022-04-12-nushell_0_61.html * add macos nushell config file paths I didn't find their docs officially stating the macos config directory location, but based on trying it out and their path library^1 using dirs-next^2 which follows Apple's File System Programmin Guide^3, I used these paths. [1]: https://github.com/nushell/nushell/tree/main/crates/nu-path [2]: https://crates.io/crates/dirs-next [3]: https://developer.apple.com/library/archive/documentation/FileManagement/Conceptual/FileSystemProgrammingGuide/FileSystemOverview/FileSystemOverview.html#//apple_ref/doc/uid/TP40010672-CH2-SW6 --- CHANGELOG.md | 1 + mackup/applications/nushell.cfg | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f47b7d4d..124d283ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Added support for Fork (via @lavareX) - Updated support for Proxymann Setapp version (via @JanC) - Added support for Btop (via @Mersid) +- Updated support for Nushell (via @maradude) ## Mackup 0.8.34 diff --git a/mackup/applications/nushell.cfg b/mackup/applications/nushell.cfg index 2aac9e84e..782260e3d 100644 --- a/mackup/applications/nushell.cfg +++ b/mackup/applications/nushell.cfg @@ -1,5 +1,10 @@ [application] name = Nushell +[configuration_files] +Library/Application Support/nushell/env.nu +Library/Application Support/nushell/config.nu + [xdg_configuration_files] -nu/config.toml +nushell/config.nu +nushell/env.nu From 4b01c5a714d37b68fb3b8970670f2554ab70946a Mon Sep 17 00:00:00 2001 From: Tim Feeley Date: Tue, 9 Aug 2022 07:07:29 -0700 Subject: [PATCH 344/406] Updated support for CleanShot (#1846) * Update cleanshot.cfg Cleanshot 4+ stores preferences in a different location * Update CHANGELOG.md * Update cleanshot.cfg Fixing my mangled edit. --- CHANGELOG.md | 1 + mackup/applications/cleanshot.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 124d283ed..02a32e522 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Updated support for Proxymann Setapp version (via @JanC) - Added support for Btop (via @Mersid) - Updated support for Nushell (via @maradude) +- Updated support for CleanShot (via @timfee) ## Mackup 0.8.34 diff --git a/mackup/applications/cleanshot.cfg b/mackup/applications/cleanshot.cfg index c068d5acd..beeaf04e0 100644 --- a/mackup/applications/cleanshot.cfg +++ b/mackup/applications/cleanshot.cfg @@ -3,3 +3,4 @@ name = CleanShot [configuration_files] Library/Preferences/com.getcleanshot.app-setapp.plist +Library/Preferences/pl.maketheweb.cleanshotx.plist From 3f5fe6289efabab82454108fe89f4fbd1a320112 Mon Sep 17 00:00:00 2001 From: Josh Medeski Date: Wed, 10 Aug 2022 09:55:28 -0500 Subject: [PATCH 345/406] fix: add back compat to espanso app (#1848) * fix: add back compat to espanso app * docs: update changelog --- CHANGELOG.md | 1 + mackup/applications/espanso.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02a32e522..f9c1c1923 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Added support for Btop (via @Mersid) - Updated support for Nushell (via @maradude) - Updated support for CleanShot (via @timfee) +- Added backwards-compatibility support for Espanso (via @joshmedeski) ## Mackup 0.8.34 diff --git a/mackup/applications/espanso.cfg b/mackup/applications/espanso.cfg index 1fb26d2f3..93166c2c3 100644 --- a/mackup/applications/espanso.cfg +++ b/mackup/applications/espanso.cfg @@ -2,6 +2,7 @@ name = espanso [configuration_files] +Library/Preferences/espanso Library/Application Support/espanso [xdg_configuration_files] From 74811f5fe4da4226ffb7844108b51679dcee4d06 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 13 Aug 2022 16:27:41 +0200 Subject: [PATCH 346/406] Mackup 0.8.35 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9c1c1923..2436a2848 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.35 + - Updated support for iTerm2 (via @michielgerritsen) - Added support for NSLogger (via @lavareX) - Added support for Fork (via @lavareX) diff --git a/mackup/constants.py b/mackup/constants.py index cf4dad6e9..613d24725 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = "0.8.34" +VERSION = "0.8.35" # Support platforms PLATFORM_DARWIN = "Darwin" From 0d538b2fc0263c79f3c853f19e47ceebde7559c2 Mon Sep 17 00:00:00 2001 From: Liu233w Date: Wed, 31 Aug 2022 01:03:34 +1000 Subject: [PATCH 347/406] Add all yabai supported locations (#1853) The locations are listed in its wiki: https://github.com/koekeishiya/yabai/wiki/Configuration#configuration-file --- CHANGELOG.md | 2 ++ mackup/applications/yabai.cfg | 3 +++ 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2436a2848..64d874ce2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Updated support for yabai (via @Liu233w) + ## Mackup 0.8.35 - Updated support for iTerm2 (via @michielgerritsen) diff --git a/mackup/applications/yabai.cfg b/mackup/applications/yabai.cfg index c4542196d..a22287e49 100644 --- a/mackup/applications/yabai.cfg +++ b/mackup/applications/yabai.cfg @@ -3,3 +3,6 @@ name = yabai [configuration_files] .yabairc + +[xdg_configuration_files] +yabai/yabairc From 18b8a351579bb784dbd6d883f1e9848cbfc62d05 Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Thu, 1 Sep 2022 15:18:58 +0200 Subject: [PATCH 348/406] add all supported locations for skhd (#1856) --- CHANGELOG.md | 1 + mackup/applications/skhd.cfg | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64d874ce2..3d641189a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Updated support for yabai (via @Liu233w) +- Updated suport for skhd (via @jonasdiemer) ## Mackup 0.8.35 diff --git a/mackup/applications/skhd.cfg b/mackup/applications/skhd.cfg index 064ffd304..74f116aef 100644 --- a/mackup/applications/skhd.cfg +++ b/mackup/applications/skhd.cfg @@ -3,3 +3,6 @@ name = skhd [configuration_files] .skhdrc + +[xdg_configuration_files] +skhd/skhdrc From f22e07e0f3e6fb64c3fd3299cdf671596cf4621a Mon Sep 17 00:00:00 2001 From: deepakv158 Date: Mon, 3 Oct 2022 05:21:10 -0700 Subject: [PATCH 349/406] Add IntelliJ 2022 configuration references (#1865) --- mackup/applications/intellijidea.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/intellijidea.cfg b/mackup/applications/intellijidea.cfg index a908b6b8d..70ee44885 100644 --- a/mackup/applications/intellijidea.cfg +++ b/mackup/applications/intellijidea.cfg @@ -50,6 +50,8 @@ Library/Application Support/JetBrains/IntelliJIdea2020.1 Library/Application Support/JetBrains/IntelliJIdea2020.2 Library/Application Support/JetBrains/IntelliJIdea2020.3 Library/Application Support/JetBrains/IntelliJIdea2021.1 +Library/Application Support/JetBrains/IntelliJIdea2022.1 +Library/Application Support/JetBrains/IntelliJIdea2022.2 Library/Preferences/IdeaIC2016.1 Library/Preferences/IdeaIC2016.2 Library/Preferences/IdeaIC2016.3 From 51fe4831b2cae2f2da1913d265810d079a03bbe8 Mon Sep 17 00:00:00 2001 From: Iaroslav Ogii Date: Fri, 7 Oct 2022 15:19:48 +0300 Subject: [PATCH 350/406] Update README.md (#1866) correct teamocil url: https://github.com/remi/teamocil --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 415cf39c0..86acb55e7 100644 --- a/README.md +++ b/README.md @@ -634,7 +634,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [TablePlus](https://tableplus.io) - [TaskPaper](https://www.taskpaper.com) - [Taskwarrior](http://taskwarrior.org/) -- [Teamocil](http://remiprev.github.io/teamocil/) +- [Teamocil](https://github.com/remi/teamocil) - [Telegram for macOS](https://macos.telegram.org) - [Terminal](http://www.apple.com/osx/apps/) - [Terminator](https://launchpad.net/terminator/) From 41caa4d2ca9df74cb07e97767f2ef610dc41b852 Mon Sep 17 00:00:00 2001 From: Anthony Clark Date: Fri, 7 Oct 2022 15:48:19 -0700 Subject: [PATCH 351/406] Add support for Sizzy (#1862) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/sizzy.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/sizzy.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d641189a..6ef7fa2d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Updated support for yabai (via @Liu233w) - Updated suport for skhd (via @jonasdiemer) +- Added support for Sizzy (via @driftingly) ## Mackup 0.8.35 diff --git a/README.md b/README.md index 86acb55e7..7c09bb06d 100644 --- a/README.md +++ b/README.md @@ -598,6 +598,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [SHSH Blobs](https://en.wikipedia.org/wiki/SHSH_blob) - [Shuttle](http://fitztrev.github.io/shuttle/) - [SizeUp](http://www.irradiatedsoftware.com/sizeup/) +- [Sizzy](https://sizzy.co/) - [skhd](https://github.com/koekeishiya/skhd/) - [Skim](http://skim-app.sourceforge.net/) - [Skitch](https://evernote.com/skitch/) diff --git a/mackup/applications/sizzy.cfg b/mackup/applications/sizzy.cfg new file mode 100644 index 000000000..ab27f7e0e --- /dev/null +++ b/mackup/applications/sizzy.cfg @@ -0,0 +1,6 @@ +[application] +name = Sizzy + +[configuration_files] +Library/Application Support/Sizzy/config.json +Library/Application Support/Sizzy/window-state.json From 7f62fa391f4366c2fa68919e0b0eafea0889b49b Mon Sep 17 00:00:00 2001 From: Evert van Brussel Date: Wed, 12 Oct 2022 02:10:49 +0200 Subject: [PATCH 352/406] Add support for Airflow (#1867) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/airflow.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/airflow.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ef7fa2d6..b218a967a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Added support for Airflow (via @Evertt) - Updated support for yabai (via @Liu233w) - Updated suport for skhd (via @jonasdiemer) - Added support for Sizzy (via @driftingly) diff --git a/README.md b/README.md index 7c09bb06d..a83e02135 100644 --- a/README.md +++ b/README.md @@ -182,6 +182,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Affinity Designer](https://affinity.serif.com/designer) - [Affinity Photo](https://affinity.serif.com/photo) - [Affinity Publisher](https://affinity.serif.com/publisher) +- [Airflow](https://airflowapp.com/) - [Airmail](http://airmailapp.com/) - [Akamai-CLI](https://developer.akamai.com/cli) - [Alacritty](https://github.com/jwilm/alacritty) diff --git a/mackup/applications/airflow.cfg b/mackup/applications/airflow.cfg new file mode 100644 index 000000000..5524e7912 --- /dev/null +++ b/mackup/applications/airflow.cfg @@ -0,0 +1,6 @@ +[application] +name = Airflow + +[configuration_files] +Library/Preferences/com.bitcavehq.Airflow.plist +Library/Application Support/Airflow From d5d0a3bb3b2eee714f62f331bc7c09f780ca8a63 Mon Sep 17 00:00:00 2001 From: YiGeon Date: Wed, 12 Oct 2022 21:26:28 +0900 Subject: [PATCH 353/406] Add support for LunarVim (#1869) * Add support for LunarVim * Update lunarvim.cfg --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/lunarvim.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/lunarvim.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b218a967a..48556a657 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Added support for LunarVim (via @YiGeon) - Added support for Airflow (via @Evertt) - Updated support for yabai (via @Liu233w) - Updated suport for skhd (via @jonasdiemer) diff --git a/README.md b/README.md index a83e02135..45e38732b 100644 --- a/README.md +++ b/README.md @@ -431,6 +431,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Lollypop](https://gnumdk.github.io/lollypop-web/) - [Loopback](https://rogueamoeba.com/loopback/) - [Luftrausers](http://luftrausers.com) +- [LunarVim](https://www.lunarvim.org/) - [MacDive](http://www.mac-dive.com/) - [MacDown](http://macdown.uranusjr.com/) - [MacOSX](http://www.apple.com/osx/) diff --git a/mackup/applications/lunarvim.cfg b/mackup/applications/lunarvim.cfg new file mode 100644 index 000000000..5df57b455 --- /dev/null +++ b/mackup/applications/lunarvim.cfg @@ -0,0 +1,5 @@ +[application] +name = LunarVim + +[xdg_configuration_files] +lvim/config From a5624ca41e96dd53ac84d4c91f93fec3e174452d Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 12 Oct 2022 14:27:41 +0200 Subject: [PATCH 354/406] Mackup 0.8.36 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48556a657..60f66e19d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.36 + - Added support for LunarVim (via @YiGeon) - Added support for Airflow (via @Evertt) - Updated support for yabai (via @Liu233w) diff --git a/mackup/constants.py b/mackup/constants.py index 613d24725..1685f19e7 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = "0.8.35" +VERSION = "0.8.36" # Support platforms PLATFORM_DARWIN = "Darwin" From 1e72c6573d8bd1bf7a6601c73c7880d881c72974 Mon Sep 17 00:00:00 2001 From: YiGeon Date: Thu, 13 Oct 2022 20:30:17 +0900 Subject: [PATCH 355/406] Fix lunarVim config path (#1870) * Fix lunarVim config path * Add CHANGELOG --- CHANGELOG.md | 2 ++ mackup/applications/lunarvim.cfg | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60f66e19d..420d47bd1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Fixed support for LunarVim (via @YiGeon) + ## Mackup 0.8.36 - Added support for LunarVim (via @YiGeon) diff --git a/mackup/applications/lunarvim.cfg b/mackup/applications/lunarvim.cfg index 5df57b455..58354eb21 100644 --- a/mackup/applications/lunarvim.cfg +++ b/mackup/applications/lunarvim.cfg @@ -2,4 +2,4 @@ name = LunarVim [xdg_configuration_files] -lvim/config +lvim From 08375992f935da0bddb8799b5dfd57deb56d0c6b Mon Sep 17 00:00:00 2001 From: Zhizhen He Date: Thu, 20 Oct 2022 18:49:31 +0800 Subject: [PATCH 356/406] Fix typo (#1871) --- doc/configuration_merge_guide.md | 14 +++++++------- mackup/application.py | 2 +- mackup/utils.py | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/configuration_merge_guide.md b/doc/configuration_merge_guide.md index 5e833c34c..769f182aa 100644 --- a/doc/configuration_merge_guide.md +++ b/doc/configuration_merge_guide.md @@ -10,8 +10,8 @@ Machine B that you would live to move over to Machine A. The problem is that if you use Mackup to send Machine A's bash configuration settings to Machine B, you will permanently lose any configurations on Machine B that you wanted to keep. Mackup obviously has no idea which features you want -to keep and which ones you don't so you'll have to do a little bit of work to -merge the different configuration files yourself before using Mackup. +to keep and which ones you don't, so you'll have to do a bit of work to merge +the different configuration files yourself before using Mackup. ## Step 0: Read Through This Entire Guide First @@ -107,11 +107,11 @@ vim .bash_profile vim .bash_login ``` -When editing these configuration files on Machine A, copy and and paste the settings +When editing these configuration files on Machine A, copy and paste the settings from Machine B that you want to keep. In essence, you are manually merging the -configuratoin files together. Once you are satisfied the configuration files -have all the settings you want and need, you are ready to push out your changes from -the master machine. +configuration files together. Once you are satisfied the configuration files +have all the settings you want and need, you are ready to push out your changes +from the master machine. ### Method 2: Backup Push-Merge Approach @@ -160,7 +160,7 @@ If you used Method 1 in Step 2 above, you are done. You may you discover that you didn't quite merge the files exactly the way you wanted but don't worry, that's why you created the configuration file backups. You can grab snippets from these backup configuration files and add them in to the live -configuraton files and then easily push the changes out to all your +configuration files and then easily push the changes out to all your machines using mackup. If you used Method 2, you'll need to merge in new features over time. As you diff --git a/mackup/application.py b/mackup/application.py index 9a0c9cd78..7ed410e24 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -98,7 +98,7 @@ def backup(self): else: raise ValueError("Unsupported file: {}".format(mackup_filepath)) - # Ask the user if he really want to replace it + # Ask the user if he really wants to replace it if utils.confirm( "A {} named {} already exists in the" " backup.\nAre you sure that you want to" diff --git a/mackup/utils.py b/mackup/utils.py index 29775253d..7ebc73e30 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -22,7 +22,7 @@ def confirm(question): """ - Ask the user if he really want something to happen. + Ask the user if he really wants something to happen. Args: question(str): What can happen @@ -72,7 +72,7 @@ def copy(src, dst): """ Copy a file or a folder (recursively) from src to dst. - For simplicity sake, both src and dst must be absolute path and must + For the sake of simplicity, both src and dst must be absolute path and must include the filename of the file or folder. Also do not include any trailing slash. @@ -90,7 +90,7 @@ def copy(src, dst): assert os.path.exists(src) assert isinstance(dst, str) - # Create the path to the dst file if it does not exists + # Create the path to the dst file if it does not exist abs_path = os.path.dirname(os.path.abspath(dst)) if not os.path.isdir(abs_path): os.makedirs(abs_path) @@ -116,7 +116,7 @@ def link(target, link_to): """ Create a link to a target file or a folder. - For simplicity sake, both target and link_to must be absolute path and must + For the sake of simplicity, both target and link_to must be absolute path and must include the filename of the file or folder. Also do not include any trailing slash. @@ -133,7 +133,7 @@ def link(target, link_to): assert os.path.exists(target) assert isinstance(link_to, str) - # Create the path to the link if it does not exists + # Create the path to the link if it does not exist abs_path = os.path.dirname(os.path.abspath(link_to)) if not os.path.isdir(abs_path): os.makedirs(abs_path) From 0d778aaf9e85ff501ce529c37407fff6fd759506 Mon Sep 17 00:00:00 2001 From: Zhizhen He Date: Thu, 20 Oct 2022 21:48:50 +0800 Subject: [PATCH 357/406] Change style for MD029 from one to ordered (#1872) --- .mdl_style.rb | 4 ++++ .mdlrc | 1 + INSTALL.md | 2 +- README.md | 4 ++-- doc/README.md | 6 ++--- doc/configuration_merge_guide.md | 22 +++++++++---------- doc/release.md | 14 ++++++------ tests/README.md | 2 +- .../com~apple~CloudDocs/_blank_.md | 2 +- 9 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 .mdl_style.rb create mode 100644 .mdlrc diff --git a/.mdl_style.rb b/.mdl_style.rb new file mode 100644 index 000000000..87660f6eb --- /dev/null +++ b/.mdl_style.rb @@ -0,0 +1,4 @@ +all +rule 'MD007', :indent => 2 +rule 'MD029', :style => :ordered +exclude_rule 'MD041' diff --git a/.mdlrc b/.mdlrc new file mode 100644 index 000000000..8f1aa6109 --- /dev/null +++ b/.mdlrc @@ -0,0 +1 @@ +style './.mdl_style.rb' diff --git a/INSTALL.md b/INSTALL.md index a52949a80..7ca9edb90 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -3,7 +3,7 @@ There are 2 ways to run mackup 1. Install it with Homebrew (OSX only) -1. Install it with PIP (OSX and GNU/Linux) +2. Install it with PIP (OSX and GNU/Linux) ## Install diff --git a/README.md b/README.md index 45e38732b..cbe0d9ce9 100644 --- a/README.md +++ b/README.md @@ -123,8 +123,8 @@ folder, in the `.gitconfig` file. If you have Dropbox, these things happen when you launch `mackup backup`: 1. `cp ~/.gitconfig ~/Dropbox/Mackup/.gitconfig` -1. `rm ~/.gitconfig` -1. `ln -s ~/Dropbox/Mackup/.gitconfig ~/.gitconfig` +2. `rm ~/.gitconfig` +3. `ln -s ~/Dropbox/Mackup/.gitconfig ~/.gitconfig` Now your `git` config is always backed up and up to date on all your workstations. diff --git a/doc/README.md b/doc/README.md index 605182b8a..405e08b6f 100644 --- a/doc/README.md +++ b/doc/README.md @@ -114,9 +114,9 @@ If you ever change your mind and switch storage solutions after Mackup is already setup (ex: from `dropbox` to `icloud`), complete the following steps. 1. Run `mackup uninstall` on all computers -1. Copy your Mackup files to the new storage location -1. Change the storage provider details in your `.mackup.cfg` file (see above) -1. Run `mackup backup` on the main computer and `mackup restore` on all others +2. Copy your Mackup files to the new storage location +3. Change the storage provider details in your `.mackup.cfg` file (see above) +4. Run `mackup backup` on the main computer and `mackup restore` on all others ## Applications diff --git a/doc/configuration_merge_guide.md b/doc/configuration_merge_guide.md index 769f182aa..25daf61f2 100644 --- a/doc/configuration_merge_guide.md +++ b/doc/configuration_merge_guide.md @@ -23,11 +23,11 @@ First, pick the app you wish to keep in sync. Then determine which configuration files will be synced for that application by doing the following: 1. [Install Mackup](./../INSTALL.md) -1. Create a `.mackup.cfg` file in your home directory -1. Add the following two lines to `.mackup.cfg`. Replace **bash** +2. Create a `.mackup.cfg` file in your home directory +3. Add the following two lines to `.mackup.cfg`. Replace **bash** in the example below with the name of your application. -``` +```text [applications_to_sync] bash ``` @@ -35,7 +35,7 @@ bash You can get a list of supported apps by running `mackup list`. 1. Save the file -1. Run the following command: +2. Run the following command: `mackup --dry-run --verbose backup` @@ -64,9 +64,9 @@ from other machines. 1. Create a backup of each machine's configuration files for the app you wish to sync. -1. Choose a machine that will serve as the initial "master". It doesn't really +2. Choose a machine that will serve as the initial "master". It doesn't really matter which one. -1. Edit your configuration files on the master machine so that they +3. Edit your configuration files on the master machine so that they represent the ideal version of the file you wish to distribute out to your other machines. @@ -80,7 +80,7 @@ for your application on all machines. ##### Sample backup commands for Machine A** -``` +```bash mkdir ~/bash_backup cp ~/.bash_profile ~/bash_backup/bash_profile.bak cp ~/.bash_login ~/bash_backup/bash_login.bak @@ -90,7 +90,7 @@ cp ~/.bash_login ~/bash_backup/bash_login.bak ##### Sample backup commands for Machine B -``` +```bash mkdir ~/bash_backup cp ~/.bash_profile ~/bash_backup/bash_profile.bak cp ~/.bash_login ~/bash_backup/bash_login.bak @@ -102,7 +102,7 @@ Machine A will be our master so we now edit the existing configuration files on Machine A. We will use the vim text editor to do this for each of our configuration files: -``` +```bash vim .bash_profile vim .bash_login ``` @@ -118,7 +118,7 @@ from the master machine. 1. Choose a machine that will serve as the initial "master". You'll probably want to use choose the machine you use most and like its configuration settings the best. -1. For each machine that aren't the "master" (i.e. "slaves"), back up all the +2. For each machine that aren't the "master" (i.e. "slaves"), back up all the configuration files for each app that you want to sync. That's it for now. However, there will be more work for you later. @@ -132,7 +132,7 @@ Machine B: ##### Sample backup commands for Machine B** -``` +```bash mkdir ~/bash_backup cp ~/.bash_profile ~/bash_backup/bash_profile.bak cp ~/.bash_login ~/bash_backup/bash_login.bak diff --git a/doc/release.md b/doc/release.md index ae6167c9a..b64332a7a 100644 --- a/doc/release.md +++ b/doc/release.md @@ -1,9 +1,9 @@ # Release - 1. Move all the WIP changes under a new version in the [changelog](../CHANGELOG.md) - 1. Increment the version in [constants.py](../mackup/constants.py) - 1. `git commit` with the message `Mackup X.Y.Z` - 1. `git tag ` - 1. `git push` - 1. `git push --tags` - 1. `make release` +1. Move all the WIP changes under a new version in the [changelog](../CHANGELOG.md) +2. Increment the version in [constants.py](../mackup/constants.py) +3. `git commit` with the message `Mackup X.Y.Z` +4. `git tag ` +5. `git push` +6. `git push --tags` +7. `make release` diff --git a/tests/README.md b/tests/README.md index da7f90054..d27f371d0 100644 --- a/tests/README.md +++ b/tests/README.md @@ -14,7 +14,7 @@ pipenv run make test And you should see -``` +```text . ---------------------------------------------------------------------- Ran 1 test in 0.016s diff --git a/tests/fixtures/Library/Mobile Documents/com~apple~CloudDocs/_blank_.md b/tests/fixtures/Library/Mobile Documents/com~apple~CloudDocs/_blank_.md index 6a23f9455..06c937b02 100644 --- a/tests/fixtures/Library/Mobile Documents/com~apple~CloudDocs/_blank_.md +++ b/tests/fixtures/Library/Mobile Documents/com~apple~CloudDocs/_blank_.md @@ -1 +1 @@ -Blank file for git sync \ No newline at end of file +Blank file for git sync From 4cc65991a28435900a15602e483db0c421e331ac Mon Sep 17 00:00:00 2001 From: Mariano Mollo Date: Mon, 7 Nov 2022 13:50:56 +0100 Subject: [PATCH 358/406] Add support for Logseq (#1876) * Add support for Logseq in README * Update CHANGELOG.md * Add files via upload --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/logseq.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/logseq.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 420d47bd1..0dc7722d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Fixed support for LunarVim (via @YiGeon) +- Added support for Logseq (via @visika) ## Mackup 0.8.36 diff --git a/README.md b/README.md index cbe0d9ce9..8a7460d89 100644 --- a/README.md +++ b/README.md @@ -428,6 +428,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [LittleSnitch](http://www.obdev.at/products/littlesnitch/) - [Livestreamer](http://livestreamer.tanuki.se/) - [Logitech Options](https://www.logitech.com/en-us/product/options) +- [Logseq](https://logseq.com/) - [Lollypop](https://gnumdk.github.io/lollypop-web/) - [Loopback](https://rogueamoeba.com/loopback/) - [Luftrausers](http://luftrausers.com) diff --git a/mackup/applications/logseq.cfg b/mackup/applications/logseq.cfg new file mode 100644 index 000000000..aaf5b8ce7 --- /dev/null +++ b/mackup/applications/logseq.cfg @@ -0,0 +1,5 @@ +[application] +name = Logseq + +[configuration_files] +.logseq From 2ea9df6ea4da92d02a637f5d928bfcbccecf8d49 Mon Sep 17 00:00:00 2001 From: Mariano Mollo Date: Mon, 7 Nov 2022 13:54:06 +0100 Subject: [PATCH 359/406] Add support for PrusaSlicer (#1874) * Add support for PrusaSlicer * Add support for PrusaSlicer in README * Update CHANGELOG.md * add newline Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/prusa-slicer.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/prusa-slicer.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dc7722d4..d12100258 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Fixed support for LunarVim (via @YiGeon) +- Added support for PrusaSlicer (via @visika) - Added support for Logseq (via @visika) ## Mackup 0.8.36 diff --git a/README.md b/README.md index 8a7460d89..33ccbb504 100644 --- a/README.md +++ b/README.md @@ -545,6 +545,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [ProxyChains NG](http://sourceforge.net/projects/proxychains-ng/) - [ProxyChains](http://proxychains.sourceforge.net) - [Proxyman](https://proxyman.io) +- [PrusaSlicer](https://www.prusa3d.com/prusaslicer/) - [PsySH](https://psysh.org/) - [Punto Switcher](https://punto.yandex.ru/) - [PyCharm](https://www.jetbrains.com/pycharm/) diff --git a/mackup/applications/prusa-slicer.cfg b/mackup/applications/prusa-slicer.cfg new file mode 100644 index 000000000..f388c1c22 --- /dev/null +++ b/mackup/applications/prusa-slicer.cfg @@ -0,0 +1,5 @@ +[application] +name = PrusaSlicer + +[xdg_configuration_files] +PrusaSlicer From b6f4e7a44538c6c570cee266f21214f749cf69f2 Mon Sep 17 00:00:00 2001 From: Josh Medeski Date: Thu, 17 Nov 2022 10:59:11 -0600 Subject: [PATCH 360/406] Update caffeine (#1879) * feat: add intelliscapesolutions location for caffeine plist config file * docs: update changelog Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/caffeine.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d12100258..758486c0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Fixed support for LunarVim (via @YiGeon) +- Updated support for Caffeine (via @joshmedeski) - Added support for PrusaSlicer (via @visika) - Added support for Logseq (via @visika) diff --git a/mackup/applications/caffeine.cfg b/mackup/applications/caffeine.cfg index ff5a7fee6..a7a5ab7b6 100644 --- a/mackup/applications/caffeine.cfg +++ b/mackup/applications/caffeine.cfg @@ -3,3 +3,4 @@ name = Caffeine [configuration_files] Library/Preferences/com.lightheadsw.Caffeine.plist +Library/Preferences/com.intelliscapesolutions.caffeine.plist From 319c02eb05996b59fab6bdb9a31cdeb55832cb5f Mon Sep 17 00:00:00 2001 From: SwordHeart <37992593+zxjlm@users.noreply.github.com> Date: Fri, 18 Nov 2022 11:14:43 +0800 Subject: [PATCH 361/406] Add Switchhosts (#1877) * feat: add switchhosts config * docs: update docs related * fix: lint cfg file Co-authored-by: xinjian.zhang Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/switchhosts.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/switchhosts.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 758486c0e..fdba9f0ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Updated support for Caffeine (via @joshmedeski) - Added support for PrusaSlicer (via @visika) - Added support for Logseq (via @visika) +- Added support for SwitchHosts (via @zxjlm) ## Mackup 0.8.36 diff --git a/README.md b/README.md index 33ccbb504..0c33dba51 100644 --- a/README.md +++ b/README.md @@ -635,6 +635,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Sway](https://swaywm.org/) - [Swinsian](http://swinsian.com/) - [Swish](https://highlyopinionated.co/swish/) +- [SwitchHosts](https://github.com/oldj/SwitchHosts) - [T](http://sferik.github.io/t/) - [TablePlus](https://tableplus.io) - [TaskPaper](https://www.taskpaper.com) diff --git a/mackup/applications/switchhosts.cfg b/mackup/applications/switchhosts.cfg new file mode 100644 index 000000000..d88b7c9fe --- /dev/null +++ b/mackup/applications/switchhosts.cfg @@ -0,0 +1,5 @@ +[application] +name = SwitchHosts + +[configuration_files] +.SwitchHosts/data/collection/hosts From a82fb4b74440523c37480766b2603789242f3718 Mon Sep 17 00:00:00 2001 From: Michael Bianco Date: Tue, 22 Nov 2022 06:18:56 -0700 Subject: [PATCH 362/406] add activitywatch (#1889) * add activitywatch * readme + changelog --- CHANGELOG.md | 1 + README.md | 3 ++- mackup/applications/activitywatch.cfg | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 mackup/applications/activitywatch.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index fdba9f0ad..b862c8303 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Added support for ActivityWatch (via @YiGeon) - Fixed support for LunarVim (via @YiGeon) - Updated support for Caffeine (via @joshmedeski) - Added support for PrusaSlicer (via @visika) diff --git a/README.md b/README.md index 0c33dba51..9edaded74 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Keep your application settings in sync. - [Unsupported Storages](#unsupported-storages) - [Supported Applications](#supported-applications) - [Can you support application X](#can-you-support-application-x) - - [Personalization & configuration](#personalization--configuration) + - [Personalization \& configuration](#personalization--configuration) - [Why did you do this](#why-did-you-do-this) - [What platforms are supported](#what-platforms-are-supported) - [What's up with the weird name](#whats-up-with-the-weird-name) @@ -209,6 +209,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Autokey](https://code.google.com/p/autokey/) - [Awareness](http://iamfutureproof.com/tools/awareness/) - [AWS Command Line Interface](https://aws.amazon.com/cli/) +- [ActivityWatch](http://activitywatch.net/) - [Bartender](http://www.macbartender.com/) - [Bash it](https://github.com/Bash-it/bash-it) - [Bash](http://www.gnu.org/software/bash/) diff --git a/mackup/applications/activitywatch.cfg b/mackup/applications/activitywatch.cfg new file mode 100644 index 000000000..01d57f2df --- /dev/null +++ b/mackup/applications/activitywatch.cfg @@ -0,0 +1,5 @@ +[application] +name = Activity Watch + +[configuration_files] +Library/Application Support/activitywatch From b1e1159b87d206b05dd6db684fe4de677679819c Mon Sep 17 00:00:00 2001 From: Michael Bianco Date: Tue, 22 Nov 2022 06:22:18 -0700 Subject: [PATCH 363/406] add base (#1888) * Adding base configuration * readme + changelog Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/base.cfg | 7 +++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/base.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b862c8303..a50b6468a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Fixed support for Base (via @iloveitaly) - Added support for ActivityWatch (via @YiGeon) - Fixed support for LunarVim (via @YiGeon) - Updated support for Caffeine (via @joshmedeski) diff --git a/README.md b/README.md index 9edaded74..1ff46ee6c 100644 --- a/README.md +++ b/README.md @@ -213,6 +213,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Bartender](http://www.macbartender.com/) - [Bash it](https://github.com/Bash-it/bash-it) - [Bash](http://www.gnu.org/software/bash/) +- [Base](https://menial.co.uk/base/) - [Bat](https://github.com/sharkdp/bat) - [Bc](https://www.gnu.org/software/bc/) - [Beatport Pro](https://www.beatport.com/desktop) diff --git a/mackup/applications/base.cfg b/mackup/applications/base.cfg new file mode 100644 index 000000000..7c6fb2c42 --- /dev/null +++ b/mackup/applications/base.cfg @@ -0,0 +1,7 @@ +[application] +name = Base + +[configuration_files] +Library/Containers/uk.co.menial.Base/Data/Library/Preferences/uk.co.menial.Base.plist +# contains license and preference state +Library/Containers/uk.co.menial.Base/Data/Library/Application Support/Base/ From 4818942cee385b699fac659f56948be9f4ce5afd Mon Sep 17 00:00:00 2001 From: Csaba Endre Simon Date: Tue, 22 Nov 2022 14:24:36 +0100 Subject: [PATCH 364/406] Fix LunarVim 1.2 config path (#1887) Co-authored-by: Csaba Endre Simon Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/lunarvim.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a50b6468a..48022423c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Fixed support for LunarVim 1.2 (via @secsaba) - Fixed support for Base (via @iloveitaly) - Added support for ActivityWatch (via @YiGeon) - Fixed support for LunarVim (via @YiGeon) diff --git a/mackup/applications/lunarvim.cfg b/mackup/applications/lunarvim.cfg index 58354eb21..9cd77d474 100644 --- a/mackup/applications/lunarvim.cfg +++ b/mackup/applications/lunarvim.cfg @@ -2,4 +2,4 @@ name = LunarVim [xdg_configuration_files] -lvim +lvim/config.lua From 736c9975bf6f35fb52e5b14ef6cf72802356c760 Mon Sep 17 00:00:00 2001 From: Michael Bianco Date: Wed, 23 Nov 2022 10:42:18 -0700 Subject: [PATCH 365/406] support for stats (#1884) * add support for stats * readme and changelog * alpha sort fix Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/stats.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/stats.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 48022423c..cc92d899e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for Stats (via @iloveitaly) - Fixed support for LunarVim 1.2 (via @secsaba) - Fixed support for Base (via @iloveitaly) - Added support for ActivityWatch (via @YiGeon) diff --git a/README.md b/README.md index 1ff46ee6c..82a5ad83e 100644 --- a/README.md +++ b/README.md @@ -627,6 +627,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Starship](https://starship.rs/) - [Startupizer2](http://appledoc.gentlebytes.com/startupizer/) - [Stata](http://www.stata.com/) +- [Stats](https://github.com/exelban/stats) - [Stay](https://cordlessdog.com/stay/) - [Storyist](http://storyist.com/) - [Sublime Merge](https://www.sublimemerge.com/) diff --git a/mackup/applications/stats.cfg b/mackup/applications/stats.cfg new file mode 100644 index 000000000..8f8820ecf --- /dev/null +++ b/mackup/applications/stats.cfg @@ -0,0 +1,5 @@ +[application] +name = Stats + +[configuration_files] +Library/Preferences/eu.exelban.Stats.plist From ea7b23129eb9a333b832e8c153ec42d9346f3b35 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Fri, 24 Mar 2023 17:26:07 +0100 Subject: [PATCH 366/406] Black fixes (#1912) --- mackup/application.py | 2 -- mackup/main.py | 1 - 2 files changed, 3 deletions(-) diff --git a/mackup/application.py b/mackup/application.py index 7ed410e24..7e7522dc2 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -72,7 +72,6 @@ def backup(self): and (os.path.isfile(mackup_filepath) or os.path.isdir(mackup_filepath)) and os.path.samefile(home_filepath, mackup_filepath) ): - if self.verbose: print( "Backing up\n {}\n to\n {} ...".format( @@ -87,7 +86,6 @@ def backup(self): # Check if we already have a backup if os.path.exists(mackup_filepath): - # Name it right if os.path.isfile(mackup_filepath): file_type = "file" diff --git a/mackup/main.py b/mackup/main.py index 9e55fba3f..198ac2563 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -132,7 +132,6 @@ def printAppHeader(app_name): "Are you sure?" ) ): - # Uninstall the apps except Mackup, which we'll uninstall last, to # keep the settings as long as possible app_names = mckp.get_apps_to_backup() From fe19b9a956c5a5af1810bfca792445b359683465 Mon Sep 17 00:00:00 2001 From: Jan <43933988+pesonn@users.noreply.github.com> Date: Fri, 24 Mar 2023 17:30:29 +0100 Subject: [PATCH 367/406] Add support for TablePlus Favorites (#1908) * feat(tableplus): add support for tableplus favorites to backup query favorites https://docs.tableplus.com/query-editor/query-history#save-to-favorite * Let's keep the list AZ ordered --------- Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/tableplus.cfg | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc92d899e..d1b415f54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Added support for PrusaSlicer (via @visika) - Added support for Logseq (via @visika) - Added support for SwitchHosts (via @zxjlm) +- Added support for TablePlus Favorites (via @pesonn) ## Mackup 0.8.36 diff --git a/mackup/applications/tableplus.cfg b/mackup/applications/tableplus.cfg index 3a1e5c956..3a35979d3 100644 --- a/mackup/applications/tableplus.cfg +++ b/mackup/applications/tableplus.cfg @@ -2,7 +2,8 @@ name = TablePlus [configuration_files] +Library/Application Support/com.tinyapp.TablePlus/Cache/Favorite +Library/Application Support/com.tinyapp.TablePlus/Cache/History Library/Application Support/com.tinyapp.TablePlus/Data Library/Application Support/com.tinyapp.TablePlus/Plugins Library/Preferences/com.tinyapp.TablePlus.plist -Library/Application Support/com.tinyapp.TablePlus/Cache/History From 0cd6ded2869d3104fe0f3407b6779b484f598344 Mon Sep 17 00:00:00 2001 From: Wxh16144 Date: Sat, 25 Mar 2023 00:32:31 +0800 Subject: [PATCH 368/406] Add support for ni (#1909) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/ni.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/ni.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index d1b415f54..67bf92482 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Added support for PrusaSlicer (via @visika) - Added support for Logseq (via @visika) - Added support for SwitchHosts (via @zxjlm) +- Add support for ni (via @wxh16144) - Added support for TablePlus Favorites (via @pesonn) ## Mackup 0.8.36 diff --git a/README.md b/README.md index 82a5ad83e..bd1f02735 100644 --- a/README.md +++ b/README.md @@ -489,6 +489,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Netlify](https://www.netlify.com/) - [newsbeuter](http://newsbeuter.org/) - [ngrok](https://ngrok.com/) +- [ni](https://github.com/antfu/ni/) - [Nomacs](http://nomacs.org/) - [NoSQLBooster for MongoDB](https://www.nosqlbooster.com/) - [notion-enhancer](https://notion-enhancer.github.io/) diff --git a/mackup/applications/ni.cfg b/mackup/applications/ni.cfg new file mode 100644 index 000000000..fb635404d --- /dev/null +++ b/mackup/applications/ni.cfg @@ -0,0 +1,5 @@ +[application] +name = ni + +[configuration_files] +.nirc From 39463904e10ec2234239f68ad5a9cc152e350992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Harper?= Date: Fri, 24 Mar 2023 12:34:40 -0400 Subject: [PATCH 369/406] add support for Elgato StreamDeck (close #1667) (#1907) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 3 ++- README.md | 1 + mackup/applications/streamdeck.cfg | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 mackup/applications/streamdeck.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 67bf92482..9a861a6d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,8 @@ - Added support for PrusaSlicer (via @visika) - Added support for Logseq (via @visika) - Added support for SwitchHosts (via @zxjlm) -- Add support for ni (via @wxh16144) +- Added support for Elgato StreamDeck (via @fharper) +- Added support for ni (via @wxh16144) - Added support for TablePlus Favorites (via @pesonn) ## Mackup 0.8.36 diff --git a/README.md b/README.md index bd1f02735..f045ffdc3 100644 --- a/README.md +++ b/README.md @@ -298,6 +298,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Eagle (ogdesign)](https://eagle.cool/) - [EditorConfig](http://editorconfig.org/) - [Electrum](https://electrum.org/#home) +- [Elgato StreamDeck](https://www.elgato.com/en/welcome-to-stream-deck) - [Emacs](http://www.gnu.org/software/emacs/) - [Enjoyable](https://yukkurigames.com/enjoyable/) - [Environmental Station Alpha](http://www.hempuli.com/esa/) diff --git a/mackup/applications/streamdeck.cfg b/mackup/applications/streamdeck.cfg new file mode 100644 index 000000000..41436f081 --- /dev/null +++ b/mackup/applications/streamdeck.cfg @@ -0,0 +1,5 @@ +[application] +name = Elgato StreamDeck + +[configuration_files] +Library/Application Support/com.elgato.StreamDeck From 5058bea86238971f0ed7e80135aadbf5d4c9ab6c Mon Sep 17 00:00:00 2001 From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com> Date: Fri, 24 Mar 2023 09:37:10 -0700 Subject: [PATCH 370/406] Include new Amethyst config file location (#1906) * Include new Amethyst config file * changlog * Use a xdg_configuration_files section --------- Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/amethyst.cfg | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a861a6d0..f5029f247 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Added support for PrusaSlicer (via @visika) - Added support for Logseq (via @visika) - Added support for SwitchHosts (via @zxjlm) +- Update support for Amethyst (via @max-sixty) - Added support for Elgato StreamDeck (via @fharper) - Added support for ni (via @wxh16144) - Added support for TablePlus Favorites (via @pesonn) diff --git a/mackup/applications/amethyst.cfg b/mackup/applications/amethyst.cfg index 3865d6649..87b1798cd 100644 --- a/mackup/applications/amethyst.cfg +++ b/mackup/applications/amethyst.cfg @@ -3,3 +3,6 @@ name = Amethyst [configuration_files] Library/Preferences/com.amethyst.Amethyst.plist + +[xdg_configuration_files] +amethyst/amethyst.yml From 74adda995e55170b6a815f01444ea3d9af504c14 Mon Sep 17 00:00:00 2001 From: G Date: Sat, 25 Mar 2023 00:39:07 +0800 Subject: [PATCH 371/406] Add scrolla (#1902) * add Scrolla * add Scrolla to README * add Scrolla in CHANGELOG --------- Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/scrolla.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/scrolla.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index f5029f247..2eb28466d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Added support for PrusaSlicer (via @visika) - Added support for Logseq (via @visika) - Added support for SwitchHosts (via @zxjlm) +- Added support for Scrolla (via @godbout) - Update support for Amethyst (via @max-sixty) - Added support for Elgato StreamDeck (via @fharper) - Added support for ni (via @wxh16144) diff --git a/README.md b/README.md index f045ffdc3..c806565cd 100644 --- a/README.md +++ b/README.md @@ -594,6 +594,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Screenhero](https://screenhero.com) - [Scrivener](http://www.literatureandlatte.com/scrivener.php) - [Scroll Reverser](https://pilotmoon.com/scrollreverser/) +- [Scrolla](https://scrolla.app) - [SecureCRT](https://www.vandyke.com/products/securecrt/) - [Secure Pipes](http://www.opoet.com/) - [Seil](https://pqrs.org/osx/karabiner/seil.html.en) diff --git a/mackup/applications/scrolla.cfg b/mackup/applications/scrolla.cfg new file mode 100644 index 000000000..b6dc0cf8a --- /dev/null +++ b/mackup/applications/scrolla.cfg @@ -0,0 +1,5 @@ +[application] +name = Scrolla + +[configuration_files] +Library/Preferences/mo.com.sleeplessmind.Scrolla.plist From ae2ac505e99fa688823a7de34556fee093ebb907 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Mar 2023 16:42:32 +0000 Subject: [PATCH 372/406] Bump certifi from 2021.10.8 to 2022.12.7 (#1895) Bumps [certifi](https://github.com/certifi/python-certifi) from 2021.10.8 to 2022.12.7. - [Release notes](https://github.com/certifi/python-certifi/releases) - [Commits](https://github.com/certifi/python-certifi/compare/2021.10.08...2022.12.07) --- updated-dependencies: - dependency-name: certifi dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Laurent Raufaste --- Pipfile.lock | 265 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 196 insertions(+), 69 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 7d979236a..45d9eae77 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -33,34 +33,104 @@ "develop": { "bleach": { "hashes": [ - "sha256:0900d8b37eba61a802ee40ac0061f8c2b5dee29c1927dd1d233e075ebf5a71da", - "sha256:4d2651ab93271d1129ac9cbc679f524565cc8a1b791909c4a51eac4446a15994" + "sha256:085f7f33c15bd408dd9b17a4ad77c577db66d76203e5984b1bd59baeee948b2a", + "sha256:0d03255c47eb9bd2f26aa9bb7f2107732e7e8fe195ca2f64709fcf3b0a4a085c" ], - "markers": "python_version >= '3.6'", - "version": "==4.1.0" + "markers": "python_version >= '3.7'", + "version": "==5.0.1" }, "certifi": { "hashes": [ - "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872", - "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569" + "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3", + "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18" + ], + "index": "pypi", + "version": "==2022.12.7" + }, + "cffi": { + "hashes": [ + "sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5", + "sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef", + "sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104", + "sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426", + "sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405", + "sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375", + "sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a", + "sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e", + "sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc", + "sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf", + "sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185", + "sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497", + "sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3", + "sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35", + "sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c", + "sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83", + "sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21", + "sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca", + "sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984", + "sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac", + "sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd", + "sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee", + "sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a", + "sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2", + "sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192", + "sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7", + "sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585", + "sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f", + "sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e", + "sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27", + "sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b", + "sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e", + "sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e", + "sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d", + "sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c", + "sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415", + "sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82", + "sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02", + "sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314", + "sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325", + "sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c", + "sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3", + "sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914", + "sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045", + "sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d", + "sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9", + "sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5", + "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2", + "sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c", + "sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3", + "sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2", + "sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8", + "sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d", + "sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d", + "sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9", + "sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162", + "sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76", + "sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4", + "sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e", + "sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9", + "sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6", + "sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b", + "sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01", + "sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0" ], - "version": "==2021.10.8" + "version": "==1.15.1" }, "charset-normalizer": { "hashes": [ - "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597", - "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df" + "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845", + "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f" ], - "markers": "python_version >= '3'", - "version": "==2.0.12" + "markers": "python_version >= '3.6'", + "version": "==2.1.1" }, "colorama": { "hashes": [ - "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b", - "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2" + "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", + "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==0.4.4" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'", + "version": "==0.4.6" }, "coverage": { "hashes": [ @@ -109,37 +179,93 @@ "index": "pypi", "version": "==6.3.2" }, + "cryptography": { + "hashes": [ + "sha256:0e70da4bdff7601b0ef48e6348339e490ebfb0cbe638e083c9c41fb49f00c8bd", + "sha256:10652dd7282de17990b88679cb82f832752c4e8237f0c714be518044269415db", + "sha256:175c1a818b87c9ac80bb7377f5520b7f31b3ef2a0004e2420319beadedb67290", + "sha256:1d7e632804a248103b60b16fb145e8df0bc60eed790ece0d12efe8cd3f3e7744", + "sha256:1f13ddda26a04c06eb57119caf27a524ccae20533729f4b1e4a69b54e07035eb", + "sha256:2ec2a8714dd005949d4019195d72abed84198d877112abb5a27740e217e0ea8d", + "sha256:2fa36a7b2cc0998a3a4d5af26ccb6273f3df133d61da2ba13b3286261e7efb70", + "sha256:2fb481682873035600b5502f0015b664abc26466153fab5c6bc92c1ea69d478b", + "sha256:3178d46f363d4549b9a76264f41c6948752183b3f587666aff0555ac50fd7876", + "sha256:4367da5705922cf7070462e964f66e4ac24162e22ab0a2e9d31f1b270dd78083", + "sha256:4eb85075437f0b1fd8cd66c688469a0c4119e0ba855e3fef86691971b887caf6", + "sha256:50a1494ed0c3f5b4d07650a68cd6ca62efe8b596ce743a5c94403e6f11bf06c1", + "sha256:53049f3379ef05182864d13bb9686657659407148f901f3f1eee57a733fb4b00", + "sha256:6391e59ebe7c62d9902c24a4d8bcbc79a68e7c4ab65863536127c8a9cd94043b", + "sha256:67461b5ebca2e4c2ab991733f8ab637a7265bb582f07c7c88914b5afb88cb95b", + "sha256:78e47e28ddc4ace41dd38c42e6feecfdadf9c3be2af389abbfeef1ff06822285", + "sha256:80ca53981ceeb3241998443c4964a387771588c4e4a5d92735a493af868294f9", + "sha256:8a4b2bdb68a447fadebfd7d24855758fe2d6fecc7fed0b78d190b1af39a8e3b0", + "sha256:8e45653fb97eb2f20b8c96f9cd2b3a0654d742b47d638cf2897afbd97f80fa6d", + "sha256:998cd19189d8a747b226d24c0207fdaa1e6658a1d3f2494541cb9dfbf7dcb6d2", + "sha256:a10498349d4c8eab7357a8f9aa3463791292845b79597ad1b98a543686fb1ec8", + "sha256:b4cad0cea995af760f82820ab4ca54e5471fc782f70a007f31531957f43e9dee", + "sha256:bfe6472507986613dc6cc00b3d492b2f7564b02b3b3682d25ca7f40fa3fd321b", + "sha256:c9e0d79ee4c56d841bd4ac6e7697c8ff3c8d6da67379057f29e66acffcd1e9a7", + "sha256:ca57eb3ddaccd1112c18fc80abe41db443cc2e9dcb1917078e02dfa010a4f353", + "sha256:ce127dd0a6a0811c251a6cddd014d292728484e530d80e872ad9806cfb1c5b3c" + ], + "markers": "python_version >= '3.6'", + "version": "==38.0.4" + }, "docutils": { "hashes": [ - "sha256:23010f129180089fbcd3bc08cfefccb3b890b0050e1ca00c867036e9d161b98c", - "sha256:679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06" + "sha256:33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6", + "sha256:5e1de4d849fee02c63b040a4a3fd567f4ab104defd8a5511fbbc24a8a017efbc" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==0.18.1" + "markers": "python_version >= '3.7'", + "version": "==0.19" }, "idna": { "hashes": [ - "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff", - "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" + "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4", + "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2" ], - "markers": "python_version >= '3'", - "version": "==3.3" + "markers": "python_version >= '3.5'", + "version": "==3.4" }, "importlib-metadata": { "hashes": [ - "sha256:1208431ca90a8cca1a6b8af391bb53c1a2db74e5d1cef6ddced95d4b2062edc6", - "sha256:ea4c597ebf37142f827b8f39299579e31685c31d3a438b59f469406afd0f2539" + "sha256:d5059f9f1e8e41f80e9c56c2ee58811450c31984dfa625329ffd7c0dad88a73b", + "sha256:d84d17e21670ec07990e1044a99efe8d615d860fd176fc29ef5c306068fda313" ], "markers": "python_version >= '3.7'", - "version": "==4.11.3" + "version": "==5.1.0" + }, + "jaraco.classes": { + "hashes": [ + "sha256:2353de3288bc6b82120752201c6b1c1a14b058267fa424ed5ce5984e3b922158", + "sha256:89559fa5c1d3c34eff6f631ad80bb21f378dbcbb35dd161fd2c6b93f5be2f98a" + ], + "markers": "python_version >= '3.7'", + "version": "==3.2.3" + }, + "jeepney": { + "hashes": [ + "sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806", + "sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755" + ], + "markers": "sys_platform == 'linux'", + "version": "==0.8.0" }, "keyring": { "hashes": [ - "sha256:9012508e141a80bd1c0b6778d5c610dd9f8c464d75ac6774248500503f972fb9", - "sha256:b0d28928ac3ec8e42ef4cc227822647a19f1d544f21f96457965dc01cf555261" + "sha256:3dd30011d555f1345dec2c262f0153f2f0ca6bca041fb1dc4588349bb4c0ac1e", + "sha256:ad192263e2cdd5f12875dedc2da13534359a7e760e77f8d04b50968a821c2361" + ], + "markers": "python_version >= '3.7'", + "version": "==23.11.0" + }, + "more-itertools": { + "hashes": [ + "sha256:250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41", + "sha256:5a6257e40878ef0520b1803990e3e22303a41b5714006c32a3fd8304b26ea1ab" ], "markers": "python_version >= '3.7'", - "version": "==23.5.0" + "version": "==9.0.0" }, "nose-py3": { "hashes": [ @@ -175,59 +301,52 @@ "index": "pypi", "version": "==1.22.3" }, - "packaging": { + "pkginfo": { "hashes": [ - "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb", - "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522" + "sha256:ac03e37e4d601aaee40f8087f63fc4a2a6c9814dda2c8fa6aab1b1829653bdfa", + "sha256:d580059503f2f4549ad6e4c106d7437356dbd430e2c7df99ee1efe03d75f691e" ], "markers": "python_version >= '3.6'", - "version": "==21.3" + "version": "==1.9.2" }, - "pkginfo": { + "pycparser": { "hashes": [ - "sha256:542e0d0b6750e2e21c20179803e40ab50598d8066d51097a0e382cba9eb02bff", - "sha256:c24c487c6a7f72c66e816ab1796b96ac6c3d14d49338293d2141664330b55ffc" + "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9", + "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206" ], - "version": "==1.8.2" + "version": "==2.21" }, "pygments": { "hashes": [ - "sha256:44238f1b60a76d78fc8ca0528ee429702aae011c265fe6a8dd8b63049ae41c65", - "sha256:4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a" - ], - "markers": "python_version >= '3.5'", - "version": "==2.11.2" - }, - "pyparsing": { - "hashes": [ - "sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea", - "sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484" + "sha256:56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1", + "sha256:f643f331ab57ba3c9d89212ee4a2dabc6e94f117cf4eefde99a0574720d14c42" ], "markers": "python_version >= '3.6'", - "version": "==3.0.7" + "version": "==2.13.0" }, "readme-renderer": { "hashes": [ - "sha256:262510fe6aae81ed4e94d8b169077f325614c0b1a45916a80442c6576264a9c2", - "sha256:dfb4d17f21706d145f7473e0b61ca245ba58e810cf9b2209a48239677f82e5b0" + "sha256:cd653186dfc73055656f090f227f5cb22a046d7f71a841dfa305f55c9a513273", + "sha256:f67a16caedfa71eef48a31b39708637a6f4664c4394801a7b0d6432d13907343" ], - "markers": "python_version >= '3.6'", - "version": "==34.0" + "markers": "python_version >= '3.7'", + "version": "==37.3" }, "requests": { "hashes": [ - "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61", - "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d" + "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983", + "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", - "version": "==2.27.1" + "markers": "python_version >= '3.7' and python_version < '4'", + "version": "==2.28.1" }, "requests-toolbelt": { "hashes": [ - "sha256:380606e1d10dc85c3bd47bf5a6095f815ec007be7a8b69c878507068df059e6f", - "sha256:968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0" + "sha256:18565aa58116d9951ac39baa288d3adb5b3ff975c4f25eee78555d89e8f247f7", + "sha256:62e09f7ff5ccbda92772a29f394a49c3ad6cb181d568b1337626b2abb628a63d" ], - "version": "==0.9.1" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==0.10.1" }, "rfc3986": { "hashes": [ @@ -237,6 +356,14 @@ "markers": "python_version >= '3.7'", "version": "==2.0.0" }, + "secretstorage": { + "hashes": [ + "sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77", + "sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99" + ], + "markers": "sys_platform == 'linux'", + "version": "==3.3.3" + }, "six": { "hashes": [ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", @@ -247,11 +374,11 @@ }, "tqdm": { "hashes": [ - "sha256:4230a49119a416c88cc47d0d2d32d5d90f1a282d5e497d49801950704e49863d", - "sha256:6461b009d6792008d0000e1b0c7ca50195ec78c0e808a3a6b668a56a3236c3a5" + "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4", + "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==4.63.1" + "version": "==4.64.1" }, "twine": { "hashes": [ @@ -263,11 +390,11 @@ }, "urllib3": { "hashes": [ - "sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14", - "sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e" + "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc", + "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", - "version": "==1.26.9" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", + "version": "==1.26.13" }, "webencodings": { "hashes": [ @@ -278,11 +405,11 @@ }, "zipp": { "hashes": [ - "sha256:9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d", - "sha256:b47250dd24f92b7dd6a0a8fc5244da14608f3ca90a5efcd37a3b1642fac9a375" + "sha256:83a28fcb75844b5c0cdaf5aa4003c2d728c77e05f5aeabe8e95e56727005fbaa", + "sha256:a7a22e05929290a67401440b39690ae6563279bced5f314609d9d03798f56766" ], "markers": "python_version >= '3.7'", - "version": "==3.7.0" + "version": "==3.11.0" } } } From c88ea46c7097ffcd764f8c18a658d2e2d84fdda8 Mon Sep 17 00:00:00 2001 From: G Date: Sat, 25 Mar 2023 00:46:16 +0800 Subject: [PATCH 373/406] add Wooshy (#1901) * add Wooshy * add Wooshy to list of supported apps * add Wooshy in CHANGELOG --------- Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/wooshy.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/wooshy.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 2eb28466d..9576cce09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Added support for PrusaSlicer (via @visika) - Added support for Logseq (via @visika) - Added support for SwitchHosts (via @zxjlm) +- Added support for Wooshy (via @godbout) - Added support for Scrolla (via @godbout) - Update support for Amethyst (via @max-sixty) - Added support for Elgato StreamDeck (via @fharper) diff --git a/README.md b/README.md index c806565cd..feab0e78e 100644 --- a/README.md +++ b/README.md @@ -697,6 +697,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [WhatsApp Web](https://web.whatsapp.com/) - [Wireshark 2](https://www.wireshark.org) - [Witch](http://manytricks.com/witch/) +- [Wooshy](https://wooshy.app) - [WordGrinder](https://cowlark.com/wordgrinder/) - [WordPress WP-CLI](http://wp-cli.org/) - [Workrave](http://www.workrave.org/) diff --git a/mackup/applications/wooshy.cfg b/mackup/applications/wooshy.cfg new file mode 100644 index 000000000..4274f6499 --- /dev/null +++ b/mackup/applications/wooshy.cfg @@ -0,0 +1,5 @@ +[application] +name = Wooshy + +[configuration_files] +Library/Preferences/mo.com.sleeplessmind.Wooshy.plist From 36b91cdfd42c7d72a181d19c1690ffd6329d04e9 Mon Sep 17 00:00:00 2001 From: Michael Bianco Date: Fri, 24 Mar 2023 10:49:37 -0600 Subject: [PATCH 374/406] support zoom (#1883) * add support for zoom * changelog and readme * sort fix * Update CHANGELOG.md * Let's not takeover thanks ;) --------- Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/zoom.cfg | 9 +++++++++ 3 files changed, 11 insertions(+) create mode 100644 mackup/applications/zoom.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 9576cce09..e2cbc7c47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Fixed support for LunarVim 1.2 (via @secsaba) - Fixed support for Base (via @iloveitaly) - Added support for ActivityWatch (via @YiGeon) +- Added support for Zoom (via @iloveitaly) - Fixed support for LunarVim (via @YiGeon) - Updated support for Caffeine (via @joshmedeski) - Added support for PrusaSlicer (via @visika) diff --git a/README.md b/README.md index feab0e78e..6ff80d9f1 100644 --- a/README.md +++ b/README.md @@ -717,6 +717,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Yummy FTP](http://www.yummysoftware.com/) - [zabbix-cli](https://github.com/usit-gd/zabbix-cli) - [zathura](https://pwmt.org/projects/zathura/) +- [Zoom](http://zoom.com/) - [zoxide](https://github.com/ajeetdsouza/zoxide) - [Zsh](http://zsh.sourceforge.net/) - [Übersicht](http://tracesof.net/uebersicht/) diff --git a/mackup/applications/zoom.cfg b/mackup/applications/zoom.cfg new file mode 100644 index 000000000..2d973a86e --- /dev/null +++ b/mackup/applications/zoom.cfg @@ -0,0 +1,9 @@ +[application] +name = Zoom + +[configuration_files] +Library/Preferences/us.zoom.Transcode.plist +Library/Preferences/us.zoom.xos.Hotkey.plist +Library/Preferences/us.zoom.xos.plist +Library/Preferences/us.zoom.ZoomAutoUpdater.plist +Library/Preferences/ZoomChat.plist From c010c42b803fbaef35dc52444e91929a36c2076b Mon Sep 17 00:00:00 2001 From: Drallas <24792888+Drallas@users.noreply.github.com> Date: Fri, 24 Mar 2023 17:54:41 +0100 Subject: [PATCH 375/406] Added support for Warp Terminal App (#1900) * Create warp.cfg * Delete warp.cfg * Create warp.cfg Adding config file for Warp Terminal application * Added Warp * Added Wip for Warp * Added location iCloud storage Added location for iCloud storage, since it was missing. * Missing newline --------- Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + doc/README.md | 3 +++ mackup/applications/warp.cfg | 5 +++++ 4 files changed, 10 insertions(+) create mode 100644 mackup/applications/warp.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e2cbc7c47..5a5b37acd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for PrusaSlicer (via @visika) - Added support for Logseq (via @visika) - Added support for SwitchHosts (via @zxjlm) +- Added support for Warp (via @drallas) - Added support for Wooshy (via @godbout) - Added support for Scrolla (via @godbout) - Update support for Amethyst (via @max-sixty) diff --git a/README.md b/README.md index 6ff80d9f1..051e73c14 100644 --- a/README.md +++ b/README.md @@ -691,6 +691,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [VLC](http://www.videolan.org/) - [Volt](https://github.com/vim-volt/volt) - [Wakatime](https://wakatime.com/) +- [Warp](https://www.warp.dev) - [waybar](https://github.com/Alexays/Waybar) - [WebStorm](https://www.jetbrains.com/webstorm/) - [Wget](https://www.gnu.org/software/wget/) diff --git a/doc/README.md b/doc/README.md index 405e08b6f..d1aa0f600 100644 --- a/doc/README.md +++ b/doc/README.md @@ -39,6 +39,9 @@ engine = google_drive ### iCloud +If you choose the `iCloud` storage engine, Mackup will store store your +configuration files in the `~/Library/Mobile\ Documents/com\~apple\~CloudDocs/` folder. + ```ini [storage] engine = icloud diff --git a/mackup/applications/warp.cfg b/mackup/applications/warp.cfg new file mode 100644 index 000000000..039e843ce --- /dev/null +++ b/mackup/applications/warp.cfg @@ -0,0 +1,5 @@ +[application] +name = Warp + +[configuration_files] +.warp From 572ed7690556bce3223bf960c073d383ae3965df Mon Sep 17 00:00:00 2001 From: Grigorii Horos <4980269+grigorii-horos@users.noreply.github.com> Date: Fri, 24 Mar 2023 17:57:08 +0100 Subject: [PATCH 376/406] Add support for Termux, Rust, update Bat config (#1896) * Add support for Termux, Rust, update Bat config * Update CHANGELOG.md * Remove new line --- CHANGELOG.md | 3 +++ README.md | 2 ++ mackup/applications/bat.cfg | 2 ++ mackup/applications/rust.cfg | 5 +++++ mackup/applications/termux.cfg | 7 +++++++ 5 files changed, 19 insertions(+) create mode 100644 mackup/applications/rust.cfg create mode 100644 mackup/applications/termux.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a5b37acd..a434221df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## WIP +- Fixed support for Bat (via @grigorii-horos) +- Add support for Rust (via @grigorii-horos) +- Add support for Termux (via @grigorii-horos) - Add support for Stats (via @iloveitaly) - Fixed support for LunarVim 1.2 (via @secsaba) - Fixed support for Base (via @iloveitaly) diff --git a/README.md b/README.md index 051e73c14..c2ac68c3c 100644 --- a/README.md +++ b/README.md @@ -585,6 +585,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Ruby Version](https://gist.github.com/fnichol/1912050) - [Ruby](https://www.ruby-lang.org/) - [RubyMine](http://www.jetbrains.com/ruby/) +- [Rust](https://www.rust-lang.org/) - [S3cmd](http://s3tools.org/s3cmd) - [SABnzbd](http://sabnzbd.org/) - [SBCL](http://www.sbcl.org/) @@ -651,6 +652,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Terminal](http://www.apple.com/osx/apps/) - [Terminator](https://launchpad.net/terminator/) - [termite](https://github.com/thestinger/termite) +- [Termux](https://termux.dev/) - [TextExpander](https://smilesoftware.com/textexpander) - [TextMate](http://macromates.com/) - [Textual](http://www.codeux.com/textual/) diff --git a/mackup/applications/bat.cfg b/mackup/applications/bat.cfg index 915e9b915..a54e7f761 100644 --- a/mackup/applications/bat.cfg +++ b/mackup/applications/bat.cfg @@ -3,3 +3,5 @@ name = Bat [xdg_configuration_files] bat/config +bat/syntaxes +bat/themes diff --git a/mackup/applications/rust.cfg b/mackup/applications/rust.cfg new file mode 100644 index 000000000..feea6e031 --- /dev/null +++ b/mackup/applications/rust.cfg @@ -0,0 +1,5 @@ +[application] +name = Rust + +[configuration_files] +.cargo/config diff --git a/mackup/applications/termux.cfg b/mackup/applications/termux.cfg new file mode 100644 index 000000000..e70ef49b8 --- /dev/null +++ b/mackup/applications/termux.cfg @@ -0,0 +1,7 @@ +[application] +name = Configuration for Termux + +[configuration_files] +.termux/colors.properties +.termux/termux.properties +.termux/font.ttf From c0f1def8f33d686778f479ba97dbf02ac81214fe Mon Sep 17 00:00:00 2001 From: Barry Date: Sat, 25 Mar 2023 01:00:25 +0800 Subject: [PATCH 377/406] docker config migrated (#1597) * add yarn support * docker config migrated ~/.dockercfg migrated to ~/.docker/config.json docker => ~/.docker/config.json dockerd => ~/.docker/daemon.json --------- Co-authored-by: Laurent Raufaste --- mackup/applications/docker.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/docker.cfg b/mackup/applications/docker.cfg index d4fc84ce9..eeb9705ff 100644 --- a/mackup/applications/docker.cfg +++ b/mackup/applications/docker.cfg @@ -2,5 +2,5 @@ name = Docker [configuration_files] -.dockercfg .docker/config.json +.docker/daemon.json From c663b589a15eb0068088c9e74c10a0c22e2093c1 Mon Sep 17 00:00:00 2001 From: Michael Bianco Date: Fri, 24 Mar 2023 11:03:06 -0600 Subject: [PATCH 378/406] support macos preview (#1881) * macos preview support syncs signatures * readme + changelog * AZ order --------- Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/preview.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/preview.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index a434221df..c2c27b77d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for macOS Preview (via @iloveitaly) - Fixed support for Bat (via @grigorii-horos) - Add support for Rust (via @grigorii-horos) - Add support for Termux (via @grigorii-horos) diff --git a/README.md b/README.md index c2ac68c3c..c51eacc68 100644 --- a/README.md +++ b/README.md @@ -438,6 +438,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [LunarVim](https://www.lunarvim.org/) - [MacDive](http://www.mac-dive.com/) - [MacDown](http://macdown.uranusjr.com/) +- macOS Preview - [MacOSX](http://www.apple.com/osx/) - [MacVim](https://github.com/macvim-dev/macvim) - [Magic Launch](https://www.oneperiodic.com/products/magiclaunch/) diff --git a/mackup/applications/preview.cfg b/mackup/applications/preview.cfg new file mode 100644 index 000000000..289c0152a --- /dev/null +++ b/mackup/applications/preview.cfg @@ -0,0 +1,6 @@ +[application] +name = Preview + +# https://apple.stackexchange.com/questions/74950/can-i-export-my-signature-from-preview-on-one-mac-and-import-it-on-another +[configuration_files] +Library/Group Containers/com.apple.PreviewLegacySignaturesConversion/Library/Preferences From 6e2a6a73469bb082e5016959701661ea99b8c028 Mon Sep 17 00:00:00 2001 From: Michael Bianco Date: Fri, 24 Mar 2023 11:05:05 -0600 Subject: [PATCH 379/406] add dozer support (#1880) * Add support for dozer * readme update * Sort fix --------- Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 11 ++++++----- README.md | 1 + mackup/applications/dozer.cfg | 5 +++++ 3 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 mackup/applications/dozer.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index c2c27b77d..106063e16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,14 +2,15 @@ ## WIP -- Add support for macOS Preview (via @iloveitaly) +- Added support for macOS Preview (via @iloveitaly) - Fixed support for Bat (via @grigorii-horos) -- Add support for Rust (via @grigorii-horos) -- Add support for Termux (via @grigorii-horos) -- Add support for Stats (via @iloveitaly) +- Added support for Rust (via @grigorii-horos) +- Added support for Termux (via @grigorii-horos) +- Added support for Stats (via @iloveitaly) - Fixed support for LunarVim 1.2 (via @secsaba) - Fixed support for Base (via @iloveitaly) - Added support for ActivityWatch (via @YiGeon) +- Added support for dozer (via @iloveitaly) - Added support for Zoom (via @iloveitaly) - Fixed support for LunarVim (via @YiGeon) - Updated support for Caffeine (via @joshmedeski) @@ -19,7 +20,7 @@ - Added support for Warp (via @drallas) - Added support for Wooshy (via @godbout) - Added support for Scrolla (via @godbout) -- Update support for Amethyst (via @max-sixty) +- Updated support for Amethyst (via @max-sixty) - Added support for Elgato StreamDeck (via @fharper) - Added support for ni (via @wxh16144) - Added support for TablePlus Favorites (via @pesonn) diff --git a/README.md b/README.md index c51eacc68..89ef98250 100644 --- a/README.md +++ b/README.md @@ -291,6 +291,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Doom Emacs](https://github.com/hlissner/doom-emacs) - [Double Commander](http://doublecmd.sourceforge.net/) - [Doxie](http://www.getdoxie.com/) +- [Dozer](https://github.com/Mortennn/Dozer) - [Draft](https://draft.sh/) - [Droplr](https://droplr.com/) - [Dropzone 3](https://aptonic.com/dropzone3/) diff --git a/mackup/applications/dozer.cfg b/mackup/applications/dozer.cfg new file mode 100644 index 000000000..467e3a4aa --- /dev/null +++ b/mackup/applications/dozer.cfg @@ -0,0 +1,5 @@ +[application] +name = Dozer + +[configuration_files] +Library/Preferences/com.mortennn.Dozer.plist From efba0454afbd3313178516c355d11d1bb5508fab Mon Sep 17 00:00:00 2001 From: Lucas Larson <91468+LucasLarson@users.noreply.github.com> Date: Fri, 24 Mar 2023 13:07:42 -0400 Subject: [PATCH 380/406] store `DynamicProfiles` from `$XDG_CONFIG_HOME` (#1855) (#1864) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * store `DynamicProfiles` from `$XDG_CONFIG_HOME` (#1855) iTerm2’s `DynamicProfiles` content can be saved without error, but only if loaded from `$XDG_CONFIG_HOME/iterm2/AppSupport/DynamicProfiles` instead of from `~/Library/Application Support/iTerm2/DynamicProfiles`. Because this pull request will prevent new errors in backing up `DynamicProfiles`, it should considered to fix #1855. Signed-off-by: Lucas Larson * Add support for Logseq (#1876) * Add support for Logseq in README * Update CHANGELOG.md * Add files via upload * Add support for PrusaSlicer (#1874) * Add support for PrusaSlicer * Add support for PrusaSlicer in README * Update CHANGELOG.md * add newline Co-authored-by: Laurent Raufaste --------- Signed-off-by: Lucas Larson Co-authored-by: Mariano Mollo Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/iterm2.cfg | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 106063e16..768edd00b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Updated support for Caffeine (via @joshmedeski) - Added support for PrusaSlicer (via @visika) - Added support for Logseq (via @visika) +- Updated support for iTerm2 (via @LucasLarson) - Added support for SwitchHosts (via @zxjlm) - Added support for Warp (via @drallas) - Added support for Wooshy (via @godbout) diff --git a/mackup/applications/iterm2.cfg b/mackup/applications/iterm2.cfg index 47742f80b..bb6453e76 100644 --- a/mackup/applications/iterm2.cfg +++ b/mackup/applications/iterm2.cfg @@ -3,4 +3,6 @@ name = iTerm2 [configuration_files] Library/Preferences/com.googlecode.iterm2.plist -Library/Application Support/iTerm2/DynamicProfiles + +[xdg_configuration_files] +iterm2/AppSupport/DynamicProfiles From b7407e4ae0f81bbe887a46e3cad1cb9f49167f5e Mon Sep 17 00:00:00 2001 From: Denis Cornehl Date: Fri, 24 Mar 2023 18:11:06 +0100 Subject: [PATCH 381/406] add new poetry config location (#1861) --- CHANGELOG.md | 1 + mackup/applications/poetry.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 768edd00b..cb0e67f40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - Added support for Elgato StreamDeck (via @fharper) - Added support for ni (via @wxh16144) - Added support for TablePlus Favorites (via @pesonn) +- updated poetry config location (via @syphar) ## Mackup 0.8.36 diff --git a/mackup/applications/poetry.cfg b/mackup/applications/poetry.cfg index ac2922707..459105a72 100644 --- a/mackup/applications/poetry.cfg +++ b/mackup/applications/poetry.cfg @@ -3,6 +3,7 @@ name = poetry [configuration_files] Library/Application Support/pypoetry/config.toml +Library/Preferences/pypoetry/config.toml [xdg_configuration_files] pypoetry/config.toml From 2a1e84a81962007c422d92621191827c60092e06 Mon Sep 17 00:00:00 2001 From: Archean Zhang Date: Sat, 25 Mar 2023 02:14:18 +0900 Subject: [PATCH 382/406] Add support for .vim/bundle folder. (#1786) * add support for .vim/bundle folder. * add support for .vim/bundle folder. --- CHANGELOG.md | 3 ++- mackup/applications/vim.cfg | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb0e67f40..a5d5352d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,8 @@ - Added support for Elgato StreamDeck (via @fharper) - Added support for ni (via @wxh16144) - Added support for TablePlus Favorites (via @pesonn) -- updated poetry config location (via @syphar) +- Updated poetry config location (via @syphar) +- Updated support for vim (via @iarchean) ## Mackup 0.8.36 diff --git a/mackup/applications/vim.cfg b/mackup/applications/vim.cfg index c5a4af9b5..72c337496 100644 --- a/mackup/applications/vim.cfg +++ b/mackup/applications/vim.cfg @@ -7,6 +7,7 @@ name = Vim .gvimrc.before .vim/autoload .vim/after +.vim/bundle .vim/colors .vim/doc .vim/ftdetect From 178e603c0ea15f0d06f02bbe81fba165d53e1b9c Mon Sep 17 00:00:00 2001 From: Steven Op de beeck Date: Fri, 24 Mar 2023 18:21:30 +0100 Subject: [PATCH 383/406] Extend support for Maven with settings-security.xml (#1771) * Extend support for Maven with settings-security.xml * missing newline --------- Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/maven.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5d5352d6..c3af6caf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Added support for TablePlus Favorites (via @pesonn) - Updated poetry config location (via @syphar) - Updated support for vim (via @iarchean) +- Updated support for Maven: include settings-security.xml (via @stevenodb) ## Mackup 0.8.36 diff --git a/mackup/applications/maven.cfg b/mackup/applications/maven.cfg index 50e0dc4e3..fa44fd0a1 100644 --- a/mackup/applications/maven.cfg +++ b/mackup/applications/maven.cfg @@ -2,5 +2,6 @@ name = Maven [configuration_files] +.m2/settings-security.xml .m2/settings.xml .m2/toolchains.xml From 24746e3141c59f69f60f7046e81e6e01d9bab587 Mon Sep 17 00:00:00 2001 From: Carlos Sanchez Date: Fri, 24 Mar 2023 19:25:02 +0200 Subject: [PATCH 384/406] feat: add support for GoLand 2019.2 (#1467) * feat: add support for GoLand 2019.2 * AZ order --------- Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/goland.cfg | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3af6caf1..a3a9a7511 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ - Updated poetry config location (via @syphar) - Updated support for vim (via @iarchean) - Updated support for Maven: include settings-security.xml (via @stevenodb) +- Added support for GoLand 2019.2 (via @carlossg) ## Mackup 0.8.36 diff --git a/mackup/applications/goland.cfg b/mackup/applications/goland.cfg index a46cf5643..8928efe54 100644 --- a/mackup/applications/goland.cfg +++ b/mackup/applications/goland.cfg @@ -2,14 +2,16 @@ name = GoLand [configuration_files] -Library/Preferences/com.jetbrains.gogland-EAP.plist Library/Application Support/Gogland1.0 +Library/Application Support/GoLand2017.3 +Library/Application Support/GoLand2018.1 +Library/Application Support/GoLand2018.2 +Library/Application Support/GoLand2018.3 +Library/Application Support/GoLand2019.2 +Library/Preferences/com.jetbrains.gogland-EAP.plist Library/Preferences/Gogland1.0 Library/Preferences/GoLand2017.3 -Library/Application Support/GoLand2017.3 Library/Preferences/GoLand2018.1 -Library/Application Support/GoLand2018.1 Library/Preferences/GoLand2018.2 -Library/Application Support/GoLand2018.2 Library/Preferences/GoLand2018.3 -Library/Application Support/GoLand2018.3 +Library/Preferences/GoLand2019.2 From f6cb20878ff71c70b3e64ff43c72ed512203eede Mon Sep 17 00:00:00 2001 From: Albert Salim Date: Sat, 25 Mar 2023 01:27:57 +0800 Subject: [PATCH 385/406] Add .default-npm-packages to asdf.cfg (#1459) * Add .default-npm-packages to asdf.cfg Default set of npm packages to be installed with NodeJS. https://github.com/asdf-vm/asdf-nodejs#default-npm-packages * Update CHANGELOG.md * AZ order --------- Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/asdf.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3a9a7511..76ea2a938 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - Added support for Elgato StreamDeck (via @fharper) - Added support for ni (via @wxh16144) - Added support for TablePlus Favorites (via @pesonn) +- Added support for asdf .default-npm-packages - Updated poetry config location (via @syphar) - Updated support for vim (via @iarchean) - Updated support for Maven: include settings-security.xml (via @stevenodb) diff --git a/mackup/applications/asdf.cfg b/mackup/applications/asdf.cfg index 8f8496621..d57f8dc14 100644 --- a/mackup/applications/asdf.cfg +++ b/mackup/applications/asdf.cfg @@ -3,6 +3,6 @@ name = asdf [configuration_files] .asdfrc -.tool-versions .default-gems .default-npm-packages +.tool-versions From 3cd7c46317c2f579d0c3fedfb29d7f87513102e3 Mon Sep 17 00:00:00 2001 From: tanpengsccd Date: Sat, 25 Mar 2023 01:34:18 +0800 Subject: [PATCH 386/406] add support for clashX and SpaceLaucher. (#1356) * add support for clashX and SpaceLaucher * add readme changlog * newlines missing * Update spacelaucher.cfg * Fix typo * Fix typo * Update README.md * Update CHANGELOG.md * Use XDG config file * Update spacelaucher.cfg * Update clashx.cfg * AZ order * az order * Delete spacelaucher.cfg * Update CHANGELOG.md --------- Co-authored-by: Laurent Raufaste --- README.md | 2 +- mackup/applications/clashx.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 89ef98250..484cb2716 100644 --- a/README.md +++ b/README.md @@ -621,7 +621,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Smooth Mouse](http://smoothmouse.com/) - [Soulver](http://www.acqualia.com/soulver/) - [SourceTree](https://www.sourcetreeapp.com/) -- [SpaceLauncher](https://spacelauncherapp.com/) +- [SpaceLauncher](https://spacelauncherapp.com) - [Spacemacs](https://github.com/syl20bnr/spacemacs) - [SpaceVim](https://github.com/SpaceVim/SpaceVim) - [Spark](http://www.shadowlab.org/softwares/spark.php) diff --git a/mackup/applications/clashx.cfg b/mackup/applications/clashx.cfg index 4f7f80f9b..dc5590547 100644 --- a/mackup/applications/clashx.cfg +++ b/mackup/applications/clashx.cfg @@ -1,5 +1,5 @@ [application] -name = clashX +name = ClashX [xdg_configuration_files] clash From 3d2d41c3763820e3949c741536c1ced78fdcc214 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Fri, 24 Mar 2023 18:36:46 +0100 Subject: [PATCH 387/406] Mackup 0.8.37 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76ea2a938..b8fb7948f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.37 + - Added support for macOS Preview (via @iloveitaly) - Fixed support for Bat (via @grigorii-horos) - Added support for Rust (via @grigorii-horos) diff --git a/mackup/constants.py b/mackup/constants.py index 1685f19e7..f8c2fe6f0 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = "0.8.36" +VERSION = "0.8.37" # Support platforms PLATFORM_DARWIN = "Darwin" From 3b8dc531ba4f81cee01365ffbadc7b922cbc4f5e Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 4 Nov 2023 21:07:34 +0100 Subject: [PATCH 388/406] Fix CI (#1952) * Fix CI * use dash * ignore test fixtures * Update python versions Follows https://devguide.python.org/versions/ * More python versions * typo * 3.13 container not found * Test with poetry * Add path * fix path * test only on 3.8 and 3.9 * Update CHANGELOG.md * Use nose-py3 * Update test.yaml * on PRs only --- .github/workflows/install.yaml | 6 +- .github/workflows/markdown.yaml | 8 +- .github/workflows/test.yaml | 13 +- .markdownlint.yaml | 2 + CHANGELOG.md | 4 + Makefile | 13 +- mackup/constants.py | 2 +- poetry.lock | 684 ++++++++++++++++++++++++++++++++ pyproject.toml | 25 ++ 9 files changed, 734 insertions(+), 23 deletions(-) create mode 100644 .markdownlint.yaml create mode 100644 poetry.lock create mode 100644 pyproject.toml diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml index c4f821523..f59fcd9be 100644 --- a/.github/workflows/install.yaml +++ b/.github/workflows/install.yaml @@ -1,7 +1,5 @@ name: Test installs -on: - - pull_request - - push +on: pull_request jobs: @@ -15,6 +13,8 @@ jobs: - "3.8" - "3.9" - "3.10" + - "3.11" + - "3.12" runs-on: ubuntu-latest container: python:${{ matrix.python-version }} steps: diff --git a/.github/workflows/markdown.yaml b/.github/workflows/markdown.yaml index 5b1e62b9a..904a36d82 100644 --- a/.github/workflows/markdown.yaml +++ b/.github/workflows/markdown.yaml @@ -7,7 +7,9 @@ jobs: mdl: runs-on: ubuntu-latest - container: rsrchboy/mdl steps: - - uses: actions/checkout@v2 - - run: mdl . + - uses: actions/checkout@v4 + - uses: articulate/actions-markdownlint@v1 + with: + config: .markdownlint.yaml + ignore: 'tests/' diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 229b40d61..714174fe6 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -1,7 +1,5 @@ name: Run tests -on: - - pull_request - - push +on: pull_request jobs: @@ -18,14 +16,15 @@ jobs: strategy: matrix: python-version: - - "3.6" - - "3.7" - "3.8" - "3.9" - "3.10" + - "3.11" + # - "3.12" # Installing numpy (1.24.4): Failed container: python:${{ matrix.python-version }} steps: - - run: pip install pipenv + - run: echo "${HOME}/.local/bin" >> $GITHUB_PATH + - run: pip install pipx + - run: pipx install poetry - uses: actions/checkout@v2 - - run: pipenv install -d - run: make test diff --git a/.markdownlint.yaml b/.markdownlint.yaml new file mode 100644 index 000000000..40598550b --- /dev/null +++ b/.markdownlint.yaml @@ -0,0 +1,2 @@ +MD004: + style: "dash" diff --git a/CHANGELOG.md b/CHANGELOG.md index b8fb7948f..132700c3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## WIP +## Mackup 0.8.38 + +- Build and release with poetry + ## Mackup 0.8.37 - Added support for macOS Preview (via @iloveitaly) diff --git a/Makefile b/Makefile index bfb486c88..56787632f 100644 --- a/Makefile +++ b/Makefile @@ -1,23 +1,18 @@ -develop: - pipenv run python setup.py develop - -undevelop: - pipenv run python setup.py develop --uninstall - lint: # Install mdl with "gem install mdl" mdl . test: - pipenv run nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup + poetry install --with dev + poetry run nosetests --with-coverage --cover-branches --cover-package=mackup clean: rm -rf dist/ rm -rf Mackup.egg-info/ release: clean - pipenv run python setup.py sdist - pipenv run twine upload dist/* + poetry build + poetry publish black: black --target-version py310 . diff --git a/mackup/constants.py b/mackup/constants.py index f8c2fe6f0..811a8bb49 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = "0.8.37" +VERSION = "0.8.38" # Support platforms PLATFORM_DARWIN = "Darwin" diff --git a/poetry.lock b/poetry.lock new file mode 100644 index 000000000..5906252f0 --- /dev/null +++ b/poetry.lock @@ -0,0 +1,684 @@ +# This file is automatically @generated by Poetry 1.7.0 and should not be changed by hand. + +[[package]] +name = "2to3" +version = "1.0" +description = "Adds the 2to3 command directly to entry_points." +optional = false +python-versions = "*" +files = [ + {file = "2to3-1.0-py3-none-any.whl", hash = "sha256:a39fb204829c6ed90be1507f3aff1c2b4fa6734585d57a50286f039546b5fb7f"}, + {file = "2to3-1.0.tar.gz", hash = "sha256:958bc212c928bbdcbc778b72528e0a39ae4ee8040eda6af6c3b5dd640c98ce6d"}, +] + +[[package]] +name = "alabaster" +version = "0.7.13" +description = "A configurable sidebar-enabled Sphinx theme" +optional = false +python-versions = ">=3.6" +files = [ + {file = "alabaster-0.7.13-py3-none-any.whl", hash = "sha256:1ee19aca801bbabb5ba3f5f258e4422dfa86f82f3e9cefb0859b283cdd7f62a3"}, + {file = "alabaster-0.7.13.tar.gz", hash = "sha256:a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2"}, +] + +[[package]] +name = "babel" +version = "2.13.1" +description = "Internationalization utilities" +optional = false +python-versions = ">=3.7" +files = [ + {file = "Babel-2.13.1-py3-none-any.whl", hash = "sha256:7077a4984b02b6727ac10f1f7294484f737443d7e2e66c5e4380e41a3ae0b4ed"}, + {file = "Babel-2.13.1.tar.gz", hash = "sha256:33e0952d7dd6374af8dbf6768cc4ddf3ccfefc244f9986d4074704f2fbd18900"}, +] + +[package.dependencies] +pytz = {version = ">=2015.7", markers = "python_version < \"3.9\""} +setuptools = {version = "*", markers = "python_version >= \"3.12\""} + +[package.extras] +dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] + +[[package]] +name = "certifi" +version = "2023.7.22" +description = "Python package for providing Mozilla's CA Bundle." +optional = false +python-versions = ">=3.6" +files = [ + {file = "certifi-2023.7.22-py3-none-any.whl", hash = "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"}, + {file = "certifi-2023.7.22.tar.gz", hash = "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"}, +] + +[[package]] +name = "charset-normalizer" +version = "3.3.2" +description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." +optional = false +python-versions = ">=3.7.0" +files = [ + {file = "charset-normalizer-3.3.2.tar.gz", hash = "sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-win32.whl", hash = "sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-win32.whl", hash = "sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-win32.whl", hash = "sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-win32.whl", hash = "sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-win_amd64.whl", hash = "sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-win32.whl", hash = "sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-win32.whl", hash = "sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d"}, + {file = "charset_normalizer-3.3.2-py3-none-any.whl", hash = "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc"}, +] + +[[package]] +name = "colorama" +version = "0.4.6" +description = "Cross-platform colored terminal text." +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" +files = [ + {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, + {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, +] + +[[package]] +name = "coverage" +version = "7.3.2" +description = "Code coverage measurement for Python" +optional = false +python-versions = ">=3.8" +files = [ + {file = "coverage-7.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d872145f3a3231a5f20fd48500274d7df222e291d90baa2026cc5152b7ce86bf"}, + {file = "coverage-7.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:310b3bb9c91ea66d59c53fa4989f57d2436e08f18fb2f421a1b0b6b8cc7fffda"}, + {file = "coverage-7.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f47d39359e2c3779c5331fc740cf4bce6d9d680a7b4b4ead97056a0ae07cb49a"}, + {file = "coverage-7.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aa72dbaf2c2068404b9870d93436e6d23addd8bbe9295f49cbca83f6e278179c"}, + {file = "coverage-7.3.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:beaa5c1b4777f03fc63dfd2a6bd820f73f036bfb10e925fce067b00a340d0f3f"}, + {file = "coverage-7.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:dbc1b46b92186cc8074fee9d9fbb97a9dd06c6cbbef391c2f59d80eabdf0faa6"}, + {file = "coverage-7.3.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:315a989e861031334d7bee1f9113c8770472db2ac484e5b8c3173428360a9148"}, + {file = "coverage-7.3.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d1bc430677773397f64a5c88cb522ea43175ff16f8bfcc89d467d974cb2274f9"}, + {file = "coverage-7.3.2-cp310-cp310-win32.whl", hash = "sha256:a889ae02f43aa45032afe364c8ae84ad3c54828c2faa44f3bfcafecb5c96b02f"}, + {file = "coverage-7.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:c0ba320de3fb8c6ec16e0be17ee1d3d69adcda99406c43c0409cb5c41788a611"}, + {file = "coverage-7.3.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ac8c802fa29843a72d32ec56d0ca792ad15a302b28ca6203389afe21f8fa062c"}, + {file = "coverage-7.3.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:89a937174104339e3a3ffcf9f446c00e3a806c28b1841c63edb2b369310fd074"}, + {file = "coverage-7.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e267e9e2b574a176ddb983399dec325a80dbe161f1a32715c780b5d14b5f583a"}, + {file = "coverage-7.3.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2443cbda35df0d35dcfb9bf8f3c02c57c1d6111169e3c85fc1fcc05e0c9f39a3"}, + {file = "coverage-7.3.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4175e10cc8dda0265653e8714b3174430b07c1dca8957f4966cbd6c2b1b8065a"}, + {file = "coverage-7.3.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:0cbf38419fb1a347aaf63481c00f0bdc86889d9fbf3f25109cf96c26b403fda1"}, + {file = "coverage-7.3.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:5c913b556a116b8d5f6ef834038ba983834d887d82187c8f73dec21049abd65c"}, + {file = "coverage-7.3.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1981f785239e4e39e6444c63a98da3a1db8e971cb9ceb50a945ba6296b43f312"}, + {file = "coverage-7.3.2-cp311-cp311-win32.whl", hash = "sha256:43668cabd5ca8258f5954f27a3aaf78757e6acf13c17604d89648ecc0cc66640"}, + {file = "coverage-7.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:e10c39c0452bf6e694511c901426d6b5ac005acc0f78ff265dbe36bf81f808a2"}, + {file = "coverage-7.3.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:4cbae1051ab791debecc4a5dcc4a1ff45fc27b91b9aee165c8a27514dd160836"}, + {file = "coverage-7.3.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:12d15ab5833a997716d76f2ac1e4b4d536814fc213c85ca72756c19e5a6b3d63"}, + {file = "coverage-7.3.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c7bba973ebee5e56fe9251300c00f1579652587a9f4a5ed8404b15a0471f216"}, + {file = "coverage-7.3.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fe494faa90ce6381770746077243231e0b83ff3f17069d748f645617cefe19d4"}, + {file = "coverage-7.3.2-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f6e9589bd04d0461a417562649522575d8752904d35c12907d8c9dfeba588faf"}, + {file = "coverage-7.3.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:d51ac2a26f71da1b57f2dc81d0e108b6ab177e7d30e774db90675467c847bbdf"}, + {file = "coverage-7.3.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:99b89d9f76070237975b315b3d5f4d6956ae354a4c92ac2388a5695516e47c84"}, + {file = "coverage-7.3.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:fa28e909776dc69efb6ed975a63691bc8172b64ff357e663a1bb06ff3c9b589a"}, + {file = "coverage-7.3.2-cp312-cp312-win32.whl", hash = "sha256:289fe43bf45a575e3ab10b26d7b6f2ddb9ee2dba447499f5401cfb5ecb8196bb"}, + {file = "coverage-7.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:7dbc3ed60e8659bc59b6b304b43ff9c3ed858da2839c78b804973f613d3e92ed"}, + {file = "coverage-7.3.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f94b734214ea6a36fe16e96a70d941af80ff3bfd716c141300d95ebc85339738"}, + {file = "coverage-7.3.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:af3d828d2c1cbae52d34bdbb22fcd94d1ce715d95f1a012354a75e5913f1bda2"}, + {file = "coverage-7.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:630b13e3036e13c7adc480ca42fa7afc2a5d938081d28e20903cf7fd687872e2"}, + {file = "coverage-7.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c9eacf273e885b02a0273bb3a2170f30e2d53a6d53b72dbe02d6701b5296101c"}, + {file = "coverage-7.3.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d8f17966e861ff97305e0801134e69db33b143bbfb36436efb9cfff6ec7b2fd9"}, + {file = "coverage-7.3.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b4275802d16882cf9c8b3d057a0839acb07ee9379fa2749eca54efbce1535b82"}, + {file = "coverage-7.3.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:72c0cfa5250f483181e677ebc97133ea1ab3eb68645e494775deb6a7f6f83901"}, + {file = "coverage-7.3.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:cb536f0dcd14149425996821a168f6e269d7dcd2c273a8bff8201e79f5104e76"}, + {file = "coverage-7.3.2-cp38-cp38-win32.whl", hash = "sha256:307adb8bd3abe389a471e649038a71b4eb13bfd6b7dd9a129fa856f5c695cf92"}, + {file = "coverage-7.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:88ed2c30a49ea81ea3b7f172e0269c182a44c236eb394718f976239892c0a27a"}, + {file = "coverage-7.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b631c92dfe601adf8f5ebc7fc13ced6bb6e9609b19d9a8cd59fa47c4186ad1ce"}, + {file = "coverage-7.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:d3d9df4051c4a7d13036524b66ecf7a7537d14c18a384043f30a303b146164e9"}, + {file = "coverage-7.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5f7363d3b6a1119ef05015959ca24a9afc0ea8a02c687fe7e2d557705375c01f"}, + {file = "coverage-7.3.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2f11cc3c967a09d3695d2a6f03fb3e6236622b93be7a4b5dc09166a861be6d25"}, + {file = "coverage-7.3.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:149de1d2401ae4655c436a3dced6dd153f4c3309f599c3d4bd97ab172eaf02d9"}, + {file = "coverage-7.3.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:3a4006916aa6fee7cd38db3bfc95aa9c54ebb4ffbfc47c677c8bba949ceba0a6"}, + {file = "coverage-7.3.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9028a3871280110d6e1aa2df1afd5ef003bab5fb1ef421d6dc748ae1c8ef2ebc"}, + {file = "coverage-7.3.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9f805d62aec8eb92bab5b61c0f07329275b6f41c97d80e847b03eb894f38d083"}, + {file = "coverage-7.3.2-cp39-cp39-win32.whl", hash = "sha256:d1c88ec1a7ff4ebca0219f5b1ef863451d828cccf889c173e1253aa84b1e07ce"}, + {file = "coverage-7.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:b4767da59464bb593c07afceaddea61b154136300881844768037fd5e859353f"}, + {file = "coverage-7.3.2-pp38.pp39.pp310-none-any.whl", hash = "sha256:ae97af89f0fbf373400970c0a21eef5aa941ffeed90aee43650b81f7d7f47637"}, + {file = "coverage-7.3.2.tar.gz", hash = "sha256:be32ad29341b0170e795ca590e1c07e81fc061cb5b10c74ce7203491484404ef"}, +] + +[package.extras] +toml = ["tomli"] + +[[package]] +name = "docopt" +version = "0.6.2" +description = "Pythonic argument parser, that will make you smile" +optional = false +python-versions = "*" +files = [ + {file = "docopt-0.6.2.tar.gz", hash = "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"}, +] + +[[package]] +name = "docutils" +version = "0.20.1" +description = "Docutils -- Python Documentation Utilities" +optional = false +python-versions = ">=3.7" +files = [ + {file = "docutils-0.20.1-py3-none-any.whl", hash = "sha256:96f387a2c5562db4476f09f13bbab2192e764cac08ebbf3a34a95d9b1e4a59d6"}, + {file = "docutils-0.20.1.tar.gz", hash = "sha256:f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b"}, +] + +[[package]] +name = "idna" +version = "3.4" +description = "Internationalized Domain Names in Applications (IDNA)" +optional = false +python-versions = ">=3.5" +files = [ + {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"}, + {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"}, +] + +[[package]] +name = "imagesize" +version = "1.4.1" +description = "Getting image size from png/jpeg/jpeg2000/gif file" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +files = [ + {file = "imagesize-1.4.1-py2.py3-none-any.whl", hash = "sha256:0d8d18d08f840c19d0ee7ca1fd82490fdc3729b7ac93f49870406ddde8ef8d8b"}, + {file = "imagesize-1.4.1.tar.gz", hash = "sha256:69150444affb9cb0d5cc5a92b3676f0b2fb7cd9ae39e947a5e11a36b4497cd4a"}, +] + +[[package]] +name = "importlib-metadata" +version = "6.8.0" +description = "Read metadata from Python packages" +optional = false +python-versions = ">=3.8" +files = [ + {file = "importlib_metadata-6.8.0-py3-none-any.whl", hash = "sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb"}, + {file = "importlib_metadata-6.8.0.tar.gz", hash = "sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743"}, +] + +[package.dependencies] +zipp = ">=0.5" + +[package.extras] +docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +perf = ["ipython"] +testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)", "pytest-ruff"] + +[[package]] +name = "jinja2" +version = "3.1.2" +description = "A very fast and expressive template engine." +optional = false +python-versions = ">=3.7" +files = [ + {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"}, + {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"}, +] + +[package.dependencies] +MarkupSafe = ">=2.0" + +[package.extras] +i18n = ["Babel (>=2.7)"] + +[[package]] +name = "markupsafe" +version = "2.1.3" +description = "Safely add untrusted strings to HTML/XML markup." +optional = false +python-versions = ">=3.7" +files = [ + {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-win32.whl", hash = "sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-win_amd64.whl", hash = "sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ca379055a47383d02a5400cb0d110cef0a776fc644cda797db0c5696cfd7e18e"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:b7ff0f54cb4ff66dd38bebd335a38e2c22c41a8ee45aa608efc890ac3e3931bc"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c011a4149cfbcf9f03994ec2edffcb8b1dc2d2aede7ca243746df97a5d41ce48"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:56d9f2ecac662ca1611d183feb03a3fa4406469dafe241673d521dd5ae92a155"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-win32.whl", hash = "sha256:8758846a7e80910096950b67071243da3e5a20ed2546e6392603c096778d48e0"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-win_amd64.whl", hash = "sha256:787003c0ddb00500e49a10f2844fac87aa6ce977b90b0feaaf9de23c22508b24"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:2ef12179d3a291be237280175b542c07a36e7f60718296278d8593d21ca937d4"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2c1b19b3aaacc6e57b7e25710ff571c24d6c3613a45e905b1fde04d691b98ee0"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8afafd99945ead6e075b973fefa56379c5b5c53fd8937dad92c662da5d8fd5ee"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8c41976a29d078bb235fea9b2ecd3da465df42a562910f9022f1a03107bd02be"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d080e0a5eb2529460b30190fcfcc4199bd7f827663f858a226a81bc27beaa97e"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:69c0f17e9f5a7afdf2cc9fb2d1ce6aabdb3bafb7f38017c0b77862bcec2bbad8"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:504b320cd4b7eff6f968eddf81127112db685e81f7e36e75f9f84f0df46041c3"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:42de32b22b6b804f42c5d98be4f7e5e977ecdd9ee9b660fda1a3edf03b11792d"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-win32.whl", hash = "sha256:ceb01949af7121f9fc39f7d27f91be8546f3fb112c608bc4029aef0bab86a2a5"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-win_amd64.whl", hash = "sha256:1b40069d487e7edb2676d3fbdb2b0829ffa2cd63a2ec26c4938b2d34391b4ecc"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-win32.whl", hash = "sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-win_amd64.whl", hash = "sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba"}, + {file = "MarkupSafe-2.1.3.tar.gz", hash = "sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"}, +] + +[[package]] +name = "nose-py3" +version = "1.6.3" +description = "nose extends unittest to make testing easier - python3 version" +optional = false +python-versions = ">=3.6" +files = [ + {file = "nose_py3-1.6.3-py3-none-any.whl", hash = "sha256:97daa91c0f1aa0594857aac709ba6da52f5a7d88d16b618b2506d595e2d0580e"}, +] + +[package.dependencies] +2to3 = "*" +coverage = "*" +numpy = "*" +six = "*" +sphinx = "*" + +[[package]] +name = "numpy" +version = "1.24.4" +description = "Fundamental package for array computing in Python" +optional = false +python-versions = ">=3.8" +files = [ + {file = "numpy-1.24.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c0bfb52d2169d58c1cdb8cc1f16989101639b34c7d3ce60ed70b19c63eba0b64"}, + {file = "numpy-1.24.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ed094d4f0c177b1b8e7aa9cba7d6ceed51c0e569a5318ac0ca9a090680a6a1b1"}, + {file = "numpy-1.24.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:79fc682a374c4a8ed08b331bef9c5f582585d1048fa6d80bc6c35bc384eee9b4"}, + {file = "numpy-1.24.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ffe43c74893dbf38c2b0a1f5428760a1a9c98285553c89e12d70a96a7f3a4d6"}, + {file = "numpy-1.24.4-cp310-cp310-win32.whl", hash = "sha256:4c21decb6ea94057331e111a5bed9a79d335658c27ce2adb580fb4d54f2ad9bc"}, + {file = "numpy-1.24.4-cp310-cp310-win_amd64.whl", hash = "sha256:b4bea75e47d9586d31e892a7401f76e909712a0fd510f58f5337bea9572c571e"}, + {file = "numpy-1.24.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:f136bab9c2cfd8da131132c2cf6cc27331dd6fae65f95f69dcd4ae3c3639c810"}, + {file = "numpy-1.24.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e2926dac25b313635e4d6cf4dc4e51c8c0ebfed60b801c799ffc4c32bf3d1254"}, + {file = "numpy-1.24.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:222e40d0e2548690405b0b3c7b21d1169117391c2e82c378467ef9ab4c8f0da7"}, + {file = "numpy-1.24.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7215847ce88a85ce39baf9e89070cb860c98fdddacbaa6c0da3ffb31b3350bd5"}, + {file = "numpy-1.24.4-cp311-cp311-win32.whl", hash = "sha256:4979217d7de511a8d57f4b4b5b2b965f707768440c17cb70fbf254c4b225238d"}, + {file = "numpy-1.24.4-cp311-cp311-win_amd64.whl", hash = "sha256:b7b1fc9864d7d39e28f41d089bfd6353cb5f27ecd9905348c24187a768c79694"}, + {file = "numpy-1.24.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1452241c290f3e2a312c137a9999cdbf63f78864d63c79039bda65ee86943f61"}, + {file = "numpy-1.24.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:04640dab83f7c6c85abf9cd729c5b65f1ebd0ccf9de90b270cd61935eef0197f"}, + {file = "numpy-1.24.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5425b114831d1e77e4b5d812b69d11d962e104095a5b9c3b641a218abcc050e"}, + {file = "numpy-1.24.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd80e219fd4c71fc3699fc1dadac5dcf4fd882bfc6f7ec53d30fa197b8ee22dc"}, + {file = "numpy-1.24.4-cp38-cp38-win32.whl", hash = "sha256:4602244f345453db537be5314d3983dbf5834a9701b7723ec28923e2889e0bb2"}, + {file = "numpy-1.24.4-cp38-cp38-win_amd64.whl", hash = "sha256:692f2e0f55794943c5bfff12b3f56f99af76f902fc47487bdfe97856de51a706"}, + {file = "numpy-1.24.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2541312fbf09977f3b3ad449c4e5f4bb55d0dbf79226d7724211acc905049400"}, + {file = "numpy-1.24.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9667575fb6d13c95f1b36aca12c5ee3356bf001b714fc354eb5465ce1609e62f"}, + {file = "numpy-1.24.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f3a86ed21e4f87050382c7bc96571755193c4c1392490744ac73d660e8f564a9"}, + {file = "numpy-1.24.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d11efb4dbecbdf22508d55e48d9c8384db795e1b7b51ea735289ff96613ff74d"}, + {file = "numpy-1.24.4-cp39-cp39-win32.whl", hash = "sha256:6620c0acd41dbcb368610bb2f4d83145674040025e5536954782467100aa8835"}, + {file = "numpy-1.24.4-cp39-cp39-win_amd64.whl", hash = "sha256:befe2bf740fd8373cf56149a5c23a0f601e82869598d41f8e188a0e9869926f8"}, + {file = "numpy-1.24.4-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:31f13e25b4e304632a4619d0e0777662c2ffea99fcae2029556b17d8ff958aef"}, + {file = "numpy-1.24.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95f7ac6540e95bc440ad77f56e520da5bf877f87dca58bd095288dce8940532a"}, + {file = "numpy-1.24.4-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:e98f220aa76ca2a977fe435f5b04d7b3470c0a2e6312907b37ba6068f26787f2"}, + {file = "numpy-1.24.4.tar.gz", hash = "sha256:80f5e3a4e498641401868df4208b74581206afbee7cf7b8329daae82676d9463"}, +] + +[[package]] +name = "packaging" +version = "23.2" +description = "Core utilities for Python packages" +optional = false +python-versions = ">=3.7" +files = [ + {file = "packaging-23.2-py3-none-any.whl", hash = "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7"}, + {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"}, +] + +[[package]] +name = "pygments" +version = "2.16.1" +description = "Pygments is a syntax highlighting package written in Python." +optional = false +python-versions = ">=3.7" +files = [ + {file = "Pygments-2.16.1-py3-none-any.whl", hash = "sha256:13fc09fa63bc8d8671a6d247e1eb303c4b343eaee81d861f3404db2935653692"}, + {file = "Pygments-2.16.1.tar.gz", hash = "sha256:1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29"}, +] + +[package.extras] +plugins = ["importlib-metadata"] + +[[package]] +name = "pytz" +version = "2023.3.post1" +description = "World timezone definitions, modern and historical" +optional = false +python-versions = "*" +files = [ + {file = "pytz-2023.3.post1-py2.py3-none-any.whl", hash = "sha256:ce42d816b81b68506614c11e8937d3aa9e41007ceb50bfdcb0749b921bf646c7"}, + {file = "pytz-2023.3.post1.tar.gz", hash = "sha256:7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b"}, +] + +[[package]] +name = "requests" +version = "2.31.0" +description = "Python HTTP for Humans." +optional = false +python-versions = ">=3.7" +files = [ + {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"}, + {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"}, +] + +[package.dependencies] +certifi = ">=2017.4.17" +charset-normalizer = ">=2,<4" +idna = ">=2.5,<4" +urllib3 = ">=1.21.1,<3" + +[package.extras] +socks = ["PySocks (>=1.5.6,!=1.5.7)"] +use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] + +[[package]] +name = "setuptools" +version = "68.2.2" +description = "Easily download, build, install, upgrade, and uninstall Python packages" +optional = false +python-versions = ">=3.8" +files = [ + {file = "setuptools-68.2.2-py3-none-any.whl", hash = "sha256:b454a35605876da60632df1a60f736524eb73cc47bbc9f3f1ef1b644de74fd2a"}, + {file = "setuptools-68.2.2.tar.gz", hash = "sha256:4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87"}, +] + +[package.extras] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"] +testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] +testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "packaging (>=23.1)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"] + +[[package]] +name = "six" +version = "1.16.0" +description = "Python 2 and 3 compatibility utilities" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" +files = [ + {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, + {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, +] + +[[package]] +name = "snowballstemmer" +version = "2.2.0" +description = "This package provides 29 stemmers for 28 languages generated from Snowball algorithms." +optional = false +python-versions = "*" +files = [ + {file = "snowballstemmer-2.2.0-py2.py3-none-any.whl", hash = "sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a"}, + {file = "snowballstemmer-2.2.0.tar.gz", hash = "sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1"}, +] + +[[package]] +name = "sphinx" +version = "7.1.2" +description = "Python documentation generator" +optional = false +python-versions = ">=3.8" +files = [ + {file = "sphinx-7.1.2-py3-none-any.whl", hash = "sha256:d170a81825b2fcacb6dfd5a0d7f578a053e45d3f2b153fecc948c37344eb4cbe"}, + {file = "sphinx-7.1.2.tar.gz", hash = "sha256:780f4d32f1d7d1126576e0e5ecc19dc32ab76cd24e950228dcf7b1f6d3d9e22f"}, +] + +[package.dependencies] +alabaster = ">=0.7,<0.8" +babel = ">=2.9" +colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""} +docutils = ">=0.18.1,<0.21" +imagesize = ">=1.3" +importlib-metadata = {version = ">=4.8", markers = "python_version < \"3.10\""} +Jinja2 = ">=3.0" +packaging = ">=21.0" +Pygments = ">=2.13" +requests = ">=2.25.0" +snowballstemmer = ">=2.0" +sphinxcontrib-applehelp = "*" +sphinxcontrib-devhelp = "*" +sphinxcontrib-htmlhelp = ">=2.0.0" +sphinxcontrib-jsmath = "*" +sphinxcontrib-qthelp = "*" +sphinxcontrib-serializinghtml = ">=1.1.5" + +[package.extras] +docs = ["sphinxcontrib-websupport"] +lint = ["docutils-stubs", "flake8 (>=3.5.0)", "flake8-simplify", "isort", "mypy (>=0.990)", "ruff", "sphinx-lint", "types-requests"] +test = ["cython", "filelock", "html5lib", "pytest (>=4.6)"] + +[[package]] +name = "sphinxcontrib-applehelp" +version = "1.0.4" +description = "sphinxcontrib-applehelp is a Sphinx extension which outputs Apple help books" +optional = false +python-versions = ">=3.8" +files = [ + {file = "sphinxcontrib-applehelp-1.0.4.tar.gz", hash = "sha256:828f867945bbe39817c210a1abfd1bc4895c8b73fcaade56d45357a348a07d7e"}, + {file = "sphinxcontrib_applehelp-1.0.4-py3-none-any.whl", hash = "sha256:29d341f67fb0f6f586b23ad80e072c8e6ad0b48417db2bde114a4c9746feb228"}, +] + +[package.extras] +lint = ["docutils-stubs", "flake8", "mypy"] +test = ["pytest"] + +[[package]] +name = "sphinxcontrib-devhelp" +version = "1.0.2" +description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document." +optional = false +python-versions = ">=3.5" +files = [ + {file = "sphinxcontrib-devhelp-1.0.2.tar.gz", hash = "sha256:ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4"}, + {file = "sphinxcontrib_devhelp-1.0.2-py2.py3-none-any.whl", hash = "sha256:8165223f9a335cc1af7ffe1ed31d2871f325254c0423bc0c4c7cd1c1e4734a2e"}, +] + +[package.extras] +lint = ["docutils-stubs", "flake8", "mypy"] +test = ["pytest"] + +[[package]] +name = "sphinxcontrib-htmlhelp" +version = "2.0.1" +description = "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files" +optional = false +python-versions = ">=3.8" +files = [ + {file = "sphinxcontrib-htmlhelp-2.0.1.tar.gz", hash = "sha256:0cbdd302815330058422b98a113195c9249825d681e18f11e8b1f78a2f11efff"}, + {file = "sphinxcontrib_htmlhelp-2.0.1-py3-none-any.whl", hash = "sha256:c38cb46dccf316c79de6e5515e1770414b797162b23cd3d06e67020e1d2a6903"}, +] + +[package.extras] +lint = ["docutils-stubs", "flake8", "mypy"] +test = ["html5lib", "pytest"] + +[[package]] +name = "sphinxcontrib-jsmath" +version = "1.0.1" +description = "A sphinx extension which renders display math in HTML via JavaScript" +optional = false +python-versions = ">=3.5" +files = [ + {file = "sphinxcontrib-jsmath-1.0.1.tar.gz", hash = "sha256:a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"}, + {file = "sphinxcontrib_jsmath-1.0.1-py2.py3-none-any.whl", hash = "sha256:2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178"}, +] + +[package.extras] +test = ["flake8", "mypy", "pytest"] + +[[package]] +name = "sphinxcontrib-qthelp" +version = "1.0.3" +description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document." +optional = false +python-versions = ">=3.5" +files = [ + {file = "sphinxcontrib-qthelp-1.0.3.tar.gz", hash = "sha256:4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72"}, + {file = "sphinxcontrib_qthelp-1.0.3-py2.py3-none-any.whl", hash = "sha256:bd9fc24bcb748a8d51fd4ecaade681350aa63009a347a8c14e637895444dfab6"}, +] + +[package.extras] +lint = ["docutils-stubs", "flake8", "mypy"] +test = ["pytest"] + +[[package]] +name = "sphinxcontrib-serializinghtml" +version = "1.1.5" +description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)." +optional = false +python-versions = ">=3.5" +files = [ + {file = "sphinxcontrib-serializinghtml-1.1.5.tar.gz", hash = "sha256:aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"}, + {file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"}, +] + +[package.extras] +lint = ["docutils-stubs", "flake8", "mypy"] +test = ["pytest"] + +[[package]] +name = "urllib3" +version = "2.0.7" +description = "HTTP library with thread-safe connection pooling, file post, and more." +optional = false +python-versions = ">=3.7" +files = [ + {file = "urllib3-2.0.7-py3-none-any.whl", hash = "sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e"}, + {file = "urllib3-2.0.7.tar.gz", hash = "sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84"}, +] + +[package.extras] +brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"] +secure = ["certifi", "cryptography (>=1.9)", "idna (>=2.0.0)", "pyopenssl (>=17.1.0)", "urllib3-secure-extra"] +socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"] +zstd = ["zstandard (>=0.18.0)"] + +[[package]] +name = "zipp" +version = "3.17.0" +description = "Backport of pathlib-compatible object wrapper for zip files" +optional = false +python-versions = ">=3.8" +files = [ + {file = "zipp-3.17.0-py3-none-any.whl", hash = "sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31"}, + {file = "zipp-3.17.0.tar.gz", hash = "sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0"}, +] + +[package.extras] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"] +testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy (>=0.9.1)", "pytest-ruff"] + +[metadata] +lock-version = "2.0" +python-versions = "^3.8" +content-hash = "454bbc88f1b6c2be019c27da622698360726b6528f909624561b45613d32e3f1" diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 000000000..ea2397725 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,25 @@ +[tool.poetry] +name = "mackup" +version = "0.8.38" +description = "Keep your application settings in sync (macOS/Linux)" +authors = ["Laurent Raufaste "] +license = "GPLv3" +readme = "README.md" + +[tool.poetry.dependencies] +python = "^3.8" +docopt = "^0.6.2" +six = "^1.16.0" + +[tool.poetry.group.dev] +optional = true + +[tool.poetry.group.dev.dependencies] +nose-py3 = "^1.6.3" + +[build-system] +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" + +[tool.poetry.scripts] +mackup = "mackup.main:main" From 1797037f89e064427e786f496330cbc581b39b49 Mon Sep 17 00:00:00 2001 From: Vincent Koc Date: Sun, 5 Nov 2023 07:21:35 +1100 Subject: [PATCH 389/406] fix: Deprecated SafeConfigParser resolved (#1949) * fix: Update config.py #1948 * fix: Update appsdb.py #1948 --------- Co-authored-by: Laurent Raufaste --- mackup/appsdb.py | 2 +- mackup/config.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mackup/appsdb.py b/mackup/appsdb.py index 638ff40f4..3699cb1f0 100644 --- a/mackup/appsdb.py +++ b/mackup/appsdb.py @@ -26,7 +26,7 @@ def __init__(self): self.apps = dict() for config_file in ApplicationsDatabase.get_config_files(): - config = configparser.SafeConfigParser(allow_no_value=True) + config = configparser.ConfigParser(allow_no_value=True) # Needed to not lowercase the configuration_files in the ini files config.optionxform = str diff --git a/mackup/config.py b/mackup/config.py index 5fbbc9140..870a390d6 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -139,7 +139,7 @@ def _setup_parser(self, filename=None): filename (str) or None Returns: - SafeConfigParser + ConfigParser """ assert isinstance(filename, str) or filename is None @@ -147,7 +147,7 @@ def _setup_parser(self, filename=None): if not filename: filename = MACKUP_CONFIG_FILE - parser = configparser.SafeConfigParser( + parser = configparser.ConfigParser( allow_no_value=True, inline_comment_prefixes=(";", "#") ) parser.read(os.path.join(os.path.join(os.environ["HOME"], filename))) From 4c75d0a2a2d91f9b0e08da2a9339356d7ce3b2fa Mon Sep 17 00:00:00 2001 From: Brendan Falk Date: Sat, 4 Nov 2023 13:23:42 -0700 Subject: [PATCH 390/406] bugfix: added Brewfile (#1951) Co-authored-by: Laurent Raufaste --- mackup/applications/homebrew.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/homebrew.cfg b/mackup/applications/homebrew.cfg index 96acceebe..0a53f033a 100644 --- a/mackup/applications/homebrew.cfg +++ b/mackup/applications/homebrew.cfg @@ -3,3 +3,4 @@ name = Homebrew [configuration_files] .Brewfile +Brewfile From a60d1779fb010e6ff4f7329eae0ac3df07f1b7df Mon Sep 17 00:00:00 2001 From: G Date: Sun, 5 Nov 2023 04:28:06 +0800 Subject: [PATCH 391/406] removing my apps (kindaVim, Wooshy, Scrolla) coz mackup stopped working with them (#1941) * removing kindaVim, Wooshy and Scrolla coz not working anymore with mackup * remove kV Ws Sl from README * update CHANGELOG, removing kV Ws and Sl * Update CHANGELOG.md --------- Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 6 ++++++ README.md | 3 --- mackup/applications/kindavim.cfg | 5 ----- mackup/applications/scrolla.cfg | 5 ----- mackup/applications/wooshy.cfg | 5 ----- 5 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 mackup/applications/kindavim.cfg delete mode 100644 mackup/applications/scrolla.cfg delete mode 100644 mackup/applications/wooshy.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 132700c3c..3a934d4c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## WIP +- Removed support for kindaVim (via @godbout) +- Removed support for Wooshy (via @godbout) +- Removed support for Scrolla (via @godbout) +- fix: Deprecated SafeConfigParser resolved +- bugfix: added Brewfile + ## Mackup 0.8.38 - Build and release with poetry diff --git a/README.md b/README.md index 484cb2716..9c4110c8b 100644 --- a/README.md +++ b/README.md @@ -414,7 +414,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Keymo](http://manytricks.com/keymo/) - [KeyRemap4MacBook](https://pqrs.org/osx/karabiner/) - [Khd](https://github.com/koekeishiya/khd/) -- [kindaVim](https://kindavim.app) - [kitty](https://sw.kovidgoyal.net/kitty/) - [Krew](https://github.com/kubernetes-sigs/krew) - [Kubectl](https://kubernetes.io/docs/reference/kubectl/overview/) @@ -597,7 +596,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Screenhero](https://screenhero.com) - [Scrivener](http://www.literatureandlatte.com/scrivener.php) - [Scroll Reverser](https://pilotmoon.com/scrollreverser/) -- [Scrolla](https://scrolla.app) - [SecureCRT](https://www.vandyke.com/products/securecrt/) - [Secure Pipes](http://www.opoet.com/) - [Seil](https://pqrs.org/osx/karabiner/seil.html.en) @@ -702,7 +700,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [WhatsApp Web](https://web.whatsapp.com/) - [Wireshark 2](https://www.wireshark.org) - [Witch](http://manytricks.com/witch/) -- [Wooshy](https://wooshy.app) - [WordGrinder](https://cowlark.com/wordgrinder/) - [WordPress WP-CLI](http://wp-cli.org/) - [Workrave](http://www.workrave.org/) diff --git a/mackup/applications/kindavim.cfg b/mackup/applications/kindavim.cfg deleted file mode 100644 index 265e8de1e..000000000 --- a/mackup/applications/kindavim.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[application] -name = kindaVim - -[configuration_files] -Library/Preferences/mo.com.sleeplessmind.kindaVim.plist diff --git a/mackup/applications/scrolla.cfg b/mackup/applications/scrolla.cfg deleted file mode 100644 index b6dc0cf8a..000000000 --- a/mackup/applications/scrolla.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[application] -name = Scrolla - -[configuration_files] -Library/Preferences/mo.com.sleeplessmind.Scrolla.plist diff --git a/mackup/applications/wooshy.cfg b/mackup/applications/wooshy.cfg deleted file mode 100644 index 4274f6499..000000000 --- a/mackup/applications/wooshy.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[application] -name = Wooshy - -[configuration_files] -Library/Preferences/mo.com.sleeplessmind.Wooshy.plist From da732b896714b4cbfb865bae549f14ea847c4f99 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 4 Nov 2023 21:42:48 +0100 Subject: [PATCH 392/406] Remove old python setup files (#1955) * Remove old python setup files * Try pip install * Mackup is now 3.8+ --- .github/workflows/install.yaml | 5 +- Makefile | 1 + Pipfile | 16 -- Pipfile.lock | 415 --------------------------------- doc/release.md | 13 +- setup.cfg | 2 - setup.py | 32 --- 7 files changed, 9 insertions(+), 475 deletions(-) delete mode 100644 Pipfile delete mode 100644 Pipfile.lock delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml index f59fcd9be..6b9027cb0 100644 --- a/.github/workflows/install.yaml +++ b/.github/workflows/install.yaml @@ -7,9 +7,6 @@ jobs: strategy: matrix: python-version: - - "2.7" - - "3.6" - - "3.7" - "3.8" - "3.9" - "3.10" @@ -19,5 +16,5 @@ jobs: container: python:${{ matrix.python-version }} steps: - uses: actions/checkout@v2 - - run: python setup.py install + - run: pip install . - run: mackup --help diff --git a/Makefile b/Makefile index 56787632f..56fa2ef46 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ test: poetry run nosetests --with-coverage --cover-branches --cover-package=mackup clean: + rm -rf __pycache__ rm -rf dist/ rm -rf Mackup.egg-info/ diff --git a/Pipfile b/Pipfile deleted file mode 100644 index 4deb01b1b..000000000 --- a/Pipfile +++ /dev/null @@ -1,16 +0,0 @@ -[[source]] -name = "pypi" -url = "https://pypi.org/simple" -verify_ssl = true - -[packages] -docopt = "*" -six = "*" - -[dev-packages] -# Black is still a pre-release. Replaced with `brew install black` for now. -# black = "*" -coverage = "*" -nose-py3 = "*" -numpy = "*" -twine = "*" diff --git a/Pipfile.lock b/Pipfile.lock deleted file mode 100644 index 45d9eae77..000000000 --- a/Pipfile.lock +++ /dev/null @@ -1,415 +0,0 @@ -{ - "_meta": { - "hash": { - "sha256": "276a19b23934fb06f67d63b3766aad3db659ee76201ed86dc50d167722195f9d" - }, - "pipfile-spec": 6, - "requires": {}, - "sources": [ - { - "name": "pypi", - "url": "https://pypi.org/simple", - "verify_ssl": true - } - ] - }, - "default": { - "docopt": { - "hashes": [ - "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491" - ], - "index": "pypi", - "version": "==0.6.2" - }, - "six": { - "hashes": [ - "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", - "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" - ], - "index": "pypi", - "version": "==1.16.0" - } - }, - "develop": { - "bleach": { - "hashes": [ - "sha256:085f7f33c15bd408dd9b17a4ad77c577db66d76203e5984b1bd59baeee948b2a", - "sha256:0d03255c47eb9bd2f26aa9bb7f2107732e7e8fe195ca2f64709fcf3b0a4a085c" - ], - "markers": "python_version >= '3.7'", - "version": "==5.0.1" - }, - "certifi": { - "hashes": [ - "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3", - "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18" - ], - "index": "pypi", - "version": "==2022.12.7" - }, - "cffi": { - "hashes": [ - "sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5", - "sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef", - "sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104", - "sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426", - "sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405", - "sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375", - "sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a", - "sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e", - "sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc", - "sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf", - "sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185", - "sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497", - "sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3", - "sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35", - "sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c", - "sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83", - "sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21", - "sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca", - "sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984", - "sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac", - "sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd", - "sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee", - "sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a", - "sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2", - "sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192", - "sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7", - "sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585", - "sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f", - "sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e", - "sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27", - "sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b", - "sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e", - "sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e", - "sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d", - "sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c", - "sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415", - "sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82", - "sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02", - "sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314", - "sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325", - "sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c", - "sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3", - "sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914", - "sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045", - "sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d", - "sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9", - "sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5", - "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2", - "sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c", - "sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3", - "sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2", - "sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8", - "sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d", - "sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d", - "sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9", - "sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162", - "sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76", - "sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4", - "sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e", - "sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9", - "sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6", - "sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b", - "sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01", - "sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0" - ], - "version": "==1.15.1" - }, - "charset-normalizer": { - "hashes": [ - "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845", - "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f" - ], - "markers": "python_version >= '3.6'", - "version": "==2.1.1" - }, - "colorama": { - "hashes": [ - "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", - "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6" - ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'", - "version": "==0.4.6" - }, - "coverage": { - "hashes": [ - "sha256:03e2a7826086b91ef345ff18742ee9fc47a6839ccd517061ef8fa1976e652ce9", - "sha256:07e6db90cd9686c767dcc593dff16c8c09f9814f5e9c51034066cad3373b914d", - "sha256:18d520c6860515a771708937d2f78f63cc47ab3b80cb78e86573b0a760161faf", - "sha256:1ebf730d2381158ecf3dfd4453fbca0613e16eaa547b4170e2450c9707665ce7", - "sha256:21b7745788866028adeb1e0eca3bf1101109e2dc58456cb49d2d9b99a8c516e6", - "sha256:26e2deacd414fc2f97dd9f7676ee3eaecd299ca751412d89f40bc01557a6b1b4", - "sha256:2c6dbb42f3ad25760010c45191e9757e7dce981cbfb90e42feef301d71540059", - "sha256:2fea046bfb455510e05be95e879f0e768d45c10c11509e20e06d8fcaa31d9e39", - "sha256:34626a7eee2a3da12af0507780bb51eb52dca0e1751fd1471d0810539cefb536", - "sha256:37d1141ad6b2466a7b53a22e08fe76994c2d35a5b6b469590424a9953155afac", - "sha256:46191097ebc381fbf89bdce207a6c107ac4ec0890d8d20f3360345ff5976155c", - "sha256:4dd8bafa458b5c7d061540f1ee9f18025a68e2d8471b3e858a9dad47c8d41903", - "sha256:4e21876082ed887baed0146fe222f861b5815455ada3b33b890f4105d806128d", - "sha256:58303469e9a272b4abdb9e302a780072c0633cdcc0165db7eec0f9e32f901e05", - "sha256:5ca5aeb4344b30d0bec47481536b8ba1181d50dbe783b0e4ad03c95dc1296684", - "sha256:68353fe7cdf91f109fc7d474461b46e7f1f14e533e911a2a2cbb8b0fc8613cf1", - "sha256:6f89d05e028d274ce4fa1a86887b071ae1755082ef94a6740238cd7a8178804f", - "sha256:7a15dc0a14008f1da3d1ebd44bdda3e357dbabdf5a0b5034d38fcde0b5c234b7", - "sha256:8bdde1177f2311ee552f47ae6e5aa7750c0e3291ca6b75f71f7ffe1f1dab3dca", - "sha256:8ce257cac556cb03be4a248d92ed36904a59a4a5ff55a994e92214cde15c5bad", - "sha256:8cf5cfcb1521dc3255d845d9dca3ff204b3229401994ef8d1984b32746bb45ca", - "sha256:8fbbdc8d55990eac1b0919ca69eb5a988a802b854488c34b8f37f3e2025fa90d", - "sha256:9548f10d8be799551eb3a9c74bbf2b4934ddb330e08a73320123c07f95cc2d92", - "sha256:96f8a1cb43ca1422f36492bebe63312d396491a9165ed3b9231e778d43a7fca4", - "sha256:9b27d894748475fa858f9597c0ee1d4829f44683f3813633aaf94b19cb5453cf", - "sha256:9baff2a45ae1f17c8078452e9e5962e518eab705e50a0aa8083733ea7d45f3a6", - "sha256:a2a8b8bcc399edb4347a5ca8b9b87e7524c0967b335fbb08a83c8421489ddee1", - "sha256:acf53bc2cf7282ab9b8ba346746afe703474004d9e566ad164c91a7a59f188a4", - "sha256:b0be84e5a6209858a1d3e8d1806c46214e867ce1b0fd32e4ea03f4bd8b2e3359", - "sha256:b31651d018b23ec463e95cf10070d0b2c548aa950a03d0b559eaa11c7e5a6fa3", - "sha256:b78e5afb39941572209f71866aa0b206c12f0109835aa0d601e41552f9b3e620", - "sha256:c76aeef1b95aff3905fb2ae2d96e319caca5b76fa41d3470b19d4e4a3a313512", - "sha256:dd035edafefee4d573140a76fdc785dc38829fe5a455c4bb12bac8c20cfc3d69", - "sha256:dd6fe30bd519694b356cbfcaca9bd5c1737cddd20778c6a581ae20dc8c04def2", - "sha256:e5f4e1edcf57ce94e5475fe09e5afa3e3145081318e5fd1a43a6b4539a97e518", - "sha256:ec6bc7fe73a938933d4178c9b23c4e0568e43e220aef9472c4f6044bfc6dd0f0", - "sha256:f1555ea6d6da108e1999b2463ea1003fe03f29213e459145e70edbaf3e004aaa", - "sha256:f5fa5803f47e095d7ad8443d28b01d48c0359484fec1b9d8606d0e3282084bc4", - "sha256:f7331dbf301b7289013175087636bbaf5b2405e57259dd2c42fdcc9fcc47325e", - "sha256:f9987b0354b06d4df0f4d3e0ec1ae76d7ce7cbca9a2f98c25041eb79eec766f1", - "sha256:fd9e830e9d8d89b20ab1e5af09b32d33e1a08ef4c4e14411e559556fd788e6b2" - ], - "index": "pypi", - "version": "==6.3.2" - }, - "cryptography": { - "hashes": [ - "sha256:0e70da4bdff7601b0ef48e6348339e490ebfb0cbe638e083c9c41fb49f00c8bd", - "sha256:10652dd7282de17990b88679cb82f832752c4e8237f0c714be518044269415db", - "sha256:175c1a818b87c9ac80bb7377f5520b7f31b3ef2a0004e2420319beadedb67290", - "sha256:1d7e632804a248103b60b16fb145e8df0bc60eed790ece0d12efe8cd3f3e7744", - "sha256:1f13ddda26a04c06eb57119caf27a524ccae20533729f4b1e4a69b54e07035eb", - "sha256:2ec2a8714dd005949d4019195d72abed84198d877112abb5a27740e217e0ea8d", - "sha256:2fa36a7b2cc0998a3a4d5af26ccb6273f3df133d61da2ba13b3286261e7efb70", - "sha256:2fb481682873035600b5502f0015b664abc26466153fab5c6bc92c1ea69d478b", - "sha256:3178d46f363d4549b9a76264f41c6948752183b3f587666aff0555ac50fd7876", - "sha256:4367da5705922cf7070462e964f66e4ac24162e22ab0a2e9d31f1b270dd78083", - "sha256:4eb85075437f0b1fd8cd66c688469a0c4119e0ba855e3fef86691971b887caf6", - "sha256:50a1494ed0c3f5b4d07650a68cd6ca62efe8b596ce743a5c94403e6f11bf06c1", - "sha256:53049f3379ef05182864d13bb9686657659407148f901f3f1eee57a733fb4b00", - "sha256:6391e59ebe7c62d9902c24a4d8bcbc79a68e7c4ab65863536127c8a9cd94043b", - "sha256:67461b5ebca2e4c2ab991733f8ab637a7265bb582f07c7c88914b5afb88cb95b", - "sha256:78e47e28ddc4ace41dd38c42e6feecfdadf9c3be2af389abbfeef1ff06822285", - "sha256:80ca53981ceeb3241998443c4964a387771588c4e4a5d92735a493af868294f9", - "sha256:8a4b2bdb68a447fadebfd7d24855758fe2d6fecc7fed0b78d190b1af39a8e3b0", - "sha256:8e45653fb97eb2f20b8c96f9cd2b3a0654d742b47d638cf2897afbd97f80fa6d", - "sha256:998cd19189d8a747b226d24c0207fdaa1e6658a1d3f2494541cb9dfbf7dcb6d2", - "sha256:a10498349d4c8eab7357a8f9aa3463791292845b79597ad1b98a543686fb1ec8", - "sha256:b4cad0cea995af760f82820ab4ca54e5471fc782f70a007f31531957f43e9dee", - "sha256:bfe6472507986613dc6cc00b3d492b2f7564b02b3b3682d25ca7f40fa3fd321b", - "sha256:c9e0d79ee4c56d841bd4ac6e7697c8ff3c8d6da67379057f29e66acffcd1e9a7", - "sha256:ca57eb3ddaccd1112c18fc80abe41db443cc2e9dcb1917078e02dfa010a4f353", - "sha256:ce127dd0a6a0811c251a6cddd014d292728484e530d80e872ad9806cfb1c5b3c" - ], - "markers": "python_version >= '3.6'", - "version": "==38.0.4" - }, - "docutils": { - "hashes": [ - "sha256:33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6", - "sha256:5e1de4d849fee02c63b040a4a3fd567f4ab104defd8a5511fbbc24a8a017efbc" - ], - "markers": "python_version >= '3.7'", - "version": "==0.19" - }, - "idna": { - "hashes": [ - "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4", - "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2" - ], - "markers": "python_version >= '3.5'", - "version": "==3.4" - }, - "importlib-metadata": { - "hashes": [ - "sha256:d5059f9f1e8e41f80e9c56c2ee58811450c31984dfa625329ffd7c0dad88a73b", - "sha256:d84d17e21670ec07990e1044a99efe8d615d860fd176fc29ef5c306068fda313" - ], - "markers": "python_version >= '3.7'", - "version": "==5.1.0" - }, - "jaraco.classes": { - "hashes": [ - "sha256:2353de3288bc6b82120752201c6b1c1a14b058267fa424ed5ce5984e3b922158", - "sha256:89559fa5c1d3c34eff6f631ad80bb21f378dbcbb35dd161fd2c6b93f5be2f98a" - ], - "markers": "python_version >= '3.7'", - "version": "==3.2.3" - }, - "jeepney": { - "hashes": [ - "sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806", - "sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755" - ], - "markers": "sys_platform == 'linux'", - "version": "==0.8.0" - }, - "keyring": { - "hashes": [ - "sha256:3dd30011d555f1345dec2c262f0153f2f0ca6bca041fb1dc4588349bb4c0ac1e", - "sha256:ad192263e2cdd5f12875dedc2da13534359a7e760e77f8d04b50968a821c2361" - ], - "markers": "python_version >= '3.7'", - "version": "==23.11.0" - }, - "more-itertools": { - "hashes": [ - "sha256:250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41", - "sha256:5a6257e40878ef0520b1803990e3e22303a41b5714006c32a3fd8304b26ea1ab" - ], - "markers": "python_version >= '3.7'", - "version": "==9.0.0" - }, - "nose-py3": { - "hashes": [ - "sha256:560de1e49a1dbd677ff5b2858c683bba32345d468c962e534fb2e5830d3d24ed", - "sha256:ce0b8ffa7dec78158dba58dc4fce26465a341a36acacbeaa1ce1149b9ff1b963" - ], - "index": "pypi", - "version": "==1.4.0" - }, - "numpy": { - "hashes": [ - "sha256:07a8c89a04997625236c5ecb7afe35a02af3896c8aa01890a849913a2309c676", - "sha256:08d9b008d0156c70dc392bb3ab3abb6e7a711383c3247b410b39962263576cd4", - "sha256:201b4d0552831f7250a08d3b38de0d989d6f6e4658b709a02a73c524ccc6ffce", - "sha256:2c10a93606e0b4b95c9b04b77dc349b398fdfbda382d2a39ba5a822f669a0123", - "sha256:3ca688e1b9b95d80250bca34b11a05e389b1420d00e87a0d12dc45f131f704a1", - "sha256:48a3aecd3b997bf452a2dedb11f4e79bc5bfd21a1d4cc760e703c31d57c84b3e", - "sha256:568dfd16224abddafb1cbcce2ff14f522abe037268514dd7e42c6776a1c3f8e5", - "sha256:5bfb1bb598e8229c2d5d48db1860bcf4311337864ea3efdbe1171fb0c5da515d", - "sha256:639b54cdf6aa4f82fe37ebf70401bbb74b8508fddcf4797f9fe59615b8c5813a", - "sha256:8251ed96f38b47b4295b1ae51631de7ffa8260b5b087808ef09a39a9d66c97ab", - "sha256:92bfa69cfbdf7dfc3040978ad09a48091143cffb778ec3b03fa170c494118d75", - "sha256:97098b95aa4e418529099c26558eeb8486e66bd1e53a6b606d684d0c3616b168", - "sha256:a3bae1a2ed00e90b3ba5f7bd0a7c7999b55d609e0c54ceb2b076a25e345fa9f4", - "sha256:c34ea7e9d13a70bf2ab64a2532fe149a9aced424cd05a2c4ba662fd989e3e45f", - "sha256:dbc7601a3b7472d559dc7b933b18b4b66f9aa7452c120e87dfb33d02008c8a18", - "sha256:e7927a589df200c5e23c57970bafbd0cd322459aa7b1ff73b7c2e84d6e3eae62", - "sha256:f8c1f39caad2c896bc0018f699882b345b2a63708008be29b1f355ebf6f933fe", - "sha256:f950f8845b480cffe522913d35567e29dd381b0dc7e4ce6a4a9f9156417d2430", - "sha256:fade0d4f4d292b6f39951b6836d7a3c7ef5b2347f3c420cd9820a1d90d794802", - "sha256:fdf3c08bce27132395d3c3ba1503cac12e17282358cb4bddc25cc46b0aca07aa" - ], - "index": "pypi", - "version": "==1.22.3" - }, - "pkginfo": { - "hashes": [ - "sha256:ac03e37e4d601aaee40f8087f63fc4a2a6c9814dda2c8fa6aab1b1829653bdfa", - "sha256:d580059503f2f4549ad6e4c106d7437356dbd430e2c7df99ee1efe03d75f691e" - ], - "markers": "python_version >= '3.6'", - "version": "==1.9.2" - }, - "pycparser": { - "hashes": [ - "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9", - "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206" - ], - "version": "==2.21" - }, - "pygments": { - "hashes": [ - "sha256:56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1", - "sha256:f643f331ab57ba3c9d89212ee4a2dabc6e94f117cf4eefde99a0574720d14c42" - ], - "markers": "python_version >= '3.6'", - "version": "==2.13.0" - }, - "readme-renderer": { - "hashes": [ - "sha256:cd653186dfc73055656f090f227f5cb22a046d7f71a841dfa305f55c9a513273", - "sha256:f67a16caedfa71eef48a31b39708637a6f4664c4394801a7b0d6432d13907343" - ], - "markers": "python_version >= '3.7'", - "version": "==37.3" - }, - "requests": { - "hashes": [ - "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983", - "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349" - ], - "markers": "python_version >= '3.7' and python_version < '4'", - "version": "==2.28.1" - }, - "requests-toolbelt": { - "hashes": [ - "sha256:18565aa58116d9951ac39baa288d3adb5b3ff975c4f25eee78555d89e8f247f7", - "sha256:62e09f7ff5ccbda92772a29f394a49c3ad6cb181d568b1337626b2abb628a63d" - ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==0.10.1" - }, - "rfc3986": { - "hashes": [ - "sha256:50b1502b60e289cb37883f3dfd34532b8873c7de9f49bb546641ce9cbd256ebd", - "sha256:97aacf9dbd4bfd829baad6e6309fa6573aaf1be3f6fa735c8ab05e46cecb261c" - ], - "markers": "python_version >= '3.7'", - "version": "==2.0.0" - }, - "secretstorage": { - "hashes": [ - "sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77", - "sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99" - ], - "markers": "sys_platform == 'linux'", - "version": "==3.3.3" - }, - "six": { - "hashes": [ - "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", - "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" - ], - "index": "pypi", - "version": "==1.16.0" - }, - "tqdm": { - "hashes": [ - "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4", - "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1" - ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==4.64.1" - }, - "twine": { - "hashes": [ - "sha256:8efa52658e0ae770686a13b675569328f1fba9837e5de1867bfe5f46a9aefe19", - "sha256:d0550fca9dc19f3d5e8eadfce0c227294df0a2a951251a4385797c8a6198b7c8" - ], - "index": "pypi", - "version": "==3.8.0" - }, - "urllib3": { - "hashes": [ - "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc", - "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8" - ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", - "version": "==1.26.13" - }, - "webencodings": { - "hashes": [ - "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78", - "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923" - ], - "version": "==0.5.1" - }, - "zipp": { - "hashes": [ - "sha256:83a28fcb75844b5c0cdaf5aa4003c2d728c77e05f5aeabe8e95e56727005fbaa", - "sha256:a7a22e05929290a67401440b39690ae6563279bced5f314609d9d03798f56766" - ], - "markers": "python_version >= '3.7'", - "version": "==3.11.0" - } - } -} diff --git a/doc/release.md b/doc/release.md index b64332a7a..1c3bd313a 100644 --- a/doc/release.md +++ b/doc/release.md @@ -1,9 +1,10 @@ # Release 1. Move all the WIP changes under a new version in the [changelog](../CHANGELOG.md) -2. Increment the version in [constants.py](../mackup/constants.py) -3. `git commit` with the message `Mackup X.Y.Z` -4. `git tag ` -5. `git push` -6. `git push --tags` -7. `make release` +1. Increment the version in [constants.py](../mackup/constants.py) +1. Increment the version in [pyproject.toml](../pyproject.toml) +1. `git commit` with the message `Mackup X.Y.Z` +1. `git tag ` +1. `git push` +1. `git push --tags` +1. `make release` diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 2a9acf13d..000000000 --- a/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal = 1 diff --git a/setup.py b/setup.py deleted file mode 100644 index 6d61e73f5..000000000 --- a/setup.py +++ /dev/null @@ -1,32 +0,0 @@ -"""Setup file to automate the install of Mackup in the Python environment.""" -from setuptools import setup -from mackup.constants import VERSION - - -setup( - name="mackup", - version=VERSION, - author="Laurent Raufaste", - author_email="analogue@glop.org", - url="https://github.com/lra/mackup", - description="Keep your application settings in sync (macOS/Linux)", - keywords="configuration config dotfiles sync backup dropbox gdrive box", - license="GPLv3", - packages=["mackup"], - install_requires=["docopt", "six"], - entry_points={"console_scripts": ["mackup=mackup.main:main"]}, - package_data={"mackup": ["applications/*.cfg"]}, - classifiers=[ - "Development Status :: 4 - Beta", - "Environment :: Console", - "Intended Audience :: End Users/Desktop", - ( - "License :: OSI Approved :: " - "GNU General Public License v3 or later (GPLv3+)" - ), - "Natural Language :: English", - "Operating System :: POSIX", - "Programming Language :: Python", - "Topic :: Utilities", - ], -) From 077dd4ecece9428c9ecff2719886d9692bd50da2 Mon Sep 17 00:00:00 2001 From: Angelo Alfano Date: Sat, 4 Nov 2023 21:48:58 +0100 Subject: [PATCH 393/406] Updated support for JetBrains products version 2023.1 e 2023.2 (#1935) * added 2023 releases for jetbrains products * CHANGELOG updated * missing newline at end of file * Update CHANGELOG.md --------- Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 8 ++++++++ mackup/applications/clion.cfg | 2 ++ mackup/applications/datagrip.cfg | 2 ++ mackup/applications/goland.cfg | 2 ++ mackup/applications/intellijidea.cfg | 2 ++ mackup/applications/phpstorm.cfg | 2 ++ mackup/applications/pycharm.cfg | 2 ++ mackup/applications/rubymine.cfg | 2 ++ mackup/applications/webstorm.cfg | 2 ++ 9 files changed, 24 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a934d4c4..b70272e8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ ## WIP +- Updated support for IntelliJIdea version 2023.1 and 2023.2 +- Updated support for CLion version 2023.1 and 2023.2 +- Updated support for DataGrip version 2023.1 and 2023.2 +- Updated support for GoLand version 2023.1 and 2023.2 +- Updated support for PhpStorm version 2023.1 and 2023.2 +- Updated support for PyCharm version 2023.1 and 2023.2 +- Updated support for RubyMine version 2023.1 and 2023.2 +- Updated support for WebStorm version 2023.1 and 2023.2 - Removed support for kindaVim (via @godbout) - Removed support for Wooshy (via @godbout) - Removed support for Scrolla (via @godbout) diff --git a/mackup/applications/clion.cfg b/mackup/applications/clion.cfg index 88e256af5..b6cb99cdf 100644 --- a/mackup/applications/clion.cfg +++ b/mackup/applications/clion.cfg @@ -4,3 +4,5 @@ name = CLion [configuration_files] Library/Preferences/CLion2016.2 Library/Application Support/CLion2016.2 +Library/Application Support/JetBrains/CLion2023.1 +Library/Application Support/JetBrains/CLion2023.2 diff --git a/mackup/applications/datagrip.cfg b/mackup/applications/datagrip.cfg index d2f3441a0..36b73e089 100644 --- a/mackup/applications/datagrip.cfg +++ b/mackup/applications/datagrip.cfg @@ -13,3 +13,5 @@ Library/Preferences/DataGrip2018.3 Library/Application Support/DataGrip2019.1 Library/Preferences/DataGrip2019.1 Library/Preferences/DataGrip2019.2 +Library/Application Support/JetBrains/DataGrip2023.1 +Library/Application Support/JetBrains/DataGrip2023.2 diff --git a/mackup/applications/goland.cfg b/mackup/applications/goland.cfg index 8928efe54..e5e0f2fdf 100644 --- a/mackup/applications/goland.cfg +++ b/mackup/applications/goland.cfg @@ -15,3 +15,5 @@ Library/Preferences/GoLand2018.1 Library/Preferences/GoLand2018.2 Library/Preferences/GoLand2018.3 Library/Preferences/GoLand2019.2 +Library/Application Support/JetBrains/GoLand2023.1 +Library/Application Support/JetBrains/GoLand2023.2 diff --git a/mackup/applications/intellijidea.cfg b/mackup/applications/intellijidea.cfg index 70ee44885..fb42e8dba 100644 --- a/mackup/applications/intellijidea.cfg +++ b/mackup/applications/intellijidea.cfg @@ -52,6 +52,8 @@ Library/Application Support/JetBrains/IntelliJIdea2020.3 Library/Application Support/JetBrains/IntelliJIdea2021.1 Library/Application Support/JetBrains/IntelliJIdea2022.1 Library/Application Support/JetBrains/IntelliJIdea2022.2 +Library/Application Support/JetBrains/IntelliJIdea2023.1 +Library/Application Support/JetBrains/IntelliJIdea2023.2 Library/Preferences/IdeaIC2016.1 Library/Preferences/IdeaIC2016.2 Library/Preferences/IdeaIC2016.3 diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg index 2f3e5bd78..9977d4298 100644 --- a/mackup/applications/phpstorm.cfg +++ b/mackup/applications/phpstorm.cfg @@ -11,6 +11,8 @@ Library/Application Support/JetBrains/PhpStorm2021.3 Library/Application Support/JetBrains/PhpStorm2022.1 Library/Application Support/JetBrains/PhpStorm2022.2 Library/Application Support/JetBrains/PhpStorm2022.3 +Library/Application Support/JetBrains/PhpStorm2023.1 +Library/Application Support/JetBrains/PhpStorm2023.2 Library/Application Support/PhpStorm2016.1 Library/Application Support/PhpStorm2016.2 Library/Application Support/PhpStorm2016.3 diff --git a/mackup/applications/pycharm.cfg b/mackup/applications/pycharm.cfg index ae050b77e..c6fbaf6f7 100644 --- a/mackup/applications/pycharm.cfg +++ b/mackup/applications/pycharm.cfg @@ -12,6 +12,8 @@ Library/Application Support/JetBrains/PyCharm2020.2 Library/Application Support/JetBrains/PyCharm2020.3 Library/Application Support/JetBrains/PyCharm2020.4 Library/Application Support/JetBrains/PyCharmCE2020.1 +Library/Application Support/JetBrains/PyCharm2023.1 +Library/Application Support/JetBrains/PyCharm2023.2 Library/Application Support/PyCharm Library/Application Support/PyCharm2016.1 Library/Application Support/PyCharm2016.2 diff --git a/mackup/applications/rubymine.cfg b/mackup/applications/rubymine.cfg index 7a996e937..962114c19 100644 --- a/mackup/applications/rubymine.cfg +++ b/mackup/applications/rubymine.cfg @@ -22,3 +22,5 @@ Library/Application Support/RubyMine2017.3 Library/Preferences/RubyMine2017.3 Library/Application Support/RubyMine2018.1 Library/Preferences/RubyMine2018.1 +Library/Application Support/JetBrains/RubyMine2023.1 +Library/Application Support/JetBrains/RubyMine2023.2 diff --git a/mackup/applications/webstorm.cfg b/mackup/applications/webstorm.cfg index 9b474d822..f6aac155e 100644 --- a/mackup/applications/webstorm.cfg +++ b/mackup/applications/webstorm.cfg @@ -9,6 +9,8 @@ Library/Application Support/JetBrains/WebStorm2020.4 Library/Application Support/JetBrains/WebStorm2021.1 Library/Application Support/JetBrains/WebStorm2021.2 Library/Application Support/JetBrains/WebStorm2021.3 +Library/Application Support/JetBrains/WebStorm2023.1 +Library/Application Support/JetBrains/WebStorm2023.2 Library/Application Support/WebStorm Library/Application Support/WebStorm10 Library/Application Support/WebStorm11 From f018c5425c501991dfc2b96734fd2cac93d1d5e3 Mon Sep 17 00:00:00 2001 From: Seth Herr Date: Sat, 4 Nov 2023 13:50:35 -0700 Subject: [PATCH 394/406] Add zed (#1932) * Add zed * add newline * Specify files to backup --------- Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/zed.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/zed.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b70272e8d..43d51e0fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Added support for Zed (via @sethherr) - Updated support for IntelliJIdea version 2023.1 and 2023.2 - Updated support for CLion version 2023.1 and 2023.2 - Updated support for DataGrip version 2023.1 and 2023.2 diff --git a/README.md b/README.md index 9c4110c8b..9befbc283 100644 --- a/README.md +++ b/README.md @@ -719,6 +719,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Yummy FTP](http://www.yummysoftware.com/) - [zabbix-cli](https://github.com/usit-gd/zabbix-cli) - [zathura](https://pwmt.org/projects/zathura/) +- [zed](https://zed.dev/) - [Zoom](http://zoom.com/) - [zoxide](https://github.com/ajeetdsouza/zoxide) - [Zsh](http://zsh.sourceforge.net/) diff --git a/mackup/applications/zed.cfg b/mackup/applications/zed.cfg new file mode 100644 index 000000000..052feafff --- /dev/null +++ b/mackup/applications/zed.cfg @@ -0,0 +1,6 @@ +[application] +name = Zed + +[xdg_configuration_files] +zed/keymap.json +zed/settings.json From a8ccd35db336dffefa2cf4048a2e61892ea38db0 Mon Sep 17 00:00:00 2001 From: Janis Puris <4112811+jpuris@users.noreply.github.com> Date: Sat, 4 Nov 2023 21:52:05 +0100 Subject: [PATCH 395/406] Update factorio application, support for blueprints storage (#1928) * feat: add factorio blueprint file * update CHANGELOG.md --------- Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/factorio.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43d51e0fc..504c2f497 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Updated support for Factorio (via @jpuris) - Added support for Zed (via @sethherr) - Updated support for IntelliJIdea version 2023.1 and 2023.2 - Updated support for CLion version 2023.1 and 2023.2 diff --git a/mackup/applications/factorio.cfg b/mackup/applications/factorio.cfg index 14536bcb2..f33c8d483 100644 --- a/mackup/applications/factorio.cfg +++ b/mackup/applications/factorio.cfg @@ -6,3 +6,4 @@ Library/Application Support/factorio/config Library/Application Support/factorio/mods Library/Application Support/factorio/saves Library/Application Support/factorio/player-data.json +Library/Application Support/factorio/blueprint-storage.dat From d49a2eb09955ec3f9c6854b2cd85393d40451f39 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 4 Nov 2023 22:12:37 +0100 Subject: [PATCH 396/406] Try macOS on GHA (#1755) * Try macOS on GHA * see path * update macos * More versions tested * Typos * checkout v4 --- .github/workflows/install.yaml | 22 +++++++++++++++++++--- .github/workflows/linelint.yaml | 2 +- .github/workflows/lint.yaml | 2 +- .github/workflows/test.yaml | 4 ++-- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml index 6b9027cb0..341598699 100644 --- a/.github/workflows/install.yaml +++ b/.github/workflows/install.yaml @@ -3,18 +3,34 @@ on: pull_request jobs: - install: + install-on-linux: strategy: matrix: + os: + - "ubuntu-20.04" + - "ubuntu-22.04" python-version: - "3.8" - "3.9" - "3.10" - "3.11" - "3.12" - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} container: python:${{ matrix.python-version }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 + - run: pip install . + - run: mackup --help + + install-on-macos: + strategy: + matrix: + os: + - macos-11 + - macos-12 + - macos-13 + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 - run: pip install . - run: mackup --help diff --git a/.github/workflows/linelint.yaml b/.github/workflows/linelint.yaml index f7ee8c00b..9f81640d3 100644 --- a/.github/workflows/linelint.yaml +++ b/.github/workflows/linelint.yaml @@ -11,6 +11,6 @@ jobs: name: Check if all files end with a newline character steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Linelint uses: fernandrone/linelint@master diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 31d79f6c1..1c9910e33 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -10,5 +10,5 @@ jobs: container: python steps: - run: pip install black - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - run: black --check --target-version py310 . diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 714174fe6..bddae6b8f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -8,7 +8,7 @@ jobs: container: python:2.7 steps: - run: pip install docopt six nose - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - run: nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup nose: @@ -26,5 +26,5 @@ jobs: - run: echo "${HOME}/.local/bin" >> $GITHUB_PATH - run: pip install pipx - run: pipx install poetry - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - run: make test From b7569ee4a8ce0e54a57848301034838503738c1c Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 4 Nov 2023 22:14:29 +0100 Subject: [PATCH 397/406] Mackup 0.8.39 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- pyproject.toml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 504c2f497..735b1de5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.39 + - Updated support for Factorio (via @jpuris) - Added support for Zed (via @sethherr) - Updated support for IntelliJIdea version 2023.1 and 2023.2 diff --git a/mackup/constants.py b/mackup/constants.py index 811a8bb49..f91d497c5 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = "0.8.38" +VERSION = "0.8.39" # Support platforms PLATFORM_DARWIN = "Darwin" diff --git a/pyproject.toml b/pyproject.toml index ea2397725..883fa3486 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "mackup" -version = "0.8.38" +version = "0.8.39" description = "Keep your application settings in sync (macOS/Linux)" authors = ["Laurent Raufaste "] license = "GPLv3" From b246382d31636c2bea60b6b1c8e8a0e114321ecc Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 5 Nov 2023 22:42:18 +0100 Subject: [PATCH 398/406] Remve support for Apple Preview, problematic on macOS 14.1 (#1956) --- CHANGELOG.md | 2 ++ README.md | 1 - mackup/applications/preview.cfg | 6 ------ 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 mackup/applications/preview.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 735b1de5a..42f338726 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Remve support for Apple Preview, problematic on macOS 14.1 + ## Mackup 0.8.39 - Updated support for Factorio (via @jpuris) diff --git a/README.md b/README.md index 9befbc283..bc249a37b 100644 --- a/README.md +++ b/README.md @@ -438,7 +438,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [LunarVim](https://www.lunarvim.org/) - [MacDive](http://www.mac-dive.com/) - [MacDown](http://macdown.uranusjr.com/) -- macOS Preview - [MacOSX](http://www.apple.com/osx/) - [MacVim](https://github.com/macvim-dev/macvim) - [Magic Launch](https://www.oneperiodic.com/products/magiclaunch/) diff --git a/mackup/applications/preview.cfg b/mackup/applications/preview.cfg deleted file mode 100644 index 289c0152a..000000000 --- a/mackup/applications/preview.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[application] -name = Preview - -# https://apple.stackexchange.com/questions/74950/can-i-export-my-signature-from-preview-on-one-mac-and-import-it-on-another -[configuration_files] -Library/Group Containers/com.apple.PreviewLegacySignaturesConversion/Library/Preferences From ef7d7c242aca14e987269690ac73289e9c9c3551 Mon Sep 17 00:00:00 2001 From: yuchen-lea Date: Mon, 6 Nov 2023 05:46:32 +0800 Subject: [PATCH 399/406] Update geektool config (#1926) * Update geektool.cfg refers to https://www.tynsoe.org/geektool/documentation/ * Update CHANGELOG.md * Update CHANGELOG.md --------- Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + mackup/applications/geektool.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42f338726..86903c380 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Updated support for GeekTool (via @yuchen-lea) - Remve support for Apple Preview, problematic on macOS 14.1 ## Mackup 0.8.39 diff --git a/mackup/applications/geektool.cfg b/mackup/applications/geektool.cfg index da67ed563..0de55119b 100644 --- a/mackup/applications/geektool.cfg +++ b/mackup/applications/geektool.cfg @@ -6,4 +6,5 @@ Library/Preferences/org.tynsoe.GeekTool.plist Library/Preferences/org.tynsoe.geeklet.file.plist Library/Preferences/org.tynsoe.geeklet.image.plist Library/Preferences/org.tynsoe.geeklet.shell.plist +Library/Preferences/org.tynsoe.geeklet.web.plist Library/Preferences/org.tynsoe.geektool3.plist From b5c22bfc87e017bc32203a5e1d85105dfdc4727d Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 5 Nov 2023 23:07:01 +0100 Subject: [PATCH 400/406] Remove support for the Copy engine (#1957) * Remove support for the Copy engine fixes #1691 * Also remove tests * Update Makefile * Update utils_test.py --- Makefile | 3 +- README.md | 1 - mackup/config.py | 7 +---- mackup/constants.py | 1 - mackup/utils.py | 28 ------------------ tests/config_tests.py | 19 ------------ .../Application Support/Copy Agent/config.db | Bin 3072 -> 0 bytes tests/fixtures/mackup-engine-copy.cfg | 12 -------- tests/utils_test.py | 8 +---- 9 files changed, 4 insertions(+), 75 deletions(-) delete mode 100644 tests/fixtures/Library/Application Support/Copy Agent/config.db delete mode 100644 tests/fixtures/mackup-engine-copy.cfg diff --git a/Makefile b/Makefile index 56fa2ef46..979fbba7a 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,9 @@ test: clean: rm -rf __pycache__ + rm -rf mackup/__pycache__ + rm -rf tests/__pycache__ rm -rf dist/ - rm -rf Mackup.egg-info/ release: clean poetry build diff --git a/README.md b/README.md index bc249a37b..dd8a81a36 100644 --- a/README.md +++ b/README.md @@ -155,7 +155,6 @@ in it stay put, so that any other computer also running Mackup is unaffected. - [Dropbox](https://www.dropbox.com/) - [Google Drive](https://drive.google.com/) -- [Copy](https://www.copy.com/) - [iCloud](http://www.apple.com/icloud/) - Anything able to sync a folder (e.g. [Git](http://git-scm.com/)) diff --git a/mackup/config.py b/mackup/config.py index 870a390d6..9ad9a36d1 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -9,7 +9,6 @@ MACKUP_CONFIG_FILE, ENGINE_DROPBOX, ENGINE_GDRIVE, - ENGINE_COPY, ENGINE_ICLOUD, ENGINE_FS, ) @@ -17,7 +16,6 @@ from .utils import ( error, get_dropbox_folder_location, - get_copy_folder_location, get_google_drive_folder_location, get_icloud_folder_location, ) @@ -68,7 +66,7 @@ def engine(self): """ The engine used by the storage. - ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_COPY, ENGINE_ICLOUD or ENGINE_FS. + ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_ICLOUD or ENGINE_FS. Returns: str @@ -191,7 +189,6 @@ def _parse_engine(self): if engine not in [ ENGINE_DROPBOX, ENGINE_GDRIVE, - ENGINE_COPY, ENGINE_ICLOUD, ENGINE_FS, ]: @@ -210,8 +207,6 @@ def _parse_path(self): path = get_dropbox_folder_location() elif self.engine == ENGINE_GDRIVE: path = get_google_drive_folder_location() - elif self.engine == ENGINE_COPY: - path = get_copy_folder_location() elif self.engine == ENGINE_ICLOUD: path = get_icloud_folder_location() elif self.engine == ENGINE_FS: diff --git a/mackup/constants.py b/mackup/constants.py index f91d497c5..28fb5fd08 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -22,7 +22,6 @@ CUSTOM_APPS_DIR = ".mackup" # Supported engines -ENGINE_COPY = "copy" ENGINE_DROPBOX = "dropbox" ENGINE_FS = "file_system" ENGINE_GDRIVE = "google_drive" diff --git a/mackup/utils.py b/mackup/utils.py index 7ebc73e30..6cf005f45 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -253,34 +253,6 @@ def get_google_drive_folder_location(): return googledrive_home -def get_copy_folder_location(): - """ - Try to locate the Copy folder. - - Returns: - (str) Full path to the current Copy folder - """ - copy_settings_path = "Library/Application Support/Copy Agent/config.db" - copy_home = None - - copy_settings = os.path.join(os.environ["HOME"], copy_settings_path) - - if os.path.isfile(copy_settings): - database = sqlite3.connect(copy_settings) - if database: - cur = database.cursor() - query = "SELECT value " "FROM config2 " "WHERE option = 'csmRootPath';" - cur.execute(query) - data = cur.fetchone() - copy_home = str(data[0]) - cur.close() - - if not copy_home: - error(constants.ERROR_UNABLE_TO_FIND_STORAGE.format(provider="Copy install")) - - return copy_home - - def get_icloud_folder_location(): """ Try to locate the iCloud Drive folder. diff --git a/tests/config_tests.py b/tests/config_tests.py index fa07c8c2c..08109b3cc 100644 --- a/tests/config_tests.py +++ b/tests/config_tests.py @@ -4,7 +4,6 @@ from mackup.constants import ( ENGINE_DROPBOX, ENGINE_GDRIVE, - ENGINE_COPY, ENGINE_ICLOUD, ENGINE_FS, ) @@ -130,24 +129,6 @@ def test_config_engine_google_drive(self): assert cfg.apps_to_ignore == set(["subversion", "sequel-pro", "sabnzbd"]) assert cfg.apps_to_sync == set(["sublime-text-3", "x11", "sabnzbd"]) - def test_config_engine_copy(self): - cfg = Config("mackup-engine-copy.cfg") - - assert isinstance(cfg.engine, str) - assert cfg.engine == ENGINE_COPY - - assert isinstance(cfg.path, str) - assert cfg.path == "/Users/someuser/Copy" - - assert isinstance(cfg.directory, str) - assert cfg.directory == "Mackup" - - assert isinstance(cfg.fullpath, str) - assert cfg.fullpath.endswith("/Copy/Mackup") - - assert cfg.apps_to_ignore == set(["subversion", "sequel-pro", "sabnzbd"]) - assert cfg.apps_to_sync == set(["sublime-text-3", "x11", "sabnzbd"]) - def test_config_engine_icloud(self): cfg = Config("mackup-engine-icloud.cfg") diff --git a/tests/fixtures/Library/Application Support/Copy Agent/config.db b/tests/fixtures/Library/Application Support/Copy Agent/config.db deleted file mode 100644 index 5903ca1db9a59ff2815980f9526844785e96b04b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3072 zcmeHJOKcle6n(!IrI0#b;t+xzxh6!eb(2VL;^tF{@=2a&p6wyy8F%K{ zYL@LFB*dochy@a`uaH1u*A1eZELZ{+g#Z(U@ja60R9O8z~Wo~K=Fgr1#y@1BR(QW{O*x<{1-sD2yhYa zJtE-He2BpR5djT8(Kj#vuZB3y8%(v#f?iDeH#EPRNv~(Z>*+JuOxRbxU{$zonc*6> z)e^PC8_P=wjoXdvT>`hwbmM3re znKu>xhum$_4sL)T*bU$};pcD`+=n~pIQ$sw;`hN9;1jeBM<7EVqPNjHUd2gxA3udA z;a&LNV?LxCU?xI=>XcV4i{~gWB{m#pI|**nn(iddGH07xl|O zJKfhP841YP47H7&w5l@4QD77tjZFmISBcUoZ5tJha(1Sw8`_#-@gf~|Um>vxX__~z zs+QI?Tf~((uQ)Fz611X^sv^0#l%J20*^qQxwzyu)^>jcwO9ro$eM1d9kwl zgUH@EiF=VPrz_|L=^?eHbj z;nXk`JP6QD&~*@vcfpB>5c^$&Bzi%C)+}2LnR8YbU2WEq5)!oE$Y-A1UQ?vOH;Av&u|Vl#Rw@ z6Vj9^Q{7-!^ctP>uA?U7!lM$udRn@)oO?c-T{(YlDVNP=78bG#x#h)(yG82VF*@!!0LD`1BLQFNLFX3>T(ekXWo$etd z<~^J>PHmp%VtjN{!JmOP1*rIT$ekmJA(>F3axn1gdYLKXN>VvBo*bJN%lK0Cwfd1B z;Hk-JC6!MplT%X~J(bEQr^ZvM6lH93oH0dBQbkQEW7F&ydIkjHUI4v=7SR~|1HX$W z;2rb-Tq4iI&l<#J71976k~*Jv;1;?Cj;I|tQqL&&0shj1V^Yz~t?+9c0KVhAalno6 z&LEzJ!m)+j8r&Mgi+-&QhJfD(#pH>IhnTd#2ge^u6+ezcvJkoTOB(zZ_ks=~)=9D# zW4|AN3E>ajI0pYkkllXO^(go|z6h`b@FmdZ<(BY0L~`)gE<7yHe!!*hH@}?*3Be!n zm!Pje#kI4kF8H$#pmeO09Nh24@p>~2c7xyf+7{M=-^e~h#%8V%|H?aX6gKnrjF`KC SaI3#}`>^7j(E7TBxBmfAcsC#b diff --git a/tests/fixtures/mackup-engine-copy.cfg b/tests/fixtures/mackup-engine-copy.cfg deleted file mode 100644 index 901c2cb09..000000000 --- a/tests/fixtures/mackup-engine-copy.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[storage] -engine = copy - -[applications_to_ignore] -subversion -sequel-pro -sabnzbd - -[applications_to_sync] -sabnzbd -sublime-text-3 -x11 diff --git a/tests/utils_test.py b/tests/utils_test.py index 36b76e2f4..0fbf4fe81 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -279,7 +279,7 @@ def test_error(self): def test_failed_backup_location(self): """ Tests for the error that should occur if the backup folder cannot be - found for Dropbox, Google, and Copy + found for Dropbox and Google """ # Hack to make our home folder some temporary folder temp_home = tempfile.mkdtemp() @@ -297,12 +297,6 @@ def test_failed_backup_location(self): ) self.assertRaises(SystemExit, utils.get_google_drive_folder_location) - # Check for the missing Copy Folder - assert not os.path.exists( - os.path.join(temp_home, "Library/Application Support/Copy Agent/config.db") - ) - self.assertRaises(SystemExit, utils.get_copy_folder_location) - def test_is_process_running(self): # A pgrep that has one letter and a wildcard will always return id 1 assert utils.is_process_running("a*") From f94a50cb8b8bf4db9a6a0e0e701371a53428cb4d Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 5 Nov 2023 23:13:49 +0100 Subject: [PATCH 401/406] Smol soft boi/master (#1958) * Added support for Subler * missing newline --------- Co-authored-by: Kristian Matthews --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/subler.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/subler.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 86903c380..0c18cea3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Updated support for GeekTool (via @yuchen-lea) - Remve support for Apple Preview, problematic on macOS 14.1 +- Added support for Subler (via @EpicKris) ## Mackup 0.8.39 diff --git a/README.md b/README.md index dd8a81a36..bf034edca 100644 --- a/README.md +++ b/README.md @@ -632,6 +632,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Stats](https://github.com/exelban/stats) - [Stay](https://cordlessdog.com/stay/) - [Storyist](http://storyist.com/) +- [Subler](https://subler.org) - [Sublime Merge](https://www.sublimemerge.com/) - [Sublime Text](http://www.sublimetext.com/) - [Subversion](http://subversion.apache.org/) diff --git a/mackup/applications/subler.cfg b/mackup/applications/subler.cfg new file mode 100644 index 000000000..64593a6fa --- /dev/null +++ b/mackup/applications/subler.cfg @@ -0,0 +1,5 @@ +[application] +name = Subler + +[configuration_files] +Library/Application Support/Subler From 5b128b15eb849e7797b7c199267f735e9a47c5d5 Mon Sep 17 00:00:00 2001 From: Ralph Date: Sun, 5 Nov 2023 15:43:25 -0700 Subject: [PATCH 402/406] Added support for Sqitch sensible database change management (#1570) Co-authored-by: Ralph Andrade Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/sqitch.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/sqitch.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c18cea3f..2da751b68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Added support for Sqitch (via @ra1fee) - Updated support for GeekTool (via @yuchen-lea) - Remve support for Apple Preview, problematic on macOS 14.1 - Added support for Subler (via @EpicKris) diff --git a/README.md b/README.md index bf034edca..51bacf288 100644 --- a/README.md +++ b/README.md @@ -626,6 +626,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Splice](https://splice.com/) - [Spotify Notifications](http://spotify-notifications.citruspi.io/) - [Spotify](https://www.spotify.com/) +- [Sqitch](https://sqitch.org/) - [Starship](https://starship.rs/) - [Startupizer2](http://appledoc.gentlebytes.com/startupizer/) - [Stata](http://www.stata.com/) diff --git a/mackup/applications/sqitch.cfg b/mackup/applications/sqitch.cfg new file mode 100644 index 000000000..f5ab2e763 --- /dev/null +++ b/mackup/applications/sqitch.cfg @@ -0,0 +1,5 @@ +[application] +name = Sqitch + +[configuration_files] +.sqitch/sqitch.conf From 728126b1186e65bea4c898ec032b068f153f98d4 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 5 Nov 2023 23:53:34 +0100 Subject: [PATCH 403/406] Spamsieve (#1959) * Added support for SpamSieve App * Added entry in CHANGELOG and README. Removed empty line. * Removed swp files. Changed alphabetical order in README.md * Removed trailing slash in spamsieve.cfg * Changed link in README.md * Update CHANGELOG.md --------- Co-authored-by: Michael Grossklos --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/spamsieve.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/spamsieve.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 2da751b68..b97405528 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Updated support for GeekTool (via @yuchen-lea) - Remve support for Apple Preview, problematic on macOS 14.1 - Added support for Subler (via @EpicKris) +- Added support for SpamSieve (via @michaelgrossklos) ## Mackup 0.8.39 diff --git a/README.md b/README.md index 51bacf288..364097f9c 100644 --- a/README.md +++ b/README.md @@ -620,6 +620,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [SpaceLauncher](https://spacelauncherapp.com) - [Spacemacs](https://github.com/syl20bnr/spacemacs) - [SpaceVim](https://github.com/SpaceVim/SpaceVim) +- [SpamSieve](https://c-command.com/spamsieve) - [Spark](http://www.shadowlab.org/softwares/spark.php) - [Spectacle](https://www.spectacleapp.com/) - [Spectrwm](https://github.com/conformal/spectrwm/wiki) diff --git a/mackup/applications/spamsieve.cfg b/mackup/applications/spamsieve.cfg new file mode 100644 index 000000000..084b6a908 --- /dev/null +++ b/mackup/applications/spamsieve.cfg @@ -0,0 +1,6 @@ +[application] +name = SpamSieve + +[configuration_files] +Library/Application Support/SpamSieve +Library/Preferences/com.c-command.SpamSieve.plist From e099932c9f187b41898cc1a61a3ce45ec9ee2777 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 6 Nov 2023 00:01:11 +0100 Subject: [PATCH 404/406] Robo3t (#1960) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add support for Robo 3T as discussed in https://github.com/lra/mackup/issues/1446 * Update mackup/applications/robo3t.cfg Co-Authored-By: David de Boer --------- Co-authored-by: Frank Hoffsümmer Co-authored-by: Frank Hoffsümmer Co-authored-by: David de Boer --- CHANGELOG.md | 1 + README.md | 2 +- mackup/applications/robo3t.cfg | 6 ++++++ mackup/applications/robomongo.cfg | 5 ----- 4 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 mackup/applications/robo3t.cfg delete mode 100644 mackup/applications/robomongo.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b97405528..bb99b1f84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Remve support for Apple Preview, problematic on macOS 14.1 - Added support for Subler (via @EpicKris) - Added support for SpamSieve (via @michaelgrossklos) +- Added support for Robo 3T (via @captnswing) ## Mackup 0.8.39 diff --git a/README.md b/README.md index 364097f9c..4c1b0a839 100644 --- a/README.md +++ b/README.md @@ -572,7 +572,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Rhythmbox](https://wiki.gnome.org/Apps/Rhythmbox) - [Rime](http://rime.im/) - [ripgrep](https://github.com/BurntSushi/ripgrep) -- [Robomongo](http://robomongo.org/) +- [Robo 3T](http://robomongo.org/) - [Rocket](https://matthewpalmer.net/rocket/) - [Rofi](https://github.com/DaveDavenport/rofi) - [Royal TSX](http://www.royaltsx.com/ts/osx/features) diff --git a/mackup/applications/robo3t.cfg b/mackup/applications/robo3t.cfg new file mode 100644 index 000000000..316168b20 --- /dev/null +++ b/mackup/applications/robo3t.cfg @@ -0,0 +1,6 @@ +[application] +name = Robo 3T + +[configuration_files] +Library/Preferences/com.3t.Robomongo.plist +.3T diff --git a/mackup/applications/robomongo.cfg b/mackup/applications/robomongo.cfg deleted file mode 100644 index 5acc3d76c..000000000 --- a/mackup/applications/robomongo.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[application] -name = Robomongo - -[xdg_configuration_files] -robomongo From 6b611328d74803df00041f0002a6f43738298919 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 6 Nov 2023 00:09:50 +0100 Subject: [PATCH 405/406] Trizen (#1961) * Add support for Trizen * Add support for Trizen --------- Co-authored-by: Cilenco --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/trizen.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/trizen.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index bb99b1f84..a7b25b9c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for Trizen (via @cilenco) - Added support for Sqitch (via @ra1fee) - Updated support for GeekTool (via @yuchen-lea) - Remve support for Apple Preview, problematic on macOS 14.1 diff --git a/README.md b/README.md index 4c1b0a839..be6103bba 100644 --- a/README.md +++ b/README.md @@ -673,6 +673,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Transmission](http://www.transmissionbt.com/) - [Transmit](http://panic.com/transmit/) - [TripMode](https://www.tripmode.ch) +- [Trizen](https://github.com/trizen/trizen) - [Tunnelblick](https://tunnelblick.net) - [tvnamer](https://github.com/dbr/tvnamer) - [Twitterrific](http://twitterrific.com/) diff --git a/mackup/applications/trizen.cfg b/mackup/applications/trizen.cfg new file mode 100644 index 000000000..4c3e5467a --- /dev/null +++ b/mackup/applications/trizen.cfg @@ -0,0 +1,5 @@ +[application] +name = Trizen + +[configuration_files] +.config/trizen/trizen.conf From 2f3997f9302dd6a7baa9f52b27dc43d17dbf788e Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 6 Nov 2023 00:17:32 +0100 Subject: [PATCH 406/406] Some fixes --- .github/workflows/install.yaml | 6 +++++- .github/workflows/linelint.yaml | 9 ++++++--- .github/workflows/lint.yaml | 6 ++++-- .github/workflows/markdown.yaml | 6 ++++-- .github/workflows/test.yaml | 6 +++++- mackup/applications/trizen.cfg | 4 ++-- 6 files changed, 26 insertions(+), 11 deletions(-) diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml index 341598699..c1ed045d9 100644 --- a/.github/workflows/install.yaml +++ b/.github/workflows/install.yaml @@ -1,5 +1,9 @@ name: Test installs -on: pull_request +on: + push: + branches: + - master + pull_request: jobs: diff --git a/.github/workflows/linelint.yaml b/.github/workflows/linelint.yaml index 9f81640d3..0061ea910 100644 --- a/.github/workflows/linelint.yaml +++ b/.github/workflows/linelint.yaml @@ -1,10 +1,13 @@ # Make sure that all text files end with a newline character. # Configure your editor to end every file with a newline character. # See -on: - - pull_request - - push name: linelint +on: + push: + branches: + - master + pull_request: + jobs: linelint: runs-on: ubuntu-latest diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 1c9910e33..a4180836a 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -1,7 +1,9 @@ name: Lint Python on: - - pull_request - - push + push: + branches: + - master + pull_request: jobs: diff --git a/.github/workflows/markdown.yaml b/.github/workflows/markdown.yaml index 904a36d82..8f73aca67 100644 --- a/.github/workflows/markdown.yaml +++ b/.github/workflows/markdown.yaml @@ -1,7 +1,9 @@ name: Lint Markdown on: - - pull_request - - push + push: + branches: + - master + pull_request: jobs: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index bddae6b8f..e28679e76 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -1,5 +1,9 @@ name: Run tests -on: pull_request +on: + push: + branches: + - master + pull_request: jobs: diff --git a/mackup/applications/trizen.cfg b/mackup/applications/trizen.cfg index 4c3e5467a..a9bd2f7cb 100644 --- a/mackup/applications/trizen.cfg +++ b/mackup/applications/trizen.cfg @@ -1,5 +1,5 @@ [application] name = Trizen -[configuration_files] -.config/trizen/trizen.conf +[xdg_configuration_files] +trizen/trizen.conf