From 2eb10665a3da859c748c76a962ded3d65a11b3be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= Date: Wed, 5 Mar 2014 22:52:45 +0000 Subject: [PATCH 0001/1256] added processing added --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/processing.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/processing.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b0d41070c..b30abfd8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Improved the configuration loader engine +- Added support for Processing (thx @vitorgalvao) ## Mackup 0.7 diff --git a/README.md b/README.md index e831a83bb..49dbd953d 100644 --- a/README.md +++ b/README.md @@ -231,6 +231,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [PokerStars](http://www.pokerstars.com/) - [PopClip](http://pilotmoon.com/popclip/) - [Pow](http://pow.cx/) + - [Processing](http://processing.org/) - [PyPI](https://pypi.python.org/pypi) - [Quicksilver](http://qsapp.com/) - [Rails](http://rubyonrails.org/) diff --git a/mackup/applications/processing.cfg b/mackup/applications/processing.cfg new file mode 100644 index 000000000..3de2a840d --- /dev/null +++ b/mackup/applications/processing.cfg @@ -0,0 +1,5 @@ +[application] +name = Processing + +[configuration_files] +Library/Processing/preferences.txt From f7934d373fd7e3c1cf1d5fd54bdc0f56b6eda92f Mon Sep 17 00:00:00 2001 From: Aristides Lourenco Date: Thu, 6 Mar 2014 23:46:28 +0000 Subject: [PATCH 0002/1256] Launchbar.app: Prevent Habits.plist from syncinc Also left out: - ~/Library/Application Support/LaunchBar/Caches - ~/Library/Application Support/LaunchBar/Calculator --- mackup/applications/launchbar.cfg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mackup/applications/launchbar.cfg b/mackup/applications/launchbar.cfg index 7358a5a58..2f262a812 100644 --- a/mackup/applications/launchbar.cfg +++ b/mackup/applications/launchbar.cfg @@ -3,4 +3,7 @@ name = LaunchBar [configuration_files] Library/Preferences/at.obdev.LaunchBar.plist -Library/Application Support/LaunchBar +Library/Application Support/LaunchBar/Actions +Library/Application Support/LaunchBar/Snippets +Library/Application Support/LaunchBar/Configuration.plist +Library/Application Support/LaunchBar/CustomShortcuts.plist From d09cca9e6afe543ea26d46813df171cc36bd1f91 Mon Sep 17 00:00:00 2001 From: Aristides Lourenco Date: Thu, 6 Mar 2014 23:52:17 +0000 Subject: [PATCH 0003/1256] Fish shell: Prevent fish_history from syncing Right now only syncing one file and one directory: - ~/.config/fish/config.fish - ~/.config/fish/functions It would be useful to have a exclude rule in a situation like this, since each user might be using extra files in the config folder --- mackup/applications/fish.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mackup/applications/fish.cfg b/mackup/applications/fish.cfg index 62d8da455..c3b46f810 100644 --- a/mackup/applications/fish.cfg +++ b/mackup/applications/fish.cfg @@ -2,4 +2,5 @@ name = Fish [configuration_files] -.config/fish +.config/fish/config.fish +.config/fish/functions From fe2362b77063b29ec1ad852def43ac1039e8cb87 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 6 Mar 2014 22:44:00 -0500 Subject: [PATCH 0004/1256] Added credits --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b30abfd8f..ce6a3eef9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Improved the configuration loader engine - Added support for Processing (thx @vitorgalvao) +- Improved support for launchbar and fish (thx @aristidesfl) ## Mackup 0.7 From 15e1a5913121822199b6db2b0aabc8398ab86b6d Mon Sep 17 00:00:00 2001 From: "Jonathan E. Magen" Date: Fri, 7 Mar 2014 12:44:02 -0500 Subject: [PATCH 0005/1256] adding r support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/r.cfg | 7 +++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/r.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ce6a3eef9..e67912cf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Improved the configuration loader engine - Added support for Processing (thx @vitorgalvao) - Improved support for launchbar and fish (thx @aristidesfl) +- Support for R (via @yonkeltron) ## Mackup 0.7 diff --git a/README.md b/README.md index 49dbd953d..7305bff49 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. - [Quicksilver](http://qsapp.com/) - [Rails](http://rubyonrails.org/) - [rTorrent](http://libtorrent.rakshasa.no/) + - [R](http://www.r-project.org/) - [Ruby Version](https://gist.github.com/fnichol/1912050) - [Ruby](http://ruby-lang.org/) - [RubyMine 4](http://www.jetbrains.com/ruby/) diff --git a/mackup/applications/r.cfg b/mackup/applications/r.cfg new file mode 100644 index 000000000..d638cf338 --- /dev/null +++ b/mackup/applications/r.cfg @@ -0,0 +1,7 @@ +[application] +name = R + +[configuration_files] +.R +.Rhistory +.Rprofile From ac2456fe1b2cd67801c615cfa9baca94a891af9d Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 10 Mar 2014 00:44:13 -0400 Subject: [PATCH 0006/1256] Raise an error if an app config list any absolute path --- mackup/appsdb.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mackup/appsdb.py b/mackup/appsdb.py index 48e360e76..979a99d60 100644 --- a/mackup/appsdb.py +++ b/mackup/appsdb.py @@ -46,8 +46,11 @@ def __init__(self): # Add the configuration files to sync self.apps[app_name]['configuration_files'] = set() if config.has_section('configuration_files'): - for paths in config.options('configuration_files'): - self.apps[app_name]['configuration_files'].add(paths) + 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) @staticmethod def get_config_files(): From 39d92472d1588c01a64516984be818ef561b59b5 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 10 Mar 2014 00:47:11 -0400 Subject: [PATCH 0007/1256] Mackup 0.7.1 --- CHANGELOG.md | 3 +++ mackup/constants.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e67912cf5..815340f61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,13 @@ ## WIP +## Mackup 0.7.1 + - Improved the configuration loader engine - Added support for Processing (thx @vitorgalvao) - Improved support for launchbar and fish (thx @aristidesfl) - Support for R (via @yonkeltron) +- Error out when an absolute filepath is used in a application config ## Mackup 0.7 diff --git a/mackup/constants.py b/mackup/constants.py index b84ca609e..aefae2f8a 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup""" # Current version -VERSION = '0.7' +VERSION = '0.7.1' # Mode used to list supported applications LIST_MODE = 'list' From 3467a0c4606c9aef38dd8053691980490e309bf7 Mon Sep 17 00:00:00 2001 From: "Jonathan E. Magen" Date: Mon, 10 Mar 2014 10:47:34 -0400 Subject: [PATCH 0008/1256] added sbcl support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/sbcl.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/sbcl.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 815340f61..57f9c3432 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Mackup Changelog ## WIP +- Support for SBCL (via @yonkeltron) ## Mackup 0.7.1 diff --git a/README.md b/README.md index 7305bff49..c3da13f0c 100644 --- a/README.md +++ b/README.md @@ -243,6 +243,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [RubyMine 5](http://www.jetbrains.com/ruby/) - [S3cmd](http://s3tools.org/s3cmd) - [SABnzbd](http://sabnzbd.org/) + - [SBCL](http://www.sbcl.org/) - [Scenario](http://www.lagentesoft.com/scenario/) - [Screen](http://www.gnu.org/software/screen/) - [SelfControl](http://selfcontrolapp.com/) diff --git a/mackup/applications/sbcl.cfg b/mackup/applications/sbcl.cfg new file mode 100644 index 000000000..e23e79d83 --- /dev/null +++ b/mackup/applications/sbcl.cfg @@ -0,0 +1,5 @@ +[application] +name = SBCL + +[configuration_files] +.sbclrc From 247d9e0f157418ee70ef3c1ddb08b466a7fe8272 Mon Sep 17 00:00:00 2001 From: "Jonathan E. Magen" Date: Mon, 10 Mar 2014 10:53:27 -0400 Subject: [PATCH 0009/1256] added asciinema support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/asciinema.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/asciinema.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 57f9c3432..0b3781998 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP - Support for SBCL (via @yonkeltron) +- Support for asciinema (via @yonkeltron) ## Mackup 0.7.1 diff --git a/README.md b/README.md index c3da13f0c..cd176433e 100644 --- a/README.md +++ b/README.md @@ -137,6 +137,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adobe Lightroom](http://www.adobe.com/products/photoshop-lightroom.html) - [AppCode 2](http://www.jetbrains.com/objc/) - [Arara](http://cereda.github.io/arara/) + - [asciinema](https://asciinema.org/) - [Aspell](http://aspell.net/) - [Awareness](http://iamfutureproof.com/tools/awareness/) - [Bartender](http://www.macbartender.com/) diff --git a/mackup/applications/asciinema.cfg b/mackup/applications/asciinema.cfg new file mode 100644 index 000000000..2aa216805 --- /dev/null +++ b/mackup/applications/asciinema.cfg @@ -0,0 +1,5 @@ +[application] +name = asciinema + +[configuration_files] +.asciinema From 32fce9fd3e93b140b73ad830d2876c41cdfc4070 Mon Sep 17 00:00:00 2001 From: "Jonathan E. Magen" Date: Mon, 10 Mar 2014 11:58:52 -0400 Subject: [PATCH 0010/1256] added AWS CLI support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/aws.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/aws.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b3781998..92c68899a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Support for SBCL (via @yonkeltron) - Support for asciinema (via @yonkeltron) +- Support for AWS CLI (via @yonkeltron) ## Mackup 0.7.1 diff --git a/README.md b/README.md index cd176433e..4c309aaf5 100644 --- a/README.md +++ b/README.md @@ -140,6 +140,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [asciinema](https://asciinema.org/) - [Aspell](http://aspell.net/) - [Awareness](http://iamfutureproof.com/tools/awareness/) + - [AWS Command Line Interace](https://aws.amazon.com/cli/) - [Bartender](http://www.macbartender.com/) - [Bash it](https://github.com/revans/bash-it/) - [Bash](http://www.gnu.org/software/bash/) diff --git a/mackup/applications/aws.cfg b/mackup/applications/aws.cfg new file mode 100644 index 000000000..72636fd95 --- /dev/null +++ b/mackup/applications/aws.cfg @@ -0,0 +1,5 @@ +[application] +name = AWS CLI + +[configuration_files] +.aws From 2a8908dc3863442b4be2d8f69133d31b89fbf951 Mon Sep 17 00:00:00 2001 From: "Jonathan E. Magen" Date: Mon, 10 Mar 2014 12:10:31 -0400 Subject: [PATCH 0011/1256] fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4c309aaf5..736a90b42 100644 --- a/README.md +++ b/README.md @@ -140,7 +140,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [asciinema](https://asciinema.org/) - [Aspell](http://aspell.net/) - [Awareness](http://iamfutureproof.com/tools/awareness/) - - [AWS Command Line Interace](https://aws.amazon.com/cli/) + - [AWS Command Line Interface](https://aws.amazon.com/cli/) - [Bartender](http://www.macbartender.com/) - [Bash it](https://github.com/revans/bash-it/) - [Bash](http://www.gnu.org/software/bash/) From ddc4f87e50f506717f2e578ec305f15a9a92a9f6 Mon Sep 17 00:00:00 2001 From: Nathan Trapp Date: Tue, 11 Mar 2014 10:40:59 -0400 Subject: [PATCH 0012/1256] Limit .vim folder backup to autoload and colors for better cross-platform support --- mackup/applications/vim.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mackup/applications/vim.cfg b/mackup/applications/vim.cfg index 941aa7636..237406183 100644 --- a/mackup/applications/vim.cfg +++ b/mackup/applications/vim.cfg @@ -5,7 +5,8 @@ name = Vim .gvimrc .gvimrc.before .gvimrc.after -.vim +.vim/autoload +.vim/colors .vimrc .vimrc.before .vimrc.after From 6ae3e63ecf63d7685620daf5a461c03ff441b77c Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 11 Mar 2014 11:12:19 -0400 Subject: [PATCH 0013/1256] Added credits --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92c68899a..cea075a37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Support for SBCL (via @yonkeltron) - Support for asciinema (via @yonkeltron) - Support for AWS CLI (via @yonkeltron) +- Limit .vim folder backup for better linux support (thx @Imperiopolis) ## Mackup 0.7.1 From 8bc92496ff0c6f6d90a9967db80e1e58fb2d8703 Mon Sep 17 00:00:00 2001 From: Leon Miller-Out Date: Tue, 18 Mar 2014 13:54:46 -0400 Subject: [PATCH 0014/1256] Add missing OmniFocus preferences file. --- mackup/applications/omnifocus.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/omnifocus.cfg b/mackup/applications/omnifocus.cfg index a934dde0a..349be4d61 100644 --- a/mackup/applications/omnifocus.cfg +++ b/mackup/applications/omnifocus.cfg @@ -4,3 +4,4 @@ name = OmniFocus [configuration_files] Library/Application Support/OmniFocus/Plug-Ins Library/Application Support/OmniFocus/Themes +Library/Preferences/com.omnigroup.OmniFocus.plist \ No newline at end of file From bac3af14d8748dd96caaa5b693aa57d88fa6097c Mon Sep 17 00:00:00 2001 From: Leon Miller-Out Date: Tue, 18 Mar 2014 15:41:10 -0400 Subject: [PATCH 0015/1256] Add change to CHANGELOG and add a missing line ending. --- CHANGELOG.md | 1 + mackup/applications/omnifocus.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cea075a37..07a646986 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Support for asciinema (via @yonkeltron) - Support for AWS CLI (via @yonkeltron) - Limit .vim folder backup for better linux support (thx @Imperiopolis) +- Add a missing OmniFocus preferences file (via @sbleon) ## Mackup 0.7.1 diff --git a/mackup/applications/omnifocus.cfg b/mackup/applications/omnifocus.cfg index 349be4d61..cf9a52789 100644 --- a/mackup/applications/omnifocus.cfg +++ b/mackup/applications/omnifocus.cfg @@ -4,4 +4,4 @@ name = OmniFocus [configuration_files] Library/Application Support/OmniFocus/Plug-Ins Library/Application Support/OmniFocus/Themes -Library/Preferences/com.omnigroup.OmniFocus.plist \ No newline at end of file +Library/Preferences/com.omnigroup.OmniFocus.plist From c1915a9bacc205314b2e50f88f7f4b61aaa352b6 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 19 Mar 2014 01:25:03 -0400 Subject: [PATCH 0016/1256] Added TODO about #240 --- TODO.md | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO.md b/TODO.md index 654c65765..7609ea131 100644 --- a/TODO.md +++ b/TODO.md @@ -19,3 +19,4 @@ Feel free to implement any of those ;) - Merge all the config code in Config() - Ability to `mackup list` without any storage, and use `mackup list` as a test in `homebrew` +- Do not crash on non existing file during uninstall #240 From b5f9ff8ce72e7818a2fa0645acd37896b9d67cc6 Mon Sep 17 00:00:00 2001 From: Damian Lee Date: Fri, 21 Mar 2014 09:21:11 +0000 Subject: [PATCH 0017/1256] Added rubymine-60.cfg file --- mackup/applications/rubymine-6.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/rubymine-6.cfg diff --git a/mackup/applications/rubymine-6.cfg b/mackup/applications/rubymine-6.cfg new file mode 100644 index 000000000..eb9a92f0f --- /dev/null +++ b/mackup/applications/rubymine-6.cfg @@ -0,0 +1,6 @@ +[application] +name = RubyMine 6 + +[configuration_files] +Library/Application Support/RubyMine60 +Library/Preferences/RubyMine60 From 75e004571b817e01ab9504217f2fd4ffb893f2d1 Mon Sep 17 00:00:00 2001 From: Damian Lee Date: Sat, 22 Mar 2014 08:42:38 +0000 Subject: [PATCH 0018/1256] Added changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07a646986..a61ee8b08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Mackup Changelog ## WIP +- Support for RubyMine 6 (via @damiankloip) - Support for SBCL (via @yonkeltron) - Support for asciinema (via @yonkeltron) - Support for AWS CLI (via @yonkeltron) From 6e4721b8ee1d0f404a361525de1936e93a286966 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 22 Mar 2014 14:16:57 -0400 Subject: [PATCH 0019/1256] Merged Rubymine 4,5,6 support into one --- README.md | 3 +-- mackup/applications/rubymine-4.cfg | 6 ------ mackup/applications/rubymine-5.cfg | 6 ------ mackup/applications/rubymine-6.cfg | 6 ------ mackup/applications/rubymine.cfg | 10 ++++++++++ 5 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 mackup/applications/rubymine-4.cfg delete mode 100644 mackup/applications/rubymine-5.cfg delete mode 100644 mackup/applications/rubymine-6.cfg create mode 100644 mackup/applications/rubymine.cfg diff --git a/README.md b/README.md index 736a90b42..eb2cc28d5 100644 --- a/README.md +++ b/README.md @@ -241,8 +241,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [R](http://www.r-project.org/) - [Ruby Version](https://gist.github.com/fnichol/1912050) - [Ruby](http://ruby-lang.org/) - - [RubyMine 4](http://www.jetbrains.com/ruby/) - - [RubyMine 5](http://www.jetbrains.com/ruby/) + - [RubyMine](http://www.jetbrains.com/ruby/) - [S3cmd](http://s3tools.org/s3cmd) - [SABnzbd](http://sabnzbd.org/) - [SBCL](http://www.sbcl.org/) diff --git a/mackup/applications/rubymine-4.cfg b/mackup/applications/rubymine-4.cfg deleted file mode 100644 index 4caa9c5b1..000000000 --- a/mackup/applications/rubymine-4.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[application] -name = RubyMine 4 - -[configuration_files] -Library/Application Support/RubyMine40 -Library/Preferences/RubyMine40 diff --git a/mackup/applications/rubymine-5.cfg b/mackup/applications/rubymine-5.cfg deleted file mode 100644 index 93e18c950..000000000 --- a/mackup/applications/rubymine-5.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[application] -name = RubyMine 5 - -[configuration_files] -Library/Application Support/RubyMine50 -Library/Preferences/RubyMine50 diff --git a/mackup/applications/rubymine-6.cfg b/mackup/applications/rubymine-6.cfg deleted file mode 100644 index eb9a92f0f..000000000 --- a/mackup/applications/rubymine-6.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[application] -name = RubyMine 6 - -[configuration_files] -Library/Application Support/RubyMine60 -Library/Preferences/RubyMine60 diff --git a/mackup/applications/rubymine.cfg b/mackup/applications/rubymine.cfg new file mode 100644 index 000000000..2788194ca --- /dev/null +++ b/mackup/applications/rubymine.cfg @@ -0,0 +1,10 @@ +[application] +name = RubyMine + +[configuration_files] +Library/Application Support/RubyMine40 +Library/Preferences/RubyMine40 +Library/Application Support/RubyMine50 +Library/Preferences/RubyMine50 +Library/Application Support/RubyMine60 +Library/Preferences/RubyMine60 From 4770ae659918398e1857d85975c02c17334a4fb3 Mon Sep 17 00:00:00 2001 From: Damian Lee Date: Tue, 25 Mar 2014 08:25:20 +0000 Subject: [PATCH 0020/1256] Added atom.cfg --- mackup/applications/atom.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/atom.cfg diff --git a/mackup/applications/atom.cfg b/mackup/applications/atom.cfg new file mode 100644 index 000000000..bfa9f6caa --- /dev/null +++ b/mackup/applications/atom.cfg @@ -0,0 +1,5 @@ +[application] +name = Atom + +[configuration_files] +Library/Preferences/com.github.atom.plist From 36a0026839c53d75ede504d3c8324b1b85be4500 Mon Sep 17 00:00:00 2001 From: Damian Lee Date: Tue, 25 Mar 2014 08:28:41 +0000 Subject: [PATCH 0021/1256] Added Chanelog and readme entries --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a61ee8b08..dce9a3f93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Mackup Changelog ## WIP +- Support for Atom (via @damiankloip) - Support for RubyMine 6 (via @damiankloip) - Support for SBCL (via @yonkeltron) - Support for asciinema (via @yonkeltron) diff --git a/README.md b/README.md index eb2cc28d5..1ff12e561 100644 --- a/README.md +++ b/README.md @@ -136,6 +136,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - [Adobe Lightroom](http://www.adobe.com/products/photoshop-lightroom.html) - [AppCode 2](http://www.jetbrains.com/objc/) + - [Atom](https://atom.io/) - [Arara](http://cereda.github.io/arara/) - [asciinema](https://asciinema.org/) - [Aspell](http://aspell.net/) From c234ad6c32b75f996e15b3cb6218860803bb3e1f Mon Sep 17 00:00:00 2001 From: Damian Lee Date: Tue, 25 Mar 2014 09:32:50 +0000 Subject: [PATCH 0022/1256] Added .atom folder --- mackup/applications/atom.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/atom.cfg b/mackup/applications/atom.cfg index bfa9f6caa..837a23728 100644 --- a/mackup/applications/atom.cfg +++ b/mackup/applications/atom.cfg @@ -2,4 +2,6 @@ name = Atom [configuration_files] + Library/Preferences/com.github.atom.plist +.atom From fe1178362b6af1b314ab44a5f782a59f457cf074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= Date: Thu, 27 Mar 2014 22:24:37 +0000 Subject: [PATCH 0023/1256] added support for Phoenix --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/phoenix.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/phoenix.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index dce9a3f93..ac860effa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Support for AWS CLI (via @yonkeltron) - Limit .vim folder backup for better linux support (thx @Imperiopolis) - Add a missing OmniFocus preferences file (via @sbleon) +- Support for Phoenix (via @vitorgalvao) ## Mackup 0.7.1 diff --git a/README.md b/README.md index 1ff12e561..3ccf88157 100644 --- a/README.md +++ b/README.md @@ -229,6 +229,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [PCKeyboardHack](http://pqrs.org/macosx/keyremap4macbook/pckeyboardhack.html.en) - [Pear](http://pear.php.net/) - [Pentadactyl](http://5digits.org/pentadactyl/) + - [Phoenix](https://github.com/sdegutis/Phoenix) - [PhpStorm 6](http://www.jetbrains.com/phpstorm/) - [PIP](http://www.pip-installer.org/) - [PokerStars](http://www.pokerstars.com/) diff --git a/mackup/applications/phoenix.cfg b/mackup/applications/phoenix.cfg new file mode 100644 index 000000000..a95b68a02 --- /dev/null +++ b/mackup/applications/phoenix.cfg @@ -0,0 +1,5 @@ +[application] +name = Phoenix + +[configuration_files] +.phoenix.js From 8d3800f7b1cc06c36949c93462bd352d0945d6ee Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 29 Mar 2014 18:15:16 -0400 Subject: [PATCH 0024/1256] Print out the moved files on uninstall --- CHANGELOG.md | 1 + mackup/application.py | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac860effa..ceb9427ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Limit .vim folder backup for better linux support (thx @Imperiopolis) - Add a missing OmniFocus preferences file (via @sbleon) - Support for Phoenix (via @vitorgalvao) +- Print out the moved files on uninstall ## Mackup 0.7.1 diff --git a/mackup/application.py b/mackup/application.py index 1e87434e5..cc59ec479 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -174,6 +174,7 @@ def uninstall(self): # Check if there is a corresponding file in the home folder if os.path.exists(home_filepath): + print "Moving {} back into your home...".format(filename) # If there is, delete it as we are gonna copy the Dropbox # one there utils.delete(home_filepath) From a116e61c6db6f453313c5717606b3bf202864e17 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 29 Mar 2014 18:15:46 -0400 Subject: [PATCH 0025/1256] Mackup 0.7.2 --- CHANGELOG.md | 3 +++ mackup/constants.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ceb9427ce..870cb6744 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Mackup Changelog ## WIP + +## Mackup 0.7.2 + - Support for Atom (via @damiankloip) - Support for RubyMine 6 (via @damiankloip) - Support for SBCL (via @yonkeltron) diff --git a/mackup/constants.py b/mackup/constants.py index aefae2f8a..19c089f25 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup""" # Current version -VERSION = '0.7.1' +VERSION = '0.7.2' # Mode used to list supported applications LIST_MODE = 'list' From 565fbc6c9f48f3e1082fba2965948f609ef64f4d Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 30 Mar 2014 16:14:53 -0400 Subject: [PATCH 0026/1256] Added support for Keybase --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/keybase.cfg | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/keybase.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 870cb6744..771f0e056 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Support for Keybase + ## Mackup 0.7.2 - Support for Atom (via @damiankloip) diff --git a/README.md b/README.md index 3ccf88157..5b67c8cc0 100644 --- a/README.md +++ b/README.md @@ -197,6 +197,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [ITerm2](http://www.iterm2.com/) - [Janus](https://github.com/carlhuda/janus) - [Keka](http://kekaosx.com/) + - [Keybase](https://keybase.io/) - [Keymo](http://manytricks.com/keymo/) - [KeyRemap4MacBook](http://pqrs.org/macosx/keyremap4macbook/) - [LaTeXiT](http://www.chachatelier.fr/latexit/latexit-home.php?lang=en) diff --git a/mackup/applications/keybase.cfg b/mackup/applications/keybase.cfg new file mode 100644 index 000000000..b0e31724c --- /dev/null +++ b/mackup/applications/keybase.cfg @@ -0,0 +1,5 @@ +[application] +name = Keybase + +[configuration_files] +.keybase/config.json From 18fe35cc588413325143722d9ae93b16b6348c14 Mon Sep 17 00:00:00 2001 From: Timidger Date: Thu, 10 Apr 2014 12:05:28 -0500 Subject: [PATCH 0027/1256] Error messages display in a red color to improve readablity --- mackup/utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mackup/utils.py b/mackup/utils.py index 42fafc5db..45e580670 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -172,7 +172,9 @@ def error(message): Args: message(str): The message to display. """ - sys.exit("Error: {}".format(message)) + fail = '\033[91m' + end = '\033[0m' + sys.exit(fail + "Error: {}".format(message) + end) def parse_cmdline_args(): From 3c3e80954ba0eaa41b17c822b8fea85bf964adc3 Mon Sep 17 00:00:00 2001 From: Anton Katunin Date: Sun, 6 Apr 2014 14:03:39 +0400 Subject: [PATCH 0028/1256] Added AusKey support as per https://abr.gov.au/AUSkey/Help-and-support/Managing-AUSkey-troubleshooting/Back-up-your-AUSkey/ --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/auskey.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/auskey.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 771f0e056..40fd8949d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Support for Keybase +- Support for AusKey ## Mackup 0.7.2 diff --git a/README.md b/README.md index 5b67c8cc0..f9d4114c1 100644 --- a/README.md +++ b/README.md @@ -140,6 +140,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Arara](http://cereda.github.io/arara/) - [asciinema](https://asciinema.org/) - [Aspell](http://aspell.net/) + - [AusKey](https://abr.gov.au/AUSkey/) - [Awareness](http://iamfutureproof.com/tools/awareness/) - [AWS Command Line Interface](https://aws.amazon.com/cli/) - [Bartender](http://www.macbartender.com/) diff --git a/mackup/applications/auskey.cfg b/mackup/applications/auskey.cfg new file mode 100644 index 000000000..86d3725c1 --- /dev/null +++ b/mackup/applications/auskey.cfg @@ -0,0 +1,5 @@ +[application] +name = AusKey + +[configuration_files] +Library/Application Support/AUSkey/keystore.xml From a5a039512e17be25b6d1e6e88e4359a4107da082 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 24 Apr 2014 19:27:22 -0400 Subject: [PATCH 0029/1256] Added some click TODO --- TODO.md | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO.md b/TODO.md index 7609ea131..77b4720d4 100644 --- a/TODO.md +++ b/TODO.md @@ -20,3 +20,4 @@ Feel free to implement any of those ;) - Ability to `mackup list` without any storage, and use `mackup list` as a test in `homebrew` - Do not crash on non existing file during uninstall #240 +- Simplify the parameter handling with https://github.com/mitsuhiko/click From 09832791e238c4e196bfed96ee8478c2d669fb87 Mon Sep 17 00:00:00 2001 From: Fayland Lam Date: Sat, 26 Apr 2014 13:38:39 +0800 Subject: [PATCH 0030/1256] support mysql cfg --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/mysql.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/mysql.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 771f0e056..e2c1bb2cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Support for Keybase +- Support for MySQL (via @fayland) ## Mackup 0.7.2 diff --git a/README.md b/README.md index 5b67c8cc0..cd0b0ad3b 100644 --- a/README.md +++ b/README.md @@ -214,6 +214,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Mercurial](http://mercurial.selenic.com/) - [MercuryMover](http://www.heliumfoot.com/mercurymover/) - [Messages](http://www.apple.com/osx/apps/#messages) + - [MySQL](http://www.mysql.com/) - [Moom](http://manytricks.com/moom/) - [Mou](http://mouapp.com/) - [mpd](http://www.musicpd.org) diff --git a/mackup/applications/mysql.cfg b/mackup/applications/mysql.cfg new file mode 100644 index 000000000..5a7664fd1 --- /dev/null +++ b/mackup/applications/mysql.cfg @@ -0,0 +1,5 @@ +[application] +name = MySQL + +[configuration_files] +.my.cnf From 4dfcca534541473c79511eef8363124ec7b5f781 Mon Sep 17 00:00:00 2001 From: Fayland Lam Date: Sun, 27 Apr 2014 14:13:02 +0800 Subject: [PATCH 0031/1256] wgetrc --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/wget.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/wget.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e2c1bb2cf..7bff0694d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Support for Keybase - Support for MySQL (via @fayland) +- Support for Wget (via @fayland) ## Mackup 0.7.2 diff --git a/README.md b/README.md index cd0b0ad3b..2ef556142 100644 --- a/README.md +++ b/README.md @@ -283,6 +283,7 @@ 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/) + - [Wget](https://www.gnu.org/software/wget/) - [Witch](http://manytricks.com/witch/) - [X11](http://www.x.org/) - [Xchat](http://www.xchat.org/) diff --git a/mackup/applications/wget.cfg b/mackup/applications/wget.cfg new file mode 100644 index 000000000..4dadfd835 --- /dev/null +++ b/mackup/applications/wget.cfg @@ -0,0 +1,5 @@ +[application] +name = Wget + +[configuration_files] +.wgetrc From 897edc9423218f3ad1d82cc77dfcb55ef3155bee Mon Sep 17 00:00:00 2001 From: Fayland Lam Date: Sun, 27 Apr 2014 14:17:09 +0800 Subject: [PATCH 0032/1256] perl related configurations --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/perl.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/perl.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e2c1bb2cf..d17d4a984 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Support for Keybase - Support for MySQL (via @fayland) +- Support for Perl related configuration (via @fayland) ## Mackup 0.7.2 diff --git a/README.md b/README.md index cd0b0ad3b..7280ad03f 100644 --- a/README.md +++ b/README.md @@ -231,6 +231,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [PCKeyboardHack](http://pqrs.org/macosx/keyremap4macbook/pckeyboardhack.html.en) - [Pear](http://pear.php.net/) - [Pentadactyl](http://5digits.org/pentadactyl/) + - [Perl](http://www.perl.org/) - [Phoenix](https://github.com/sdegutis/Phoenix) - [PhpStorm 6](http://www.jetbrains.com/phpstorm/) - [PIP](http://www.pip-installer.org/) diff --git a/mackup/applications/perl.cfg b/mackup/applications/perl.cfg new file mode 100644 index 000000000..a664b33ea --- /dev/null +++ b/mackup/applications/perl.cfg @@ -0,0 +1,6 @@ +[application] +name = Perl related configuration + +[configuration_files] +.perltidyrc +.perlcriticrc From 32990349bd58742f920e45e308295acad462df0c Mon Sep 17 00:00:00 2001 From: Aristides Lourenco Date: Mon, 28 Apr 2014 01:41:57 +0100 Subject: [PATCH 0033/1256] NValt: stop backup up notes in "Notational Data" When using the single database option, all the notes are stored in "~/Library/Application Support/Notational Data/Notes & Settings". Notational Velocity already uses Simplenote to sync notes. --- mackup/applications/nvalt.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/mackup/applications/nvalt.cfg b/mackup/applications/nvalt.cfg index 3655b7f12..c93c8a73d 100644 --- a/mackup/applications/nvalt.cfg +++ b/mackup/applications/nvalt.cfg @@ -4,4 +4,3 @@ name = nvALT [configuration_files] Library/Preferences/net.elasticthreads.nv.plist Library/Application Support/Notational Velocity -Library/Application Support/Notational Data From 608fd82d7304406b743846f898e558a8cd02f8ae Mon Sep 17 00:00:00 2001 From: Ray Lillywhite Date: Sun, 27 Apr 2014 20:37:04 -0700 Subject: [PATCH 0034/1256] Add support for Charles --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/charles.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/charles.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bff0694d..dd0eb153c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Support for Charles (via @raylillywhite) - Support for Keybase - Support for MySQL (via @fayland) - Support for Wget (via @fayland) diff --git a/README.md b/README.md index 2ef556142..dbc60b7e0 100644 --- a/README.md +++ b/README.md @@ -153,6 +153,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/) + - [Charles](http://www.charlesproxy.com) - [Chef](http://www.opscode.com/chef/) - [Chicken](http://sourceforge.net/projects/chicken/) - [Clementine](http://www.clementine-player.org/) diff --git a/mackup/applications/charles.cfg b/mackup/applications/charles.cfg new file mode 100644 index 000000000..e1e70f844 --- /dev/null +++ b/mackup/applications/charles.cfg @@ -0,0 +1,6 @@ +[application] +name = Charles + +[configuration_files] +Library/Application Support/Charles +Library/Preferences/com.xk72.charles.config From 8abc8e721efcf241eb08374221a5ae73038d33b0 Mon Sep 17 00:00:00 2001 From: Alexey Alekhin Date: Thu, 1 May 2014 00:39:22 +0200 Subject: [PATCH 0035/1256] Added support for SBT --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/sbt.cfg | 13 +++++++++++++ 3 files changed, 15 insertions(+) create mode 100644 mackup/applications/sbt.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index dd0eb153c..44f8e161d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Support for Keybase - Support for MySQL (via @fayland) - Support for Wget (via @fayland) +- Support for SBT (via @laughedelic) ## Mackup 0.7.2 diff --git a/README.md b/README.md index dbc60b7e0..c179fa0da 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. - [S3cmd](http://s3tools.org/s3cmd) - [SABnzbd](http://sabnzbd.org/) - [SBCL](http://www.sbcl.org/) + - [SBT](http://www.scala-sbt.org/) - [Scenario](http://www.lagentesoft.com/scenario/) - [Screen](http://www.gnu.org/software/screen/) - [SelfControl](http://selfcontrolapp.com/) diff --git a/mackup/applications/sbt.cfg b/mackup/applications/sbt.cfg new file mode 100644 index 000000000..9e97fa788 --- /dev/null +++ b/mackup/applications/sbt.cfg @@ -0,0 +1,13 @@ +[application] +name = SBT + +[configuration_files] +.sbtconfig +.sbt/0.12/global.sbt +.sbt/0.12/build.sbt +.sbt/0.12/plugins/plugins.sbt +.sbt/0.12/plugins/build.sbt +.sbt/0.13/global.sbt +.sbt/0.13/build.sbt +.sbt/0.13/plugins/plugins.sbt +.sbt/0.13/plugins/build.sbt From 46a3a817dc78eac6d252863441fb2ec420239622 Mon Sep 17 00:00:00 2001 From: Fayland Lam Date: Fri, 9 May 2014 14:16:04 +0800 Subject: [PATCH 0036/1256] add proverc --- mackup/applications/perl.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/perl.cfg b/mackup/applications/perl.cfg index a664b33ea..5af87e40d 100644 --- a/mackup/applications/perl.cfg +++ b/mackup/applications/perl.cfg @@ -4,3 +4,4 @@ name = Perl related configuration [configuration_files] .perltidyrc .perlcriticrc +.proverc \ No newline at end of file From ed43059481535786c2cf74ab6b4a6e0f3381ddc3 Mon Sep 17 00:00:00 2001 From: Hariharan Iyer Date: Mon, 12 May 2014 14:05:30 +0530 Subject: [PATCH 0037/1256] add linux support for Sublime Text 3 --- mackup/applications/sublime-text-3.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/sublime-text-3.cfg b/mackup/applications/sublime-text-3.cfg index 63e44125a..a899f5121 100644 --- a/mackup/applications/sublime-text-3.cfg +++ b/mackup/applications/sublime-text-3.cfg @@ -3,3 +3,4 @@ name = Sublime Text 3 [configuration_files] Library/Application Support/Sublime Text 3/Packages/User +.config/sublime-text-3 \ No newline at end of file From 06aaf873026a44fec84fed9eaba77d3314176b97 Mon Sep 17 00:00:00 2001 From: Hariharan Iyer Date: Mon, 12 May 2014 14:10:21 +0530 Subject: [PATCH 0038/1256] add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd0eb153c..ca369faa8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Support for Sublime Text 3 in Linux - Support for Charles (via @raylillywhite) - Support for Keybase - Support for MySQL (via @fayland) From ba54453ec191deb0ffb823928825121d552709fb Mon Sep 17 00:00:00 2001 From: Hariharan Iyer Date: Mon, 12 May 2014 22:17:28 +0530 Subject: [PATCH 0039/1256] add newline --- mackup/applications/sublime-text-3.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/sublime-text-3.cfg b/mackup/applications/sublime-text-3.cfg index a899f5121..2e878a17c 100644 --- a/mackup/applications/sublime-text-3.cfg +++ b/mackup/applications/sublime-text-3.cfg @@ -3,4 +3,4 @@ name = Sublime Text 3 [configuration_files] Library/Application Support/Sublime Text 3/Packages/User -.config/sublime-text-3 \ No newline at end of file +.config/sublime-text-3 From 48da47a35e5aebc580605b5f6f18a2b16a908a9f Mon Sep 17 00:00:00 2001 From: Hariharan Iyer Date: Mon, 12 May 2014 22:17:28 +0530 Subject: [PATCH 0040/1256] add newline --- mackup/applications/sublime-text-3.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/sublime-text-3.cfg b/mackup/applications/sublime-text-3.cfg index a899f5121..2e878a17c 100644 --- a/mackup/applications/sublime-text-3.cfg +++ b/mackup/applications/sublime-text-3.cfg @@ -3,4 +3,4 @@ name = Sublime Text 3 [configuration_files] Library/Application Support/Sublime Text 3/Packages/User -.config/sublime-text-3 \ No newline at end of file +.config/sublime-text-3 From fc96c2a3e53ef8fff39d5a56ac9c36f8d237b77e Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 12 May 2014 14:25:03 -0400 Subject: [PATCH 0041/1256] Added greetings --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca369faa8..6fb5ca6ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## WIP -- Support for Sublime Text 3 in Linux +- Support for Sublime Text 3 in Linux (thx @hiyer) - Support for Charles (via @raylillywhite) - Support for Keybase - Support for MySQL (via @fayland) From 04fa5ec9303a75ac75d9b2d9696e56c7fe42dbec Mon Sep 17 00:00:00 2001 From: Danny Siu Date: Fri, 23 May 2014 10:59:42 +0800 Subject: [PATCH 0042/1256] added AppCode 3.x support --- mackup/applications/appcode-3.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/appcode-3.cfg diff --git a/mackup/applications/appcode-3.cfg b/mackup/applications/appcode-3.cfg new file mode 100644 index 000000000..679cf9658 --- /dev/null +++ b/mackup/applications/appcode-3.cfg @@ -0,0 +1,6 @@ +[application] +name = AppCode 3 + +[configuration_files] +Library/Application Support/appCode30 +Library/Preferences/appCode30 From d82afa854018896f6f6d553a258af199f4ceb1b9 Mon Sep 17 00:00:00 2001 From: Danny Siu Date: Fri, 23 May 2014 17:50:09 +0800 Subject: [PATCH 0043/1256] updated CHANGELOG.md to include AppCode 3 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06c5a405b..2a4a015dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Added support for Livestreamer (thx @vitorgalvao) +- Added support of AppCode 3 (thx @dsiu) ## Mackup 0.6 From 7d5bd96a02ceb9a42836d465680148a6bd0e99a8 Mon Sep 17 00:00:00 2001 From: Olaf Alders Date: Wed, 30 Apr 2014 23:20:00 -0400 Subject: [PATCH 0044/1256] Adds alternate path for Divvy plist. Syncing with Divvy 1.3.8 on 10.9 and 10.7 See also https://twitter.com/bkirz/status/426452375813885953 --- CHANGELOG.md | 1 + mackup/applications/divvy.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 771f0e056..077240fb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Support for Keybase +- More support for Divvy (via @oalders) ## Mackup 0.7.2 diff --git a/mackup/applications/divvy.cfg b/mackup/applications/divvy.cfg index 44a91e87a..13f7fdafd 100644 --- a/mackup/applications/divvy.cfg +++ b/mackup/applications/divvy.cfg @@ -3,3 +3,4 @@ name = Divvy [configuration_files] Library/Preferences/com.mizage.direct.Divvy.plist +Library/Preferences/com.mizage.Divvy.plist From 9ef6a970f066eee8b1f15dde564319a100796d72 Mon Sep 17 00:00:00 2001 From: Luis DeManuel Date: Wed, 28 May 2014 13:08:57 +0200 Subject: [PATCH 0045/1256] Add support for Liftoff --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/liftoff.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/liftoff.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 65d9d3777..2dc11a688 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Support for Liftoff (vía @Lumde) - Support for Sublime Text 3 in Linux (thx @hiyer) - Support for Charles (via @raylillywhite) - Support for Keybase diff --git a/README.md b/README.md index dbc60b7e0..e379701ea 100644 --- a/README.md +++ b/README.md @@ -203,6 +203,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [KeyRemap4MacBook](http://pqrs.org/macosx/keyremap4macbook/) - [LaTeXiT](http://www.chachatelier.fr/latexit/latexit-home.php?lang=en) - [LaunchBar](http://www.obdev.at/products/launchbar/index.html) + - [Liftoff](https://github.com/thoughtbot/liftoff) - [Light Table](http://www.lighttable.com/) - [LimeChat](http://limechat.net/mac/) - [LittleSnitch](http://www.obdev.at/products/littlesnitch/) diff --git a/mackup/applications/liftoff.cfg b/mackup/applications/liftoff.cfg new file mode 100644 index 000000000..8a1a0c183 --- /dev/null +++ b/mackup/applications/liftoff.cfg @@ -0,0 +1,5 @@ +[application] +name = liftoff + +[configuration_files] +.liftoffrc \ No newline at end of file From a52517741c643b2f2b0eb5d109bbe6357310b213 Mon Sep 17 00:00:00 2001 From: Luis DeManuel Date: Wed, 28 May 2014 13:13:46 +0200 Subject: [PATCH 0046/1256] Fixed URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e379701ea..a2e6e3b64 100644 --- a/README.md +++ b/README.md @@ -203,7 +203,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [KeyRemap4MacBook](http://pqrs.org/macosx/keyremap4macbook/) - [LaTeXiT](http://www.chachatelier.fr/latexit/latexit-home.php?lang=en) - [LaunchBar](http://www.obdev.at/products/launchbar/index.html) - - [Liftoff](https://github.com/thoughtbot/liftoff) + - [Liftoff](http://github.com/thoughtbot/liftoff) - [Light Table](http://www.lighttable.com/) - [LimeChat](http://limechat.net/mac/) - [LittleSnitch](http://www.obdev.at/products/littlesnitch/) From 287ff97e212d6816f81945b74f589dbc7387194a Mon Sep 17 00:00:00 2001 From: Lumde Date: Wed, 28 May 2014 17:26:04 +0200 Subject: [PATCH 0047/1256] New line at end of config file As @vitorgalvao says, you must have a new line at end of file --- mackup/applications/liftoff.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/liftoff.cfg b/mackup/applications/liftoff.cfg index 8a1a0c183..e0ecc7460 100644 --- a/mackup/applications/liftoff.cfg +++ b/mackup/applications/liftoff.cfg @@ -2,4 +2,4 @@ name = liftoff [configuration_files] -.liftoffrc \ No newline at end of file +.liftoffrc From d81f5c9bb070c55b654cc65ab3f0183fa656aa38 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 28 May 2014 13:19:17 -0400 Subject: [PATCH 0048/1256] Added missing change log info --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 693ee9ae0..a20af76d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Support for Wget (via @fayland) - Improved support for Divvy (via @oalders) - Support for SBT (via @laughedelic) +- Imroved support for nvALT (via @aristidesfl) ## Mackup 0.7.2 From 1eeffe2bb92af9f7bfe3cacee51457cbe315b590 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 28 May 2014 13:23:10 -0400 Subject: [PATCH 0049/1256] Replaced thx by via in the change log --- CHANGELOG.md | 240 +++++++++++++++++++++++++-------------------------- 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05d3b7cb0..d57a0f674 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,8 @@ ## WIP -- Support for Liftoff (vía @Lumde) -- Support for Sublime Text 3 in Linux (thx @hiyer) +- Support for Liftoff (via @Lumde) +- Support for Sublime Text 3 in Linux (via @hiyer) - Support for Charles (via @raylillywhite) - Support for Keybase - Support for MySQL (via @fayland) @@ -21,7 +21,7 @@ - Support for SBCL (via @yonkeltron) - Support for asciinema (via @yonkeltron) - Support for AWS CLI (via @yonkeltron) -- Limit .vim folder backup for better linux support (thx @Imperiopolis) +- Limit .vim folder backup for better linux support (via @Imperiopolis) - Add a missing OmniFocus preferences file (via @sbleon) - Support for Phoenix (via @vitorgalvao) - Print out the moved files on uninstall @@ -29,8 +29,8 @@ ## Mackup 0.7.1 - Improved the configuration loader engine -- Added support for Processing (thx @vitorgalvao) -- Improved support for launchbar and fish (thx @aristidesfl) +- Added support for Processing (via @vitorgalvao) +- Improved support for launchbar and fish (via @aristidesfl) - Support for R (via @yonkeltron) - Error out when an absolute filepath is used in a application config @@ -43,8 +43,8 @@ ## Mackup 0.6.1 -- Added support for Livestreamer (thx @vitorgalvao) -- Added support for Brackets (thx @vitorgalvao) +- Added support for Livestreamer (via @vitorgalvao) +- Added support for Brackets (via @vitorgalvao) - Added a list mode to list supported apps - Improved the help message - Prevent Mackup to be run as a superuser @@ -53,143 +53,143 @@ ## Mackup 0.6 - Added support for custom applications -- Fixed pip support (thx @lachlancooper) -- Added XChat support (thx @scottydelta) +- Fixed pip support (via @lachlancooper) +- Added XChat support (via @scottydelta) - Removing Ember support, it does not like file links - Homebrew fixes - Doc updates ## Mackup 0.5.9 -- Added support for rTorrent (thx @mgalkiewicz) -- Added support for Dolphin (thx @lachlancooper) +- Added support for rTorrent (via @mgalkiewicz) +- Added support for Dolphin (via @lachlancooper) - Improved Janus support for Vim - Do not sync Dash Docsets anymore -- Added support for Lightroom 5 (thx @Darep) -- Added support for Adobe Camera Raw (thx @Darep) +- Added support for Lightroom 5 (via @Darep) +- Added support for Adobe Camera Raw (via @Darep) - Refactored the code to prepare future modularization ## Mackup 0.5.8 -- Extend Little Snitch with latest user config file (thx @stechico) -- Added support to Hands Off! (thx @stechico) +- Extend Little Snitch with latest user config file (via @stechico) +- Added support to Hands Off! (via @stechico) - Fixed GnuPG support ## Mackup 0.5.7 - Only sync the config for Bundler - Don't sync Apple Messages attachments -- Added support for Default Folder X (thx @Cottser) -- Added support for Path Finder (thx @Cottser) +- Added support for Default Folder X (via @Cottser) +- Added support for Path Finder (via @Cottser) ## Mackup 0.5.6 -- Added support for LittleSnitch (thx @stechio) -- Added support for OmniGraffle (thx @stecico) -- Added support for SABnzbd (thx @stechico) -- Added support for Skitch (thx @stechico) -- Added support for FontExplorer X (thx @stechico) -- Improved Transmission support (thx @stechico) -- Added support for Lightroom 2, 3 and 4 (thx @stechico) -- Fix Bundler’s synced dir (thx @atipugin) +- Added support for LittleSnitch (via @stechio) +- Added support for OmniGraffle (via @stecico) +- Added support for SABnzbd (via @stechico) +- Added support for Skitch (via @stechico) +- Added support for FontExplorer X (via @stechico) +- Improved Transmission support (via @stechico) +- Added support for Lightroom 2, 3 and 4 (via @stechico) +- Fix Bundler’s synced dir (via @atipugin) ## Mackup 0.5.5 -- Added support for Enjoyable (thx @vitorgalvao) -- Added support for Deal Alert (thx @vitorgalvao) -- Added support for MagicPrefs (thx @vitorgalvao) -- Added support for LaunchBar (thx @Cottser) -- Added support for XLD (thx @vitorgalvao) -- Added support for Gmail Notifr (thx @lachlancooper) -- Added support for Awareness (thx @lachlancooper) -- Added support for Chicken (thx @lachlancooper) -- Added support for Hexels (thx @lachlancooper) -- Added support for Clementine (thx @lachlancooper) -- Add support for mpd and ncmpcpp (thx @zmrow) -- Improved Sublime 3 support (thx @laupiFrpar) -- Added FileZilla support (thx @kidh0) -- Added support for Light Table (thx @vitorgalvao) +- Added support for Enjoyable (via @vitorgalvao) +- Added support for Deal Alert (via @vitorgalvao) +- Added support for MagicPrefs (via @vitorgalvao) +- Added support for LaunchBar (via @Cottser) +- Added support for XLD (via @vitorgalvao) +- Added support for Gmail Notifr (via @lachlancooper) +- Added support for Awareness (via @lachlancooper) +- Added support for Chicken (via @lachlancooper) +- Added support for Hexels (via @lachlancooper) +- Added support for Clementine (via @lachlancooper) +- Add support for mpd and ncmpcpp (via @zmrow) +- Improved Sublime 3 support (via @laupiFrpar) +- Added FileZilla support (via @kidh0) +- Added support for Light Table (via @vitorgalvao) ## Mackup 0.5.4 -- Added support for Arara and Aspell (thx @twsh) +- Added support for Arara and Aspell (via @twsh) - Removed support of OS X Services, as it does not support links -- Added support for i2cssh and iTunes Applescripts (thx @jannae) -- Make slogan consistent throughout (thx @Cottser) -- Added tests to cover file copying and linking (thx @Cottser) -- Better Apple Messages support (thx @vitorgalvao) -- Added support for Keka (thx @vitorgalvao) -- Added support for Feeds (thx @vitorgalvao) -- Added support for Textual (thx @vitorgalvao) +- Added support for i2cssh and iTunes Applescripts (via @jannae) +- Make slogan consistent throughout (via @Cottser) +- Added tests to cover file copying and linking (via @Cottser) +- Better Apple Messages support (via @vitorgalvao) +- Added support for Keka (via @vitorgalvao) +- Added support for Feeds (via @vitorgalvao) +- Added support for Textual (via @vitorgalvao) ## Mackup 0.5.3 -- Added support for Divvy (thx @saulshanabrook) -- Added support for Apple Messages (thx @pzbyszynski) -- Added support for Skype (thx @pzbyszynski) -- Added support for SuperDuper! (thx @pzbyszynski) -- Added support for ForkLift 2 (thx @pzbyszynski) -- Added support for Ember (thx @pzbyszynski) -- Added support for Dash and Cyberduck (thx @suprememoocow) -- Added support for Mou (thx @jannae) -- Added support for PokerStars (thx @vitorgalvao) +- Added support for Divvy (via @saulshanabrook) +- Added support for Apple Messages (via @pzbyszynski) +- Added support for Skype (via @pzbyszynski) +- Added support for SuperDuper! (via @pzbyszynski) +- Added support for ForkLift 2 (via @pzbyszynski) +- Added support for Ember (via @pzbyszynski) +- Added support for Dash and Cyberduck (via @suprememoocow) +- Added support for Mou (via @jannae) +- Added support for PokerStars (via @vitorgalvao) ## Mackup 0.5.2 -- Added support for Tower (thx @MichaelRBond) -- Added support for Colloquy (thx @MichaelRBond) -- Added support for Twitterrific (thx @MichaelRBond) -- Mackup path in dropbox is now configurable via constant (thx @MichaelRBond) -- Added support for Spectacle (thx @vincecima) +- Added support for Tower (via @MichaelRBond) +- Added support for Colloquy (via @MichaelRBond) +- Added support for Twitterrific (via @MichaelRBond) +- Mackup path in dropbox is now configurable via constant (via @MichaelRBond) +- Added support for Spectacle (via @vincecima) ## Mackup 0.5.1 -- Added support for exercism (thx @mwarkentin) +- Added support for exercism (via @mwarkentin) - Added support for Skim - Added support for Scenario -- Added support for Ack (thx @adamlogic) -- Added support for Stata and SelfControl (thx @kfinlay) -- Added support for LaTeXiT (thx @twsh) +- 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 ## Mackup 0.5 -- Added GNU/Linux support (thx @flexiondotorg) +- Added GNU/Linux support (via @flexiondotorg) - Added the ability to explicitly list the list of applications to sync (thx @zuhao) - Added support for Shuttle, the heroku-accounts plugin for Heroku, bundler, - pry and awesome-print for Ruby (thx @yabawock) -- Added support for Bash it (thx @Tam-Lin) + pry and awesome-print for Ruby (via @yabawock) +- Added support for Bash it (via @Tam-Lin) ## Mackup 0.4.4 -- Conflict folder sync fix (thx @ediventurin) -- Added support for PIP (thx @dhellmann) -- Added support for FTP's .netrc, Chef, Pear (thx @yabawock) -- Added support for Irssi (thx @louisrli) -- Added support for Htop and Janus (thx @walkertraylor) -- Added support for Transmit (thx @dustinmm80) -- Improved Vim support (thx @yabawock) +- Conflict folder sync fix (via @ediventurin) +- Added support for PIP (via @dhellmann) +- Added support for FTP's .netrc, Chef, Pear (via @yabawock) +- Added support for Irssi (via @louisrli) +- Added support for Htop and Janus (via @walkertraylor) +- Added support for Transmit (via @dustinmm80) +- Improved Vim support (via @yabawock) ## Mackup 0.4.3 -- Added support for nvALT (thx @stenehall) +- Added support for nvALT (via @stenehall) - Added support for Adobe Lightroom, OS X Scripts Services and Quicklook (thx @Tam-Lin) - Added support for Bartender, Caffeine, CloudApp, Droplr, Fantastical, Moom, - OmniFocus, Pastebot, PopClip, Slogger (thx @ediventurin) + OmniFocus, Pastebot, PopClip, Slogger (via @ediventurin) - Added support for ClipMenu, MenuMeters, PhpStorm 6, RubyMine 5, Spotify - (thx @hakubo) -- Added support for Concentrate (thx @raylillywhite) -- Added support for BibDesk (thx @twsh) + (via @hakubo) +- Added support for Concentrate (via @raylillywhite) +- Added support for BibDesk (via @twsh) ## Mackup 0.4.2 - Made a method to check if a process is running (not yet) -- Added support for XCode (thx @adeca) +- Added support for XCode (via @adeca) - Added support for CoRD, Spark, f.lux, BetterTouchTool, BetterSnapTool and - Coda 2 (thx @TimCorcoran) -- Added support for Mailplane and Gitbox (thx @THEY) + Coda 2 (via @TimCorcoran) +- Added support for Mailplane and Gitbox (via @THEY) ## Mackup 0.4.1 @@ -197,46 +197,46 @@ ## Mackup 0.4 -- Fixed support for locked files e.g. SourceTree (thx @dbingham) -- Added support for Nano (thx @stechico) -- Added support for SHSH Blobs (thx @stechico) -- Added support for Teamocil and Tmuxinator (thx @djquan) -- Added support for Viscosity and Transmission (thx @ovrtn) -- Fixed support for Sublime Text (thx @nZac) -- Added a config file to not sync some user defined applications (thx @nZac) +- Fixed support for locked files e.g. SourceTree (via @dbingham) +- Added support for Nano (via @stechico) +- Added support for SHSH Blobs (via @stechico) +- Added support for Teamocil and Tmuxinator (via @djquan) +- Added support for Viscosity and Transmission (via @ovrtn) +- Fixed support for Sublime Text (via @nZac) +- Added a config file to not sync some user defined applications (via @nZac) ## Mackup 0.3.2 -- Added support for iTerm2 (thx @joshbrown) -- Added support for SourceTree (thx @stechico) -- Added support for OS X's ColorSync profiles (thx @stechico) -- Added support of AppCode 2 (thx @MarcoSero) -- Added support of IntelliJIdea 12 (thx @MarcoSero) -- Added support of RubyMine 4 (thx @MarcoSero) -- Fixed a typo (thx @dhellmann) -- Added support for Screen (thx @dhellmann) -- Added support for PyPI (thx @dhellmann) -- Added support for ExpanDrive (thx @dhellmann) -- Added support for Git Hooks (thx @dhellmann) +- Added support for iTerm2 (via @joshbrown) +- Added support for SourceTree (via @stechico) +- Added support for OS X's ColorSync profiles (via @stechico) +- Added support of AppCode 2 (via @MarcoSero) +- Added support of IntelliJIdea 12 (via @MarcoSero) +- Added support of RubyMine 4 (via @MarcoSero) +- Fixed a typo (via @dhellmann) +- Added support for Screen (via @dhellmann) +- Added support for PyPI (via @dhellmann) +- Added support for ExpanDrive (via @dhellmann) +- Added support for Git Hooks (via @dhellmann) ## Mackup 0.3.1 -- Added support for Slate (thx @stechico) -- Added support for Adium (thx @stechico) -- Improved support for Mercurial (thx @stechico) -- Added support for Sublime Text 3 (thx @laupiFrpar) -- Added support for MPV (thx @Nyx0uf) -- Added support for Ventrilo (thx @stechico) -- Added support for TextMate (thx @hkaju) +- Added support for Slate (via @stechico) +- Added support for Adium (via @stechico) +- Improved support for Mercurial (via @stechico) +- Added support for Sublime Text 3 (via @laupiFrpar) +- Added support for MPV (via @Nyx0uf) +- Added support for Ventrilo (via @stechico) +- Added support for TextMate (via @hkaju) - Added support for Tmux, SizeUp, Quicksilver, Witch, ControlPlane, GeekTool, - Keymo, KeyRemap4MacBook, MercuryMover, PCKeyboardHack (thx @orenshk) + Keymo, KeyRemap4MacBook, MercuryMover, PCKeyboardHack (via @orenshk) - Made the help screen more readable (too many supported apps) ## Mackup 0.3 - Added an uninstall mode to revert a system to its pre-Mackup state -- Added support for Byobu (thx @drye) -- Added support for Fish (thx @saulshanabrook) +- Added support for Byobu (via @drye) +- Added support for Fish (via @saulshanabrook) - Improved the Vim support ## Mackup 0.2 @@ -244,15 +244,15 @@ - Added support for Emacs and XEmacs - Added support for Zsh - Added support for LimeChat -- Added support for Subversion (thx @adamme) -- Added support for Oh My Zsh (thx @adamme) -- Added support for Ruby and Rails (thx @atipugin) -- Added support for Pow (thx @atipugin) -- Added support for Ruby Version (thx @adamstac) -- Added support for Pentadactyl (thx @alanning) -- Added support for Vimperator (thx @alanning) -- Improved Git support (thx @atipugin) -- Improved Bash support (thx @adamme) +- Added support for Subversion (via @adamme) +- Added support for Oh My Zsh (via @adamme) +- Added support for Ruby and Rails (via @atipugin) +- Added support for Pow (via @atipugin) +- Added support for Ruby Version (via @adamstac) +- Added support for Pentadactyl (via @alanning) +- Added support for Vimperator (via @alanning) +- Improved Git support (via @atipugin) +- Improved Bash support (via @adamme) - Doc updates ## Mackup 0.1 From d312090ea51daa24d22404e670865ae4e7d83bfc Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 28 May 2014 13:27:20 -0400 Subject: [PATCH 0050/1256] Mackup 0.7.3 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d57a0f674..0447c729e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.7.3 + - Support for Liftoff (via @Lumde) - Support for Sublime Text 3 in Linux (via @hiyer) - Support for Charles (via @raylillywhite) diff --git a/mackup/constants.py b/mackup/constants.py index 19c089f25..17646019e 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup""" # Current version -VERSION = '0.7.2' +VERSION = '0.7.3' # Mode used to list supported applications LIST_MODE = 'list' From 0dc780ac6c46d4cbfc24794560ef423744ceecf4 Mon Sep 17 00:00:00 2001 From: Danny Siu Date: Thu, 29 May 2014 11:58:51 +0800 Subject: [PATCH 0051/1256] updated README.md to inclue AppCode 3 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ad832fd8c..59709c1d8 100644 --- a/README.md +++ b/README.md @@ -120,6 +120,7 @@ folder and destroy the Mackup folder in Dropbox. - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - [Adobe Lightroom](http://www.adobe.com/products/photoshop-lightroom.html) - [AppCode 2](http://www.jetbrains.com/objc/) + - [AppCode 3](http://www.jetbrains.com/objc/) - [Arara](http://cereda.github.io/arara/) - [Aspell](http://aspell.net/) - [Awareness](http://iamfutureproof.com/tools/awareness/) From c9fad7fcdc4df142d53e48d0428503c416fdbdcb Mon Sep 17 00:00:00 2001 From: ToostInc Date: Thu, 29 May 2014 18:10:49 +0200 Subject: [PATCH 0052/1256] Add support for http://www.newsbeuter.org/ configuration files --- CHANGELOG.md | 2 ++ mackup/applications/newsbeuter.cfg | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 mackup/applications/newsbeuter.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 0447c729e..d86650d42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Support for newsbeuter (via @ToostInc) + ## Mackup 0.7.3 - Support for Liftoff (via @Lumde) diff --git a/mackup/applications/newsbeuter.cfg b/mackup/applications/newsbeuter.cfg new file mode 100644 index 000000000..e4ca4958c --- /dev/null +++ b/mackup/applications/newsbeuter.cfg @@ -0,0 +1,6 @@ +[application] +name = newsbeuter + +[configuration_files] +.newsbeuter/config +.newsbeuter/urls From e1b4e982f01544420ba21a25460bf72fa88f2ced Mon Sep 17 00:00:00 2001 From: Joost Bremmer Date: Thu, 29 May 2014 18:34:53 +0200 Subject: [PATCH 0053/1256] Duh-doy Signed-off-by: Joost Bremmer --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0baadda84..bcc396260 100644 --- a/README.md +++ b/README.md @@ -224,6 +224,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [MPV](http://mpv.io/) - [Nano](http://www.nano-editor.org/) - [ncmpcpp](http://ncmpcpp.rybczak.net) + - [newsbeuter](http://newsbeuter.org/) - [nvALT](http://brettterpstra.com/projects/nvalt/) - [Oh My Zsh](https://github.com/robbyrussell/oh-my-zsh) - [OmniFocus](http://www.omnigroup.com/products/omnifocus/) From c4817f4c1f179a60b5fbf1d9323c75de9bc4d3ae Mon Sep 17 00:00:00 2001 From: Damian Lee Date: Mon, 2 Jun 2014 08:22:37 +0100 Subject: [PATCH 0054/1256] Added tig.cfg file, added entry to CHANGELOG.md --- CHANGELOG.md | 2 ++ mackup/applications/tig.cfg | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 mackup/applications/tig.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 0447c729e..ee6a4b421 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Support for Tig (via @damiankloip) + ## Mackup 0.7.3 - Support for Liftoff (via @Lumde) diff --git a/mackup/applications/tig.cfg b/mackup/applications/tig.cfg new file mode 100644 index 000000000..bd5753c1c --- /dev/null +++ b/mackup/applications/tig.cfg @@ -0,0 +1,5 @@ +[application] +name = Tig + +[configuration_files] +.tigrc From 4bd326ee5df1af1372cfa2c1c7758bc22b36c0c8 Mon Sep 17 00:00:00 2001 From: Damian Lee Date: Mon, 2 Jun 2014 16:58:15 +0100 Subject: [PATCH 0055/1256] Added Tig entry to README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0baadda84..2fb8fa6ff 100644 --- a/README.md +++ b/README.md @@ -277,6 +277,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Teamocil](http://remiprev.github.io/teamocil/) - [TextMate](http://macromates.com/) - [Textual](http://www.codeux.com/textual/) + - [Tig](https://github.com/jonas/tig) - [Tmux](http://tmux.sourceforge.net/) - [Tmuxinator](https://github.com/aziz/tmuxinator) - [Tower](http://www.git-tower.com/) From 393343401f0ecae181d9d9f71298dc9c7d4eecd4 Mon Sep 17 00:00:00 2001 From: Alan LaMielle Date: Wed, 4 Jun 2014 06:08:56 -0700 Subject: [PATCH 0056/1256] Adds bundle directory to vim config The 'bundle' directory in ~/.vim/ is used by both the Pathogen and Vundle plugin managers for vim. --- CHANGELOG.md | 1 + mackup/applications/vim.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee6a4b421..77d9ebeeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Support for Tig (via @damiankloip) +- Added bundle directory to vim config (via @alanlamielle) ## Mackup 0.7.3 diff --git a/mackup/applications/vim.cfg b/mackup/applications/vim.cfg index 237406183..f9836a9b1 100644 --- a/mackup/applications/vim.cfg +++ b/mackup/applications/vim.cfg @@ -7,6 +7,7 @@ name = Vim .gvimrc.after .vim/autoload .vim/colors +.vim/bundle .vimrc .vimrc.before .vimrc.after From 61806e48ad7e5c3a16fe65a7fc98e2b18260678b Mon Sep 17 00:00:00 2001 From: Fei Gao Date: Mon, 9 Jun 2014 12:31:44 +0800 Subject: [PATCH 0057/1256] Added doc/ftdetect/ftplugin/indent/syntax directories to vim config --- mackup/applications/vim.cfg | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mackup/applications/vim.cfg b/mackup/applications/vim.cfg index f9836a9b1..95ad294ad 100644 --- a/mackup/applications/vim.cfg +++ b/mackup/applications/vim.cfg @@ -6,8 +6,13 @@ name = Vim .gvimrc.before .gvimrc.after .vim/autoload -.vim/colors .vim/bundle +.vim/colors +.vim/doc +.vim/ftdetect +.vim/ftplugin +.vim/indent +.vim/syntax .vimrc .vimrc.before .vimrc.after From 2663872a8b54525d6687f9e18eae6154fe88e4f4 Mon Sep 17 00:00:00 2001 From: Fei Gao Date: Mon, 9 Jun 2014 12:36:42 +0800 Subject: [PATCH 0058/1256] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77d9ebeeb..33de7eef5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Added doc, ftdetect, ftplugin, indent, syntax directories to vim config + (via @feigaochn) - Support for Tig (via @damiankloip) - Added bundle directory to vim config (via @alanlamielle) From 10ebe898e534f0b247e58e0463e35fba9dcf6306 Mon Sep 17 00:00:00 2001 From: Fei Gao Date: Mon, 9 Jun 2014 13:15:03 +0800 Subject: [PATCH 0059/1256] Added support for Artistic Style --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/astyle.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/astyle.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 77d9ebeeb..264087ca3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Support for Artistic Style (via @feigaochn) - Support for Tig (via @damiankloip) - Added bundle directory to vim config (via @alanlamielle) diff --git a/README.md b/README.md index 2fb8fa6ff..79e9b9a8a 100644 --- a/README.md +++ b/README.md @@ -138,6 +138,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [AppCode 2](http://www.jetbrains.com/objc/) - [Atom](https://atom.io/) - [Arara](http://cereda.github.io/arara/) + - [Artistic Style](http://astyle.sourceforge.net) - [asciinema](https://asciinema.org/) - [Aspell](http://aspell.net/) - [AusKey](https://abr.gov.au/AUSkey/) diff --git a/mackup/applications/astyle.cfg b/mackup/applications/astyle.cfg new file mode 100644 index 000000000..56024010d --- /dev/null +++ b/mackup/applications/astyle.cfg @@ -0,0 +1,5 @@ +[application] +name = Artistic Style + +[configuration_files] +.astylerc From 6f2ebc47390e5e00f9b9ea605658447721083da3 Mon Sep 17 00:00:00 2001 From: turygo Date: Thu, 12 Jun 2014 11:26:35 +0800 Subject: [PATCH 0060/1256] add appcode 3.0 support. --- mackup/applications/appcode-3.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/appcode-3.cfg diff --git a/mackup/applications/appcode-3.cfg b/mackup/applications/appcode-3.cfg new file mode 100644 index 000000000..679cf9658 --- /dev/null +++ b/mackup/applications/appcode-3.cfg @@ -0,0 +1,6 @@ +[application] +name = AppCode 3 + +[configuration_files] +Library/Application Support/appCode30 +Library/Preferences/appCode30 From fb544588933b33d0d4f2b538135f84bfdebda4d9 Mon Sep 17 00:00:00 2001 From: joaoponceleao Date: Thu, 12 Jun 2014 12:14:09 +0100 Subject: [PATCH 0061/1256] added prezto --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/prezto.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/prezto.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 264087ca3..b278b2f1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Support for Artistic Style (via @feigaochn) - Support for Tig (via @damiankloip) - Added bundle directory to vim config (via @alanlamielle) +- Support for Prezto (via @ponceleao) ## Mackup 0.7.3 diff --git a/README.md b/README.md index 79e9b9a8a..171ce7bfe 100644 --- a/README.md +++ b/README.md @@ -242,6 +242,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [PokerStars](http://www.pokerstars.com/) - [PopClip](http://pilotmoon.com/popclip/) - [Pow](http://pow.cx/) + - [Prezto](https://github.com/sorin-ionescu/prezto) - [Processing](http://processing.org/) - [PyPI](https://pypi.python.org/pypi) - [Quicksilver](http://qsapp.com/) diff --git a/mackup/applications/prezto.cfg b/mackup/applications/prezto.cfg new file mode 100644 index 000000000..42e043efa --- /dev/null +++ b/mackup/applications/prezto.cfg @@ -0,0 +1,5 @@ +[application] +name = Prezto + +[configuration_files] +.zpreztorc From 4c8631c1e54a02fed7b22f2409f152be5f896d2e Mon Sep 17 00:00:00 2001 From: Radek Benkel Date: Sat, 14 Jun 2014 11:46:20 +0200 Subject: [PATCH 0062/1256] Added support for PHPStorm 7 & 8 --- CHANGELOG.md | 1 + README.md | 2 +- mackup/applications/phpstorm-7.cfg | 7 +++++++ mackup/applications/phpstorm-8.cfg | 7 +++++++ 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 mackup/applications/phpstorm-7.cfg create mode 100644 mackup/applications/phpstorm-8.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b278b2f1c..bcbc82e95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Support for Tig (via @damiankloip) - Added bundle directory to vim config (via @alanlamielle) - Support for Prezto (via @ponceleao) +- Added support for PHPStorm 7 & 8 (via @singles) ## Mackup 0.7.3 diff --git a/README.md b/README.md index 171ce7bfe..8d3014954 100644 --- a/README.md +++ b/README.md @@ -237,7 +237,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Pentadactyl](http://5digits.org/pentadactyl/) - [Perl](http://www.perl.org/) - [Phoenix](https://github.com/sdegutis/Phoenix) - - [PhpStorm 6](http://www.jetbrains.com/phpstorm/) + - [PhpStorm](http://www.jetbrains.com/phpstorm/) - [PIP](http://www.pip-installer.org/) - [PokerStars](http://www.pokerstars.com/) - [PopClip](http://pilotmoon.com/popclip/) diff --git a/mackup/applications/phpstorm-7.cfg b/mackup/applications/phpstorm-7.cfg new file mode 100644 index 000000000..b872d33d9 --- /dev/null +++ b/mackup/applications/phpstorm-7.cfg @@ -0,0 +1,7 @@ +[application] +name = PhpStorm 7 + +[configuration_files] +Library/Application Support/WebIde70 +Library/Preferences/WebIde70 +Library/Preferences/com.jetbrains.PhpStorm.plist diff --git a/mackup/applications/phpstorm-8.cfg b/mackup/applications/phpstorm-8.cfg new file mode 100644 index 000000000..1c00110e8 --- /dev/null +++ b/mackup/applications/phpstorm-8.cfg @@ -0,0 +1,7 @@ +[application] +name = PhpStorm 8 + +[configuration_files] +Library/Application Support/WebIde80 +Library/Preferences/WebIde80 +Library/Preferences/com.jetbrains.PhpStorm.plist From 79f6bcde27459817af6b1fdcb6b3762aaf75aaec Mon Sep 17 00:00:00 2001 From: Radek Benkel Date: Sun, 15 Jun 2014 16:10:56 +0200 Subject: [PATCH 0063/1256] Added support for aria2c http://aria2.sourceforge.net/ --- CHANGELOG.md | 1 + README.md | 3 ++- mackup/applications/aria2c.cfg | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 mackup/applications/aria2c.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index bcbc82e95..44cbc459a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Added bundle directory to vim config (via @alanlamielle) - Support for Prezto (via @ponceleao) - Added support for PHPStorm 7 & 8 (via @singles) +- Added support for aria2c (via @singles) ## Mackup 0.7.3 diff --git a/README.md b/README.md index 8d3014954..7187e71a6 100644 --- a/README.md +++ b/README.md @@ -136,11 +136,12 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - [Adobe Lightroom](http://www.adobe.com/products/photoshop-lightroom.html) - [AppCode 2](http://www.jetbrains.com/objc/) - - [Atom](https://atom.io/) + - [aria2c](http://aria2.sourceforge.net/) - [Arara](http://cereda.github.io/arara/) - [Artistic Style](http://astyle.sourceforge.net) - [asciinema](https://asciinema.org/) - [Aspell](http://aspell.net/) + - [Atom](https://atom.io/) - [AusKey](https://abr.gov.au/AUSkey/) - [Awareness](http://iamfutureproof.com/tools/awareness/) - [AWS Command Line Interface](https://aws.amazon.com/cli/) diff --git a/mackup/applications/aria2c.cfg b/mackup/applications/aria2c.cfg new file mode 100644 index 000000000..14c3b30fa --- /dev/null +++ b/mackup/applications/aria2c.cfg @@ -0,0 +1,5 @@ +[application] +name = aria2c + +[configuration_files] +.aria2 From ab0ae65f10a82c901d4cc24ad5075e60846972e6 Mon Sep 17 00:00:00 2001 From: Ryan Burnett Date: Thu, 19 Jun 2014 10:45:55 -0400 Subject: [PATCH 0064/1256] Add Magic Launch support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/magic-launch.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/magic-launch.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 44cbc459a..e20bac8bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Support for Prezto (via @ponceleao) - Added support for PHPStorm 7 & 8 (via @singles) - Added support for aria2c (via @singles) +- Added support for Magic Launch (via @ryanburnett) ## Mackup 0.7.3 diff --git a/README.md b/README.md index 7187e71a6..83146df8d 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. - [Livestreamer](http://livestreamer.tanuki.se/) - [MacOSX](http://www.apple.com/osx/) - [MacVim](https://code.google.com/p/macvim/) + - [Magic Launch](https://www.oneperiodic.com/products/magiclaunch/) - [MagicPrefs](http://magicprefs.com/) - [Mailplane](http://mailplaneapp.com/) - [MenuMeters](http://www.ragingmenace.com/software/menumeters/) diff --git a/mackup/applications/magic-launch.cfg b/mackup/applications/magic-launch.cfg new file mode 100644 index 000000000..ccdf09943 --- /dev/null +++ b/mackup/applications/magic-launch.cfg @@ -0,0 +1,5 @@ +[application] +name = Magic Launch + +[configuration_files] +Library/Preferences/com.metakine.magic-launch.agent.plist \ No newline at end of file From 276d94c998a9070352d9c21a51247063cdb7f0a5 Mon Sep 17 00:00:00 2001 From: Ryan Burnett Date: Mon, 23 Jun 2014 16:15:30 -0400 Subject: [PATCH 0065/1256] Add Magic Launch support --- mackup/applications/magic-launch.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/magic-launch.cfg b/mackup/applications/magic-launch.cfg index ccdf09943..0c3c218b7 100644 --- a/mackup/applications/magic-launch.cfg +++ b/mackup/applications/magic-launch.cfg @@ -2,4 +2,4 @@ name = Magic Launch [configuration_files] -Library/Preferences/com.metakine.magic-launch.agent.plist \ No newline at end of file +Library/Preferences/com.metakine.magic-launch.agent.plist From 7ddd2ef5b41514267a1e747ad6a9ed7198c960bb Mon Sep 17 00:00:00 2001 From: Ryan Burnett Date: Mon, 23 Jun 2014 16:41:10 -0400 Subject: [PATCH 0066/1256] Add Magic Launch and Hazel support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/hazel.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/hazel.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e20bac8bb..d424ceea0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Added support for PHPStorm 7 & 8 (via @singles) - Added support for aria2c (via @singles) - Added support for Magic Launch (via @ryanburnett) +- Added support for Hazel (via @ryanburnett) ## Mackup 0.7.3 diff --git a/README.md b/README.md index 83146df8d..e001a867b 100644 --- a/README.md +++ b/README.md @@ -192,6 +192,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Gmail Notifr](http://ashchan.com/projects/gmail-notifr) - [GnuPG](http://www.gnupg.org/) - [Hands Off!](http://www.oneperiodic.com/products/handsoff/) + - [Hazel](http://www.noodlesoft.com/hazel.php) - [Heroku](https://www.heroku.com/) - [Hexels](http://hexraystudios.com/hexels/) - [Htop](http://htop.sourceforge.net/) diff --git a/mackup/applications/hazel.cfg b/mackup/applications/hazel.cfg new file mode 100644 index 000000000..401d397bd --- /dev/null +++ b/mackup/applications/hazel.cfg @@ -0,0 +1,6 @@ +[application] +name = Hazel + +[configuration_files] +Library/Application Support/Hazel +Library/Preferences/com.noodlesoft.Hazel.plist From d73dee22c93237bb08dca2a43cad14bf797b635c Mon Sep 17 00:00:00 2001 From: Ryan Burnett Date: Mon, 23 Jun 2014 16:56:50 -0400 Subject: [PATCH 0067/1256] Add Magic Launch, Hazel and Soulver support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/soulver.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/soulver.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index d424ceea0..b376ebf6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Added support for aria2c (via @singles) - Added support for Magic Launch (via @ryanburnett) - Added support for Hazel (via @ryanburnett) +- Added support for Soulver (via @ryanburnett) ## Mackup 0.7.3 diff --git a/README.md b/README.md index e001a867b..3d6a71d8c 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. - [Skype](http://www.skype.com/) - [Slate](https://github.com/jigish/slate) - [Slogger](http://brettterpstra.com/projects/slogger/) + - [Soulver](http://www.acqualia.com/soulver/) - [SourceTree](http://sourcetreeapp.com) - [Spark](http://www.shadowlab.org/softwares/spark.php) - [Spectacle](http://spectacleapp.com/) diff --git a/mackup/applications/soulver.cfg b/mackup/applications/soulver.cfg new file mode 100644 index 000000000..97293f4e8 --- /dev/null +++ b/mackup/applications/soulver.cfg @@ -0,0 +1,6 @@ +[application] +name = Soulver + +[configuration_files] +Library/Application Support/Soulver +Library/Preferences/com.acqualia.soulver.plist From 8559181e19450d1d7166361bdc4b330c6d638560 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Sun, 29 Jun 2014 11:55:02 -0500 Subject: [PATCH 0068/1256] Updating Stata sync --- mackup/applications/stata.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/stata.cfg b/mackup/applications/stata.cfg index 3a5494fa2..ea7527bb1 100644 --- a/mackup/applications/stata.cfg +++ b/mackup/applications/stata.cfg @@ -5,3 +5,4 @@ name = Stata Library/Application Support/Stata Library/Preferences/com.stata.stata12.plist Library/Preferences/com.stata.stata13.plist +Library/Preferences/Stata 13 Preferences From d9112b399a5bfb095c4999de9eb44b52149df4ce Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 30 Jun 2014 12:06:37 -0400 Subject: [PATCH 0069/1256] Added missing change log --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f59bad37..b4709d5f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for Hazel (via @ryanburnett) - Added support for Soulver (via @ryanburnett) - Support for newsbeuter (via @ToostInc) +- Improved support for Stata (via @kfinlay) ## Mackup 0.7.3 From c64d2839adad4382c593f4ac735e4a4c5d69e3d9 Mon Sep 17 00:00:00 2001 From: Luis Martins Date: Mon, 30 Jun 2014 18:27:29 +0100 Subject: [PATCH 0070/1256] Atom syncs only config data, excluding cache files --- CHANGELOG.md | 2 +- mackup/applications/atom.cfg | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4709d5f8..ba0275d9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Mackup Changelog ## WIP - +- Atom now only syncs essential files, excluding compiled and cache folders (via @lmartins) - Support for Artistic Style (via @feigaochn) - Support for Tig (via @damiankloip) - Added bundle directory to vim config (via @alanlamielle) diff --git a/mackup/applications/atom.cfg b/mackup/applications/atom.cfg index 837a23728..4d6043fb9 100644 --- a/mackup/applications/atom.cfg +++ b/mackup/applications/atom.cfg @@ -4,4 +4,10 @@ name = Atom [configuration_files] Library/Preferences/com.github.atom.plist -.atom +.atom/config.cson +.atom/init.coffee +.atom/keymap.cson +.atom/keymaps +.atom/packages +.atom/snippets.cson +.atom/styles.less From e01ffb5dadb2c7556476278c262f62e723428499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= Date: Mon, 30 Jun 2014 19:19:10 +0100 Subject: [PATCH 0071/1256] Removed `Library/Preferences/com.apple.iChat.plist` from messages.cfg As per #286. This file seems to store information about the current state, so there should be no harm in removing it. --- mackup/applications/messages.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/mackup/applications/messages.cfg b/mackup/applications/messages.cfg index 9587ad945..795d8bcf9 100644 --- a/mackup/applications/messages.cfg +++ b/mackup/applications/messages.cfg @@ -3,7 +3,6 @@ name = Messages [configuration_files] Library/Application Scripts/com.apple.iChat -Library/Preferences/com.apple.iChat.plist Library/Preferences/com.apple.iChat.AIM.plist Library/Preferences/com.apple.iChat.Jabber.plist Library/Preferences/com.apple.iChat.LSSharedFileList.plist From b0066d4e7eb20b73e31d1d0d5eac225394f6dd1d Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 30 Jun 2014 14:37:10 -0400 Subject: [PATCH 0072/1256] Missing change log --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4709d5f8..763c4e414 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Added support for Soulver (via @ryanburnett) - Support for newsbeuter (via @ToostInc) - Improved support for Stata (via @kfinlay) +- Improved Messages support (via @vitorgalvao) ## Mackup 0.7.3 From 520ae658bd7f1d15522e02db728ceb20af428dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= Date: Tue, 1 Jul 2014 02:40:20 +0100 Subject: [PATCH 0073/1256] Removed `Library/Preferences/com.apple.iChat.LSSharedFileList.plist` from `messages.cfg` --- mackup/applications/messages.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/mackup/applications/messages.cfg b/mackup/applications/messages.cfg index 795d8bcf9..5235947e7 100644 --- a/mackup/applications/messages.cfg +++ b/mackup/applications/messages.cfg @@ -5,6 +5,5 @@ name = Messages Library/Application Scripts/com.apple.iChat Library/Preferences/com.apple.iChat.AIM.plist Library/Preferences/com.apple.iChat.Jabber.plist -Library/Preferences/com.apple.iChat.LSSharedFileList.plist Library/Preferences/com.apple.iChat.StatusMessages.plist Library/Preferences/com.apple.iChat.Yahoo.plist From a05e2d3829f609c028970a686ea4cc7a1680cf04 Mon Sep 17 00:00:00 2001 From: Hariharan Iyer Date: Tue, 1 Jul 2014 12:52:26 +0530 Subject: [PATCH 0074/1256] squash merge support for sublime text linux --- CHANGELOG.md | 1 + mackup/applications/sublime-text-3.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd0eb153c..ca369faa8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Support for Sublime Text 3 in Linux - Support for Charles (via @raylillywhite) - Support for Keybase - Support for MySQL (via @fayland) diff --git a/mackup/applications/sublime-text-3.cfg b/mackup/applications/sublime-text-3.cfg index 63e44125a..2e878a17c 100644 --- a/mackup/applications/sublime-text-3.cfg +++ b/mackup/applications/sublime-text-3.cfg @@ -3,3 +3,4 @@ name = Sublime Text 3 [configuration_files] Library/Application Support/Sublime Text 3/Packages/User +.config/sublime-text-3 From 64b1008ad7a637679deabca24d44af4ef5a4fe74 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Thu, 3 Jul 2014 10:09:42 -0500 Subject: [PATCH 0075/1256] Create seil.cfg PCKeyboardHack was renamed Seil. The new version saves preferences to a renamed file. --- mackup/applications/seil.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/seil.cfg diff --git a/mackup/applications/seil.cfg b/mackup/applications/seil.cfg new file mode 100644 index 000000000..4caf6bef6 --- /dev/null +++ b/mackup/applications/seil.cfg @@ -0,0 +1,5 @@ +[application] +name = Seil + +[configuration_files] +Library/Preferences/org.pqrs.Seil.plist From 766f530fae8661785aaa5b98c77d86e601f86c8e Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Thu, 3 Jul 2014 10:21:27 -0500 Subject: [PATCH 0076/1256] Added Seil to README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 040aba559..3d812c09a 100644 --- a/README.md +++ b/README.md @@ -263,6 +263,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Scenario](http://www.lagentesoft.com/scenario/) - [Screen](http://www.gnu.org/software/screen/) - [SelfControl](http://selfcontrolapp.com/) + - [Seil](https://pqrs.org/macosx/keyremap4macbook/seil.html.en) - [Sequel Pro](http://www.sequelpro.com/) - [SHSH Blobs](http://en.wikipedia.org/wiki/SHSH_blob) - [Shuttle](http://fitztrev.github.io/shuttle/) From 47756b98204ed55f811035d77eda85565e6eb758 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Thu, 3 Jul 2014 10:22:54 -0500 Subject: [PATCH 0077/1256] Added Seil change --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10239779c..05c8e6b18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Support for newsbeuter (via @ToostInc) - Improved support for Stata (via @kfinlay) - Improved Messages support (via @vitorgalvao) +- Added support for Seil, a renamed PCKeyboardHack (via @kfinlay) ## Mackup 0.7.3 From 7734186309137927181992ac8c187178ced4b61c Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Thu, 3 Jul 2014 13:58:22 -0500 Subject: [PATCH 0078/1256] Delete pckeyboardhack.cfg It's configs have been moved to Seil, which is the new name of the software. --- mackup/applications/pckeyboardhack.cfg | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 mackup/applications/pckeyboardhack.cfg diff --git a/mackup/applications/pckeyboardhack.cfg b/mackup/applications/pckeyboardhack.cfg deleted file mode 100644 index bb5931c96..000000000 --- a/mackup/applications/pckeyboardhack.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[application] -name = PCKeyboardHack - -[configuration_files] -Library/Preferences/org.pqrs.PCKeyboardHack.plist From 032559e14213a1827475700d3117a473c2582c8e Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Thu, 3 Jul 2014 13:59:04 -0500 Subject: [PATCH 0079/1256] Update seil.cfg Pulled PCKeyboardBack's configs into this file. --- mackup/applications/seil.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/seil.cfg b/mackup/applications/seil.cfg index 4caf6bef6..ac6de9913 100644 --- a/mackup/applications/seil.cfg +++ b/mackup/applications/seil.cfg @@ -2,4 +2,5 @@ name = Seil [configuration_files] +Library/Preferences/org.pqrs.PCKeyboardHack.plist Library/Preferences/org.pqrs.Seil.plist From c466d99dbf62bf2d6752e75396d674e3b88c563f Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Thu, 3 Jul 2014 14:01:53 -0500 Subject: [PATCH 0080/1256] Update README.md Removed PCKeyboardHack, since it's now named of Seil. --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 3d812c09a..e96b2ece9 100644 --- a/README.md +++ b/README.md @@ -236,7 +236,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [OpenSSH](http://www.openssh.org/) - [Pastebot](http://tapbots.com/software/pastebot/) - [Path Finder](http://www.cocoatech.com/pathfinder/) - - [PCKeyboardHack](http://pqrs.org/macosx/keyremap4macbook/pckeyboardhack.html.en) - [Pear](http://pear.php.net/) - [Pentadactyl](http://5digits.org/pentadactyl/) - [Perl](http://www.perl.org/) From 2dbdcddce75127338a5a66e91235224fca313f88 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Thu, 3 Jul 2014 14:02:56 -0500 Subject: [PATCH 0081/1256] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05c8e6b18..8744657c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ - Support for newsbeuter (via @ToostInc) - Improved support for Stata (via @kfinlay) - Improved Messages support (via @vitorgalvao) -- Added support for Seil, a renamed PCKeyboardHack (via @kfinlay) +- Support for Seil and moved PCKeyboardHack there (via @kfinlay) ## Mackup 0.7.3 From dcb26baf56f13330c069eadad35ac8feca7ac215 Mon Sep 17 00:00:00 2001 From: nkcfan Date: Sun, 6 Jul 2014 17:10:46 +0800 Subject: [PATCH 0082/1256] Refine ssh config: no need to backup keys --- CHANGELOG.md | 1 + mackup/applications/ssh.cfg | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8744657c3..5f5d65516 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Improved support for Stata (via @kfinlay) - Improved Messages support (via @vitorgalvao) - Support for Seil and moved PCKeyboardHack there (via @kfinlay) +- Improved support for ssh, excluding any the credential keys (via @nkcfan) ## Mackup 0.7.3 diff --git a/mackup/applications/ssh.cfg b/mackup/applications/ssh.cfg index ea264b63c..195cc8fd4 100644 --- a/mackup/applications/ssh.cfg +++ b/mackup/applications/ssh.cfg @@ -2,4 +2,5 @@ name = SSH [configuration_files] -.ssh +.ssh/config +.ssh/authorized_keys From 167edbc333b377f5b8cb726b3f913a42bc564248 Mon Sep 17 00:00:00 2001 From: nkcfan Date: Sun, 13 Jul 2014 15:44:09 +0800 Subject: [PATCH 0083/1256] Add .curlrc as a config file for curl --- CHANGELOG.md | 1 + mackup/applications/curl.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8744657c3..63d50a756 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Improved support for Stata (via @kfinlay) - Improved Messages support (via @vitorgalvao) - Support for Seil and moved PCKeyboardHack there (via @kfinlay) +- Improved support for curl (via @nkcfan) ## Mackup 0.7.3 diff --git a/mackup/applications/curl.cfg b/mackup/applications/curl.cfg index 05e3a5cef..877537d34 100644 --- a/mackup/applications/curl.cfg +++ b/mackup/applications/curl.cfg @@ -3,3 +3,4 @@ name = Curl [configuration_files] .netrc +.curlrc From 732d111a4c98b25097a9471182027a6d3db00ae6 Mon Sep 17 00:00:00 2001 From: xinba Date: Mon, 14 Jul 2014 11:44:05 +0800 Subject: [PATCH 0084/1256] added Appcode 3.x --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63d50a756..59bf64099 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Support for Tig (via @damiankloip) - Added bundle directory to vim config (via @alanlamielle) - Support for Prezto (via @ponceleao) +- Added support of AppCode 3 (via @turygo) - Added support for PHPStorm 7 & 8 (via @singles) - Added support for aria2c (via @singles) - Added support for Magic Launch (via @ryanburnett) diff --git a/README.md b/README.md index e96b2ece9..abfac03f2 100644 --- a/README.md +++ b/README.md @@ -136,6 +136,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - [Adobe Lightroom](http://www.adobe.com/products/photoshop-lightroom.html) - [AppCode 2](http://www.jetbrains.com/objc/) + - [AppCode 3](http://www.jetbrains.com/objc/) - [aria2c](http://aria2.sourceforge.net/) - [Arara](http://cereda.github.io/arara/) - [Artistic Style](http://astyle.sourceforge.net) From 851fe064c80645f08e1643991fd36af00410cf78 Mon Sep 17 00:00:00 2001 From: Hariharan Iyer Date: Mon, 14 Jul 2014 15:54:09 +0530 Subject: [PATCH 0085/1256] add support for nvpy simplenote client --- mackup/applications/nvpy.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/nvpy.cfg diff --git a/mackup/applications/nvpy.cfg b/mackup/applications/nvpy.cfg new file mode 100644 index 000000000..02f081298 --- /dev/null +++ b/mackup/applications/nvpy.cfg @@ -0,0 +1,6 @@ +[application] +name = nvpy + +[configuration_files] +.nvpy.cfg + From 0350704c086a86b0a1a3422a37e5edf7215f4ec3 Mon Sep 17 00:00:00 2001 From: Hariharan Iyer Date: Mon, 14 Jul 2014 16:14:16 +0530 Subject: [PATCH 0086/1256] add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63d50a756..b4255ba6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Mackup Changelog ## WIP +- Added support for nvpy - a Linux client for SimpleNote (via @hiyer) - Atom now only syncs essential files, excluding compiled and cache folders (via @lmartins) - Support for Artistic Style (via @feigaochn) - Support for Tig (via @damiankloip) From ca5522b34c7ab2010486a6b24685a3aab1b98931 Mon Sep 17 00:00:00 2001 From: Fernando Paredes Date: Mon, 14 Jul 2014 09:57:39 -0700 Subject: [PATCH 0087/1256] Fish: Sync custom completions folder --- CHANGELOG.md | 1 + mackup/applications/fish.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63d50a756..9b2fe2af0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Improved Messages support (via @vitorgalvao) - Support for Seil and moved PCKeyboardHack there (via @kfinlay) - Improved support for curl (via @nkcfan) +- Improved support for fish (via @nanoxd) ## Mackup 0.7.3 diff --git a/mackup/applications/fish.cfg b/mackup/applications/fish.cfg index c3b46f810..c25b21b3f 100644 --- a/mackup/applications/fish.cfg +++ b/mackup/applications/fish.cfg @@ -4,3 +4,4 @@ name = Fish [configuration_files] .config/fish/config.fish .config/fish/functions +.config/fish/completions From c04ddd478263e0eb87e1efe3192a78d7e9268754 Mon Sep 17 00:00:00 2001 From: Hariharan Iyer Date: Tue, 15 Jul 2014 00:27:49 +0530 Subject: [PATCH 0088/1256] remove newline, add entry in readme --- README.md | 1 + mackup/applications/nvpy.cfg | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e96b2ece9..6c5653868 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. - [ncmpcpp](http://ncmpcpp.rybczak.net) - [newsbeuter](http://newsbeuter.org/) - [nvALT](http://brettterpstra.com/projects/nvalt/) + - [nvpy](https://github.com/cpbotha/nvpy) - [Oh My Zsh](https://github.com/robbyrussell/oh-my-zsh) - [OmniFocus](http://www.omnigroup.com/products/omnifocus/) - [OmniGraffle](http://www.omnigroup.com/omnigraffle/) diff --git a/mackup/applications/nvpy.cfg b/mackup/applications/nvpy.cfg index 02f081298..a8a64a594 100644 --- a/mackup/applications/nvpy.cfg +++ b/mackup/applications/nvpy.cfg @@ -3,4 +3,3 @@ name = nvpy [configuration_files] .nvpy.cfg - From e64e9c2625925ecb3aa6c13851cf884d01c61682 Mon Sep 17 00:00:00 2001 From: Jesse Bunch Date: Fri, 18 Jul 2014 13:36:19 -0700 Subject: [PATCH 0089/1256] Add support for Xcode templates Users can create custom templates for use in the Xcode New File dialog. This will also back up those. --- mackup/applications/xcode.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/xcode.cfg b/mackup/applications/xcode.cfg index 8f14b6b5d..f09178d65 100644 --- a/mackup/applications/xcode.cfg +++ b/mackup/applications/xcode.cfg @@ -6,3 +6,4 @@ Library/Developer/Xcode/UserData/CodeSnippets Library/Developer/Xcode/UserData/FontAndColorThemes Library/Developer/Xcode/UserData/KeyBindings Library/Developer/Xcode/UserData/SearchScopes.xcsclist +Library/Developer/Xcode/Templates From cc19274608c1e4f6d052a8f9f30ffa3cd37deb11 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 26 Jul 2014 23:17:20 -0500 Subject: [PATCH 0090/1256] improved support for Slate --- CHANGELOG.md | 1 + mackup/applications/slate.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45de05792..e40e514b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Mackup Changelog ## WIP +- Improved support for Slate (via @bradcerasani) - Added support for nvpy - a Linux client for SimpleNote (via @hiyer) - Atom now only syncs essential files, excluding compiled and cache folders (via @lmartins) - Support for Artistic Style (via @feigaochn) diff --git a/mackup/applications/slate.cfg b/mackup/applications/slate.cfg index f48b4ad63..86d892676 100644 --- a/mackup/applications/slate.cfg +++ b/mackup/applications/slate.cfg @@ -3,4 +3,5 @@ name = Slate [configuration_files] .slate +.slate.js Library/Application Support/com.slate.Slate From f0eaa299a144b8bf6eed9ab44ce3c0d2e6430b20 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Mon, 28 Jul 2014 15:41:49 -0500 Subject: [PATCH 0091/1256] Update bibdesk.cfg Added AppSupport folder --- mackup/applications/bibdesk.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/bibdesk.cfg b/mackup/applications/bibdesk.cfg index b356efae1..d522e7927 100644 --- a/mackup/applications/bibdesk.cfg +++ b/mackup/applications/bibdesk.cfg @@ -3,3 +3,4 @@ name = BibDesk [configuration_files] Library/Preferences/edu.ucsd.cs.mmccrack.bibdesk.plist +Library/Application Support/BibDesk From 80118cdc51c65267ff28e20ed247f3d248bb1e13 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Mon, 28 Jul 2014 15:45:34 -0500 Subject: [PATCH 0092/1256] Update CHANGELOG.md Improved support for BibDesk --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e40e514b6..f1da1894d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Support for Seil and moved PCKeyboardHack there (via @kfinlay) - Improved support for curl (via @nkcfan) - Improved support for fish (via @nanoxd) +- Improved support for BibDesk (via @kfinlay) ## Mackup 0.7.3 From 120eed007bee31f388bc07ddb69c89c8a40b2763 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Wed, 30 Jul 2014 14:02:06 -0500 Subject: [PATCH 0093/1256] Create karabiner.cfg --- mackup/applications/karabiner.cfg | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 mackup/applications/karabiner.cfg diff --git a/mackup/applications/karabiner.cfg b/mackup/applications/karabiner.cfg new file mode 100644 index 000000000..7636fbe40 --- /dev/null +++ b/mackup/applications/karabiner.cfg @@ -0,0 +1,8 @@ +[application] +name = Karabiner + +[configuration_files] +Library/Preferences/org.pqrs.Karabiner.plist +Library/Preferences/org.pqrs.Karabiner-AXNotifier.plist +Library/Preferences/org.pqrs.Karabiner.multitouchextension.plist +Library/Application Support/Karabiner/private.xml From 8a90b792702838a3aa4fd25977bcbd18bbc498ab Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Wed, 30 Jul 2014 14:03:59 -0500 Subject: [PATCH 0094/1256] Support for Karabiner --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1da1894d..880baea4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ - Improved support for curl (via @nkcfan) - Improved support for fish (via @nanoxd) - Improved support for BibDesk (via @kfinlay) +- Support for Karabiner (via @kfinlay) ## Mackup 0.7.3 From c27c7e4ebfa6a92847692643cf84fc93316bc71d Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Wed, 30 Jul 2014 14:04:57 -0500 Subject: [PATCH 0095/1256] Support for Karabiner --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6c5653868..3b9fa8f1b 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. - [Irssi](http://www.irssi.org/) - [ITerm2](http://www.iterm2.com/) - [Janus](https://github.com/carlhuda/janus) + - [Karabiner](https://pqrs.org/osx/karabiner) - [Keka](http://kekaosx.com/) - [Keybase](https://keybase.io/) - [Keymo](http://manytricks.com/keymo/) From c4798cc86794ccc710e6d24e73f4acd2604f5b36 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Thu, 31 Jul 2014 11:06:17 -0500 Subject: [PATCH 0096/1256] Update TextMate --- mackup/applications/textmate.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/textmate.cfg b/mackup/applications/textmate.cfg index 7ca1e3c92..2e6c1a9ef 100644 --- a/mackup/applications/textmate.cfg +++ b/mackup/applications/textmate.cfg @@ -4,3 +4,4 @@ name = TextMate [configuration_files] Library/Application Support/TextMate Library/Preferences/com.macromates.textmate.plist +Library/Preferences/com.macromates.textmate.latex_config.plist From 16901d991e84f1a238c814cee088b496228ff283 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Thu, 31 Jul 2014 11:07:17 -0500 Subject: [PATCH 0097/1256] Latex config for TextMate --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 880baea4f..d2f3de6cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - Improved support for fish (via @nanoxd) - Improved support for BibDesk (via @kfinlay) - Support for Karabiner (via @kfinlay) +- Latex config for TextMate (via @kfinlay) ## Mackup 0.7.3 From ed5f21e5131b9a73fba4884a1028dcc7c0ccb592 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Thu, 31 Jul 2014 11:11:01 -0500 Subject: [PATCH 0098/1256] Create cartographica.cfg --- mackup/applications/cartographica.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/cartographica.cfg diff --git a/mackup/applications/cartographica.cfg b/mackup/applications/cartographica.cfg new file mode 100644 index 000000000..891373b1f --- /dev/null +++ b/mackup/applications/cartographica.cfg @@ -0,0 +1,6 @@ +[application] +name = Cartographica + +[configuration_files] +Library/Application Support/Cartographica +Library/Preferences/com.ClueTrust.Cartographica.plist From 6fc0df4d283b724c262772b76b6bfa1654bd1ed7 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Thu, 31 Jul 2014 11:12:06 -0500 Subject: [PATCH 0099/1256] Support for Cartographica --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3b9fa8f1b..42681af89 100644 --- a/README.md +++ b/README.md @@ -156,6 +156,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/) + - [Cartographica](http://www.macgis.com) - [Charles](http://www.charlesproxy.com) - [Chef](http://www.opscode.com/chef/) - [Chicken](http://sourceforge.net/projects/chicken/) From 34b2c6b91366498bd3b23a7a73f43ce685f0cd09 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Thu, 31 Jul 2014 11:12:41 -0500 Subject: [PATCH 0100/1256] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 880baea4f..34838f362 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - Improved support for fish (via @nanoxd) - Improved support for BibDesk (via @kfinlay) - Support for Karabiner (via @kfinlay) +- Support for Cartographica (via @kfinlay) ## Mackup 0.7.3 From 890b32447cfebb82552fde214c05acc8449fec4d Mon Sep 17 00:00:00 2001 From: Adam Clark Date: Wed, 6 Aug 2014 12:16:26 -0700 Subject: [PATCH 0101/1256] adding jshint config --- mackup/applications/jshint.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/jshint.cfg diff --git a/mackup/applications/jshint.cfg b/mackup/applications/jshint.cfg new file mode 100644 index 000000000..cf3a5585a --- /dev/null +++ b/mackup/applications/jshint.cfg @@ -0,0 +1,5 @@ +[application] +name = JSHint + +[configuration_files] +.jshintrc From 408b06a31d88770b1a4c17c495243a25993e728c Mon Sep 17 00:00:00 2001 From: Adam Clark Date: Wed, 6 Aug 2014 12:18:53 -0700 Subject: [PATCH 0102/1256] updating documentation --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76245e876..ba460b188 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Mackup Changelog ## WIP +- Added support for JSHints .jshintrc - Improved support for Slate (via @bradcerasani) - Added support for nvpy - a Linux client for SimpleNote (via @hiyer) - Atom now only syncs essential files, excluding compiled and cache folders (via @lmartins) diff --git a/README.md b/README.md index 42681af89..1c8b36f2b 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. - [IntelliJIDEA 12](http://www.jetbrains.com/idea/) - [Irssi](http://www.irssi.org/) - [ITerm2](http://www.iterm2.com/) + - [JSHint](http://www.jshint.com/) - [Janus](https://github.com/carlhuda/janus) - [Karabiner](https://pqrs.org/osx/karabiner) - [Keka](http://kekaosx.com/) From 67c9dca43c3e0217d7b5b15b5e3f7f37ece9cc3b Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Wed, 6 Aug 2014 15:09:58 -0500 Subject: [PATCH 0103/1256] Create go2shell.cfg --- mackup/applications/go2shell.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/go2shell.cfg diff --git a/mackup/applications/go2shell.cfg b/mackup/applications/go2shell.cfg new file mode 100644 index 000000000..442e9451d --- /dev/null +++ b/mackup/applications/go2shell.cfg @@ -0,0 +1,5 @@ +[application] +name = Go2Shell + +[configuration_files] +Library/Preferences/com.alice.mac.go2shell.plist From 336c7ac0bc1d13e4b2635946fcec49911c001323 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Wed, 6 Aug 2014 15:10:30 -0500 Subject: [PATCH 0104/1256] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76245e876..f3dfd48c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ - Support for Karabiner (via @kfinlay) - Latex config for TextMate (via @kfinlay) - Support for Cartographica (via @kfinlay) +- Support for Go2Shell (via @kfinlay) ## Mackup 0.7.3 From a41c0958e251b0ce9a0c75677f7f0cba20522f17 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Wed, 6 Aug 2014 15:11:14 -0500 Subject: [PATCH 0105/1256] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 42681af89..59fad5b39 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. - [Git](http://git-scm.com/) - [Gitbox](http://gitboxapp.com/) - [Gmail Notifr](http://ashchan.com/projects/gmail-notifr) + - [Go2Shell](http://zipzapmac.com/Go2Shell) - [GnuPG](http://www.gnupg.org/) - [Hands Off!](http://www.oneperiodic.com/products/handsoff/) - [Hazel](http://www.noodlesoft.com/hazel.php) From 1c01d49fccbd3f02bf8eafd08fad451bbb2b4eaa Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Thu, 7 Aug 2014 10:42:50 -0500 Subject: [PATCH 0106/1256] Update expandrive.cfg --- mackup/applications/expandrive.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/expandrive.cfg b/mackup/applications/expandrive.cfg index 5ea394070..8da43ecca 100644 --- a/mackup/applications/expandrive.cfg +++ b/mackup/applications/expandrive.cfg @@ -3,3 +3,5 @@ name = ExpanDrive [configuration_files] Library/Application Support/ExpanDrive +Preferences/com.expandrive.ExpanDrive2.plist +Preferences/com.expandrive.ExpanDrive3.plist From 96697ece7514041656dabae45ee2aa70c55869a6 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Thu, 7 Aug 2014 10:43:24 -0500 Subject: [PATCH 0107/1256] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd39677ed..868a1d511 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - Latex config for TextMate (via @kfinlay) - Support for Cartographica (via @kfinlay) - Support for Go2Shell (via @kfinlay) +- Improved support for ExpanDrive (via @kfinlay) ## Mackup 0.7.3 From be1259f7e3b3b8d1a7614445d87d476ef88038f2 Mon Sep 17 00:00:00 2001 From: mAAdhaTTah Date: Thu, 7 Aug 2014 22:57:51 -0400 Subject: [PATCH 0108/1256] Create config for Tower2 --- mackup/applications/tower-2.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/tower-2.cfg diff --git a/mackup/applications/tower-2.cfg b/mackup/applications/tower-2.cfg new file mode 100644 index 000000000..ddf1b6292 --- /dev/null +++ b/mackup/applications/tower-2.cfg @@ -0,0 +1,6 @@ +[application] +name = Tower 2 + +[configuration_files] +Library/Application Support/com.fournova.Tower2 +Library/Preferences/com.fournova.Tower2.plist From 4e8749073082c866f2429b165f39dc1445ffe723 Mon Sep 17 00:00:00 2001 From: mAAdhaTTah Date: Fri, 8 Aug 2014 07:47:50 -0400 Subject: [PATCH 0109/1256] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 868a1d511..ffde89e17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ - Support for Cartographica (via @kfinlay) - Support for Go2Shell (via @kfinlay) - Improved support for ExpanDrive (via @kfinlay) +- Added support for Tower 2 (via @mAAdhaTTah) ## Mackup 0.7.3 From 35a9177ddff235b7e63399e58cdd0e0801f7410b Mon Sep 17 00:00:00 2001 From: Olaf Alders Date: Tue, 12 Aug 2014 23:02:15 -0400 Subject: [PATCH 0110/1256] Updates Textual config file location. --- CHANGELOG.md | 1 + mackup/applications/textual.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffde89e17..8275edffb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Support for Go2Shell (via @kfinlay) - Improved support for ExpanDrive (via @kfinlay) - Added support for Tower 2 (via @mAAdhaTTah) +- Improved support for Textual (via @oalders) ## Mackup 0.7.3 diff --git a/mackup/applications/textual.cfg b/mackup/applications/textual.cfg index ac72d4600..092abfb79 100644 --- a/mackup/applications/textual.cfg +++ b/mackup/applications/textual.cfg @@ -4,3 +4,4 @@ name = Textual [configuration_files] Library/Application Support/Textual IRC Library/Preferences/com.codeux.irc.textual.plist +Library/Containers/com.codeux.irc.textual From 9be12b50d3d2d3445f91f46eec98e05ae417a25b Mon Sep 17 00:00:00 2001 From: Dann Luciano Date: Thu, 14 Aug 2014 10:16:55 -0300 Subject: [PATCH 0111/1256] Fixed small bugs in python 3 --- mackup/application.py | 6 +++--- mackup/config.py | 4 ++-- mackup/main.py | 14 +++++++------- mackup/utils.py | 4 +++- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/mackup/application.py b/mackup/application.py index cc59ec479..a42c7a566 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -56,7 +56,7 @@ def backup(self): or os.path.isdir(mackup_filepath)) and os.path.samefile(filepath, mackup_filepath))): - print "Backing up {}...".format(filename) + print("Backing up {}...".format(filename)) # Check if we already have a backup if os.path.exists(mackup_filepath): @@ -124,7 +124,7 @@ def restore(self): home_filepath)) and utils.can_file_be_synced_on_current_platform(filename)): - print "Restoring {}...".format(filename) + print("Restoring {}...".format(filename)) # Check if there is already a file in the home folder if os.path.exists(home_filepath): @@ -174,7 +174,7 @@ def uninstall(self): # Check if there is a corresponding file in the home folder if os.path.exists(home_filepath): - print "Moving {} back into your home...".format(filename) + print("Moving {} back into your home...".format(filename)) # If there is, delete it as we are gonna copy the Dropbox # one there utils.delete(home_filepath) diff --git a/mackup/config.py b/mackup/config.py index 3fd27f1c3..eaede20cd 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -5,13 +5,13 @@ import os import os.path -from constants import (MACKUP_BACKUP_PATH, +from .constants import (MACKUP_BACKUP_PATH, MACKUP_CONFIG_FILE, ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_FS) -from utils import (error, +from .utils import (error, get_dropbox_folder_location, get_google_drive_folder_location) try: diff --git a/mackup/main.py b/mackup/main.py index 33ddbd24d..a8f822b88 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -73,12 +73,12 @@ def main(): # 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 !" - .format(os.path.abspath(__file__))) + print("\n" + "All your files have been put back into place. You can now" + " safely uninstall Mackup.\n" + "\n" + "Thanks for using Mackup !" + .format(os.path.abspath(__file__))) elif args.mode == LIST_MODE: # Display the list of supported applications @@ -89,7 +89,7 @@ def main(): output += "\n" output += ("{} applications supported in Mackup v{}" .format(len(app_db.get_app_names()), VERSION)) - print output + print(output) else: raise ValueError("Unsupported mode: {}".format(args.mode)) diff --git a/mackup/utils.py b/mackup/utils.py index 42fafc5db..f74d40165 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -11,6 +11,8 @@ from . import constants +try: input = raw_input +except NameError: pass def confirm(question): """ @@ -23,7 +25,7 @@ def confirm(question): (boolean): Confirmed or not """ while True: - answer = raw_input(question + ' ') + answer = input(question + ' ') if answer == 'Yes': confirmed = True break From b23571d27964e57638bfa60da13ae701a2ba22d8 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 17 Aug 2014 16:52:04 +0200 Subject: [PATCH 0112/1256] SVG build status icon --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 41a523c69..08255da53 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Keep your application settings in sync. -[![Build Status](https://travis-ci.org/lra/mackup.png?branch=master)](https://travis-ci.org/lra/mackup) +[![Build Status](https://travis-ci.org/lra/mackup.svg?branch=master)](https://travis-ci.org/lra/mackup) [![Coverage Status](https://coveralls.io/repos/lra/mackup/badge.png)](https://coveralls.io/r/lra/mackup) [![Code Health](https://landscape.io/github/lra/mackup/master/landscape.png)](https://landscape.io/github/lra/mackup/master) From 1528ea1bc85b82330f80c633ca3beaec577425aa Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 17 Aug 2014 16:53:53 +0200 Subject: [PATCH 0113/1256] SVG icon for coveralls --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 08255da53..d48d96bf7 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Keep your application settings in sync. [![Build Status](https://travis-ci.org/lra/mackup.svg?branch=master)](https://travis-ci.org/lra/mackup) -[![Coverage Status](https://coveralls.io/repos/lra/mackup/badge.png)](https://coveralls.io/r/lra/mackup) +[![Coverage Status](https://img.shields.io/coveralls/lra/mackup.svg)](https://coveralls.io/r/lra/mackup?branch=master) [![Code Health](https://landscape.io/github/lra/mackup/master/landscape.png)](https://landscape.io/github/lra/mackup/master) ## Quickstart From 1896d5f48ac4e7c65eacef1b39cfa99eab0cd441 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 28 Aug 2014 17:37:28 -0400 Subject: [PATCH 0114/1256] Move CI to CCI --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d48d96bf7..97eb680f3 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Keep your application settings in sync. -[![Build Status](https://travis-ci.org/lra/mackup.svg?branch=master)](https://travis-ci.org/lra/mackup) +[![Circle CI](https://circleci.com/gh/lra/mackup.png?style=badge)](https://circleci.com/gh/lra/mackup) [![Coverage Status](https://img.shields.io/coveralls/lra/mackup.svg)](https://coveralls.io/r/lra/mackup?branch=master) [![Code Health](https://landscape.io/github/lra/mackup/master/landscape.png)](https://landscape.io/github/lra/mackup/master) From e5cbe29a276cded6e927b1294099237aa22f9f9c Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 28 Aug 2014 17:38:40 -0400 Subject: [PATCH 0115/1256] SVG CI badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 97eb680f3..8b1bb5ac5 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.png?style=badge)](https://circleci.com/gh/lra/mackup) +[![Circle CI](https://circleci.com/gh/lra/mackup.svg?style=shield)](https://circleci.com/gh/lra/mackup) [![Coverage Status](https://img.shields.io/coveralls/lra/mackup.svg)](https://coveralls.io/r/lra/mackup?branch=master) [![Code Health](https://landscape.io/github/lra/mackup/master/landscape.png)](https://landscape.io/github/lra/mackup/master) From e70302e08a5c17be2a0e018d111d8d3867d29891 Mon Sep 17 00:00:00 2001 From: "Jonathan E. Magen" Date: Tue, 2 Sep 2014 12:07:10 -0400 Subject: [PATCH 0116/1256] added ngrok Signed-off-by: Jonathan E. Magen --- mackup/applications/ngrok.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/ngrok.cfg diff --git a/mackup/applications/ngrok.cfg b/mackup/applications/ngrok.cfg new file mode 100644 index 000000000..8ec257afb --- /dev/null +++ b/mackup/applications/ngrok.cfg @@ -0,0 +1,5 @@ +[application] +name = ngrok + +[configuration_files] +.ngrok From 414c33301ba3a24cae10d2ae923c232c284e127b Mon Sep 17 00:00:00 2001 From: "Jonathan E. Magen" Date: Tue, 2 Sep 2014 12:28:30 -0400 Subject: [PATCH 0117/1256] following CONTRIBUTING.md Signed-off-by: Jonathan E. Magen --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8275edffb..801f168f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Mackup Changelog ## WIP +- Adding support for ngrok .ngrok (via @yonkeltron) - Added support for JSHints .jshintrc - Improved support for Slate (via @bradcerasani) - Added support for nvpy - a Linux client for SimpleNote (via @hiyer) diff --git a/README.md b/README.md index 8b1bb5ac5..aee0b63b5 100644 --- a/README.md +++ b/README.md @@ -233,6 +233,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Nano](http://www.nano-editor.org/) - [ncmpcpp](http://ncmpcpp.rybczak.net) - [newsbeuter](http://newsbeuter.org/) + - [ngrok](https://ngrok.com/) - [nvALT](http://brettterpstra.com/projects/nvalt/) - [nvpy](https://github.com/cpbotha/nvpy) - [Oh My Zsh](https://github.com/robbyrussell/oh-my-zsh) From 1a1a76fda4e5a8539c462619448bcb3f50218caa Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 15 Sep 2014 22:58:41 -0400 Subject: [PATCH 0118/1256] Upgraded nose to 1.3.4 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8de692f79..743a8ab77 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ # Let's install nose to run some tests # Run "pip install -r requirements.txt" then "nosetests" -nose==1.3.0 +nose==1.3.4 From c3c1781a0454def71b9231e728144d8b71c58e6f Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 15 Sep 2014 23:25:14 -0400 Subject: [PATCH 0119/1256] Hello PIP --- INSTALL.md | 36 +++++++++--------------------------- Makefile | 15 +++++++++++++++ README.md | 12 ++++-------- bin/mackup | 26 -------------------------- mackup/constants.py | 2 +- setup.py | 26 ++++++++++++++++++++------ 6 files changed, 49 insertions(+), 68 deletions(-) create mode 100644 Makefile delete mode 100755 bin/mackup diff --git a/INSTALL.md b/INSTALL.md index 3bc027eeb..8de3edb2a 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -2,9 +2,8 @@ There are 3 ways to run mackup -1. Install it with Homebrew and run it (OSX only) -1. Download it, install it with python setuptools and run it (OSX and - GNU/Linux) +1. Install it with Homebrew (OSX only) +1. Install it with PIP (OSX and GNU/Linux) 1. Download it, and run it without installing it (OSX and GNU/Linux) ## Install @@ -19,18 +18,11 @@ brew install mackup mackup -h ``` -### With Python Setuptools +### With Python's PIP ```bash -# Download Mackup -curl -o mackup.zip https://codeload.github.com/lra/mackup/zip/master - -# Uncompress the archive -unzip mackup.zip - -# Install Mackup on your system -cd mackup-master -sudo python setup.py install +# Easy too +pip install mackup # Now you can run it mackup -h @@ -59,20 +51,10 @@ brew upgrade mackup -h ``` -### With Python Setuptools +### With Python's PIP ```bash -# Download Mackup -curl -o mackup.zip https://codeload.github.com/lra/mackup/zip/master - -# Uncompress the archive -unzip mackup.zip - -# Install Mackup on your system -cd mackup-master -sudo python setup.py install - -# Now you can run it +pip install --upgrade mackup mackup -h ``` @@ -84,10 +66,10 @@ mackup -h brew uninstall mackup ``` -### With Python Setuptools +### With Python's PIP ```bash -sudo rm -rf /usr/local/bin/mackup /usr/local/lib/python?.?/site-packages/Mackup-*.egg/ +pip uninstall mackup ``` diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..42b456c51 --- /dev/null +++ b/Makefile @@ -0,0 +1,15 @@ +develop: + python setup.py develop + +undevelop: + python setup.py develop --uninstall + +test: + nosetests + +clean: + rm -rf Mackup.egg-info/ + +release: clean + python setup.py sdist + twine upload dist/* diff --git a/README.md b/README.md index aee0b63b5..5d5e1854c 100644 --- a/README.md +++ b/README.md @@ -21,17 +21,13 @@ brew install mackup mackup backup ``` -If not running OS X, or you don't like Homebrew, run on your current -workstation: +If not running OS X, or you don't like Homebrew, you can use PIP: ```bash -# Download Mackup -curl -o mackup.zip https://codeload.github.com/lra/mackup/zip/master - -# Uncompress the archive -unzip mackup.zip +# Install Mackup with PIP +pip install mackup # Launch it and back up your files -./mackup-master/bin/mackup backup +mackup backup ``` You're all set, and constantly backuped from now on. diff --git a/bin/mackup b/bin/mackup deleted file mode 100755 index 5f26ca0fd..000000000 --- a/bin/mackup +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -import sys -import os.path - -try: - import mackup.main -except ImportError: - # If Mackup is not installed globally, we are looking for the mackup module - # at the same path level as the bin folder where this script is in. - # In this case, let's dynamically add the parent path to the python path - bin_dir_path = os.path.dirname(os.path.realpath(__file__)) - parent_dir_path = os.path.dirname(bin_dir_path) - sys.path.append(parent_dir_path) - try: - import mackup.main - except ImportError: - # We are being run on a half-backed system (*cough* brew bot *cough*) - # Let's hack our way in - hacky_packages_path = os.path.join(parent_dir_path, - 'lib/python2.7/site-packages') - sys.path.append(hacky_packages_path) - import mackup.main - - -if __name__ == '__main__': - mackup.main.main() diff --git a/mackup/constants.py b/mackup/constants.py index 17646019e..c488fbc60 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup""" # Current version -VERSION = '0.7.3' +VERSION = '0.7.4' # Mode used to list supported applications LIST_MODE = 'list' diff --git a/setup.py b/setup.py index 4494b8ce2..8b0a20bad 100644 --- a/setup.py +++ b/setup.py @@ -1,18 +1,32 @@ """Setup file to automate the install of Mackup in the Python environment""" -import distutils.core +from setuptools import setup +from mackup.constants import VERSION -import mackup.constants - -distutils.core.setup( +setup( name='Mackup', - version=mackup.constants.VERSION, + 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', license='GPLv3', packages=['mackup'], - scripts=['bin/mackup'], + 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 f482d85291826d10a438f68c25a9e5311a8a5360 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 15 Sep 2014 23:29:11 -0400 Subject: [PATCH 0120/1256] Cleanup the diet --- Makefile | 1 + setup.cfg | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 setup.cfg diff --git a/Makefile b/Makefile index 42b456c51..d2a138fe6 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,7 @@ test: nosetests clean: + rm -rf dist/ rm -rf Mackup.egg-info/ release: clean diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 000000000..3c6e79cf3 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[bdist_wheel] +universal=1 From a258b54454e8b7079812460db654d6d89f653ffd Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 15 Sep 2014 23:34:38 -0400 Subject: [PATCH 0121/1256] Lowercase the name for PIP --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8b0a20bad..4b5703393 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setup( - name='Mackup', + name='mackup', version=VERSION, author='Laurent Raufaste', author_email='analogue@glop.org', From c7250e82612b849e7890bf823143de56455774a3 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 15 Sep 2014 23:38:42 -0400 Subject: [PATCH 0122/1256] Mackup 0.7.4 --- CHANGELOG.md | 4 ++++ mackup/mackup.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 801f168f3..d58642785 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Mackup Changelog ## WIP + +## Mackup 0.7.4 + +- Better Python packaging, deleted the half-baked binary - Adding support for ngrok .ngrok (via @yonkeltron) - Added support for JSHints .jshintrc - Improved support for Slate (via @bradcerasani) diff --git a/mackup/mackup.py b/mackup/mackup.py index 275c9f541..970fdae38 100644 --- a/mackup/mackup.py +++ b/mackup/mackup.py @@ -37,7 +37,7 @@ def check_for_usable_environment(self): .format(self._config.path)) # Is Sublime Text running ? - #if is_process_running('Sublime Text'): + # 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" # " its configuration files. Please close Sublime Text and" From 966c3ed486e571b952c1e7b7988b8b9712459e94 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Wed, 24 Sep 2014 16:25:48 -0500 Subject: [PATCH 0123/1256] Create houdini.cfg --- mackup/applications/houdini.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/houdini.cfg diff --git a/mackup/applications/houdini.cfg b/mackup/applications/houdini.cfg new file mode 100644 index 000000000..50e8dbb20 --- /dev/null +++ b/mackup/applications/houdini.cfg @@ -0,0 +1,6 @@ +[application] +name = Houdini + +[configuration_files] +Library/Preferences/com.uglyapps.Houdini.plist +Library/Application Support/Houdini From 9369918a5cc8980cd7b78918e744e8a0c066424e Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Wed, 24 Sep 2014 16:27:35 -0500 Subject: [PATCH 0124/1256] Added Houdini --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5d5e1854c..237c44211 100644 --- a/README.md +++ b/README.md @@ -193,6 +193,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Hazel](http://www.noodlesoft.com/hazel.php) - [Heroku](https://www.heroku.com/) - [Hexels](http://hexraystudios.com/hexels/) + - [Houdini](http://uglyapps.co.uk/houdini/) - [Htop](http://htop.sourceforge.net/) - [i2cssh](https://github.com/wouterdebie/i2cssh) - [IntelliJIDEA 12](http://www.jetbrains.com/idea/) From e72d430a1df431f0e5625d0265f9a03ad18b2a15 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Wed, 24 Sep 2014 16:28:11 -0500 Subject: [PATCH 0125/1256] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d58642785..993fa43ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ - Improved support for ExpanDrive (via @kfinlay) - Added support for Tower 2 (via @mAAdhaTTah) - Improved support for Textual (via @oalders) +- Support for Houdini (via @kfinlay) ## Mackup 0.7.3 From 3d95aa63ee05c9a69431798be969f6825c186b4d Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Wed, 24 Sep 2014 19:18:19 -0500 Subject: [PATCH 0126/1256] Moved to WIP --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 993fa43ee..538ef6aed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Support for Houdini (via @kfinlay) + ## Mackup 0.7.4 - Better Python packaging, deleted the half-baked binary @@ -33,7 +35,6 @@ - Improved support for ExpanDrive (via @kfinlay) - Added support for Tower 2 (via @mAAdhaTTah) - Improved support for Textual (via @oalders) -- Support for Houdini (via @kfinlay) ## Mackup 0.7.3 From 4e4f06dd16bd8a6e1589f2951aefe3b14579acfc Mon Sep 17 00:00:00 2001 From: Philipp Kyeck Date: Sat, 27 Sep 2014 22:29:15 +0200 Subject: [PATCH 0127/1256] bash: also include .aliases in backup --- mackup/applications/bash.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/bash.cfg b/mackup/applications/bash.cfg index 6e3fdc98f..cfac52d80 100644 --- a/mackup/applications/bash.cfg +++ b/mackup/applications/bash.cfg @@ -2,6 +2,7 @@ name = Bash [configuration_files] +.aliases .bash_aliases .bash_logout .bashrc From e12c51c4d16fcbd9f2ed861fc8d419f1ff9aa0ab Mon Sep 17 00:00:00 2001 From: Kyle Mathews Date: Thu, 2 Oct 2014 16:50:23 -0700 Subject: [PATCH 0128/1256] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 237c44211..f50a9ff00 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ freshly new installed workstation (No cache, temporary and locally specific files are transfered). It also helps you spend more time doing real cool stuff, and less time setting -you environment. +up your environment. ## Bullsh*t, what does it really do to my files ?! From 22cbaaa8c1da42f6027d7ea8bf0347b885a63c96 Mon Sep 17 00:00:00 2001 From: Travis La Marr Date: Sun, 5 Oct 2014 14:43:48 -0400 Subject: [PATCH 0129/1256] made confirm function less picky about it's responses. --- mackup/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mackup/utils.py b/mackup/utils.py index 42fafc5db..d6eec6943 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -23,11 +23,11 @@ def confirm(question): (boolean): Confirmed or not """ while True: - answer = raw_input(question + ' ') - if answer == 'Yes': + answer = raw_input(question + ' ').lower() + if answer == 'yes' or answer == 'y': confirmed = True break - if answer == 'No': + if answer == 'no' or answer == 'n': confirmed = False break From b92a8fffc297a44d0da2874e8a5e6437d8d354ba Mon Sep 17 00:00:00 2001 From: Travis La Marr Date: Sun, 5 Oct 2014 17:16:34 -0400 Subject: [PATCH 0130/1256] Added Copy sync engine. Complete with tests. --- CHANGELOG.md | 1 + README.md | 1 + doc/.mackup.cfg | 5 ++++ doc/README.md | 13 +++++++++- mackup/config.py | 9 +++++-- mackup/constants.py | 1 + mackup/utils.py | 24 ++++++++++++++++++ tests/config_tests.py | 21 +++++++++++++++ .../Application Support/Copy Agent/config.db | Bin 0 -> 3072 bytes tests/fixtures/mackup-engine-copy.cfg | 12 +++++++++ 10 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 tests/fixtures/Library/Application Support/Copy Agent/config.db create mode 100644 tests/fixtures/mackup-engine-copy.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 538ef6aed..395ac51ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Support for Copy sync engine (via @exiva) - Support for Houdini (via @kfinlay) ## Mackup 0.7.4 diff --git a/README.md b/README.md index f50a9ff00..e27951062 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,7 @@ folder and destroy the Mackup folder in Dropbox. - [Dropbox](https://www.dropbox.com/) - [Google Drive](https://drive.google.com/) + - [Copy](https://www.copy.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. diff --git a/doc/.mackup.cfg b/doc/.mackup.cfg index 13f5ea290..37471110a 100644 --- a/doc/.mackup.cfg +++ b/doc/.mackup.cfg @@ -16,6 +16,11 @@ engine = dropbox # [storage] # engine = google_drive +# If you choose the "copy" storage engine, Mackup will figure +# out where your Google Drive is and store your configuration files in it. +# [storage] +# engine = copy + # If you want to specify another directory, you can use the "file_system" # engine and Mackup won't try to detect any path for you: it will store your # files where you explicitely told him to, using the "path" setting. diff --git a/doc/README.md b/doc/README.md index 3285ebd9c..adfd33106 100644 --- a/doc/README.md +++ b/doc/README.md @@ -6,7 +6,7 @@ You can specify the storage type Mackup will use to store your configuration files. -For now you have 3 options: `dropbox`, `google_drive` and `file_system`. +For now you have 4 options: `dropbox`, `google_drive`, `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. @@ -26,6 +26,17 @@ where your Google Drive is and store your configuration files in it. engine = google_drive ``` + +### Copy + +If you choose the `copy` storage engine, Mackup will figure out +where your Google Drive is and store your configuration files in it. + +```ini +[storage] +engine = copy +``` + ### File System If you want to specify another directory, you can use the `file_system` engine diff --git a/mackup/config.py b/mackup/config.py index 3fd27f1c3..31390853d 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -9,10 +9,12 @@ MACKUP_CONFIG_FILE, ENGINE_DROPBOX, ENGINE_GDRIVE, + ENGINE_COPY, ENGINE_FS) from utils import (error, get_dropbox_folder_location, + get_copy_folder_location, get_google_drive_folder_location) try: import configparser @@ -55,7 +57,7 @@ def __init__(self, filename=None): def engine(self): """ The engine used by the storage. - ENGINE_DROPBOX, ENGINE_GDRIVE or ENGINE_FS. + ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_COPY or ENGINE_FS. Returns: str @@ -163,7 +165,8 @@ def _parse_engine(self): assert isinstance(engine, str) - if engine not in [ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_FS]: + if engine not in [ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_COPY, + ENGINE_FS]: raise ConfigError('Unknown storage engine: {}'.format(engine)) return str(engine) @@ -177,6 +180,8 @@ 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_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 c488fbc60..ff33713a4 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -33,4 +33,5 @@ # Supported engines ENGINE_DROPBOX = 'dropbox' ENGINE_GDRIVE = 'google_drive' +ENGINE_COPY = 'copy' ENGINE_FS = 'file_system' diff --git a/mackup/utils.py b/mackup/utils.py index 42fafc5db..a07fec32a 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -265,6 +265,30 @@ def get_google_drive_folder_location(): return googledrive_home +def get_copy_folder_location(): + """ + Try to locate the Copy folder + + Returns: + (unicode) 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)): + db = sqlite3.connect(copy_settings) + if db: + c = db.cursor() + query = ("SELECT value " "FROM config2 " + "WHERE option = 'csmRootPath';") + c.execute(query) + data = c.fetchone() + copy_location = unicode(data[0]) + c.close() + + return copy_location def is_process_running(process_name): """ diff --git a/tests/config_tests.py b/tests/config_tests.py index 9f99e5b0e..3b9edbad0 100644 --- a/tests/config_tests.py +++ b/tests/config_tests.py @@ -3,6 +3,7 @@ from mackup.constants import (ENGINE_DROPBOX, ENGINE_GDRIVE, + ENGINE_COPY, ENGINE_FS) from mackup.config import Config, ConfigError @@ -108,6 +109,26 @@ def test_config_engine_google_drive(self): '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 == u'/Users/someuser/Copy' + + assert isinstance(cfg.directory, str) + assert cfg.directory == u'Mackup' + + assert isinstance(cfg.fullpath, str) + 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']) + 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/Library/Application Support/Copy Agent/config.db b/tests/fixtures/Library/Application Support/Copy Agent/config.db new file mode 100644 index 0000000000000000000000000000000000000000..5903ca1db9a59ff2815980f9526844785e96b04b GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/tests/fixtures/mackup-engine-copy.cfg b/tests/fixtures/mackup-engine-copy.cfg new file mode 100644 index 000000000..901c2cb09 --- /dev/null +++ b/tests/fixtures/mackup-engine-copy.cfg @@ -0,0 +1,12 @@ +[storage] +engine = copy + +[applications_to_ignore] +subversion +sequel-pro +sabnzbd + +[applications_to_sync] +sabnzbd +sublime-text-3 +x11 From 92818648adc47607a0b9fd8c0eb0f4868c036a11 Mon Sep 17 00:00:00 2001 From: Travis La Marr Date: Sun, 5 Oct 2014 17:22:12 -0400 Subject: [PATCH 0131/1256] Forgot to update references in docs. --- doc/.mackup.cfg | 2 +- doc/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/.mackup.cfg b/doc/.mackup.cfg index 37471110a..4e77ded0b 100644 --- a/doc/.mackup.cfg +++ b/doc/.mackup.cfg @@ -17,7 +17,7 @@ engine = dropbox # engine = google_drive # If you choose the "copy" storage engine, Mackup will figure -# out where your Google Drive is and store your configuration files in it. +# out where your Copy folder is and store your configuration files in it. # [storage] # engine = copy diff --git a/doc/README.md b/doc/README.md index adfd33106..bcb439ee4 100644 --- a/doc/README.md +++ b/doc/README.md @@ -30,7 +30,7 @@ engine = google_drive ### Copy If you choose the `copy` storage engine, Mackup will figure out -where your Google Drive is and store your configuration files in it. +where your Copy folder is and store your configuration files in it. ```ini [storage] From 65e757d8ce4420fb53726a863af66d1d01c46663 Mon Sep 17 00:00:00 2001 From: David Aerne Date: Mon, 6 Oct 2014 01:50:41 +0200 Subject: [PATCH 0132/1256] Update README.md The very fist thing I would say is where this config file should be, took me a while to get it. --- doc/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/README.md b/doc/README.md index 3285ebd9c..631bbe2b1 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,5 +1,10 @@ # Configuration +To configure mackup, create a file named ´.mackup.cfg´ in your home directory. +```bash +nano ~/.mackup.cfg +``` + ## Storage ### Dropbox From ec242ad7702771b41c26f9c6f7c23c8b841c6566 Mon Sep 17 00:00:00 2001 From: Alan LaMielle Date: Sun, 5 Oct 2014 18:21:17 -0700 Subject: [PATCH 0133/1256] Adds .vim/ftplugin to vim config Sync the ftplugin directory under .vim so that language-specific configs can be synced with mackup. --- mackup/applications/vim.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/vim.cfg b/mackup/applications/vim.cfg index f9836a9b1..501977382 100644 --- a/mackup/applications/vim.cfg +++ b/mackup/applications/vim.cfg @@ -8,6 +8,7 @@ name = Vim .vim/autoload .vim/colors .vim/bundle +.vim/ftplugin .vimrc .vimrc.before .vimrc.after From 3cd8627a8c98e1322dd693e9ca86e470e6710973 Mon Sep 17 00:00:00 2001 From: Eyad Sibai Date: Mon, 6 Oct 2014 10:46:44 +0200 Subject: [PATCH 0134/1256] Add .gitignore in addition to .gitignore_global --- CHANGELOG.md | 1 + mackup/applications/git.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 538ef6aed..0773c3957 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Support for Houdini (via @kfinlay) +- Add .gitignore (via @eyadsibai) ## Mackup 0.7.4 diff --git a/mackup/applications/git.cfg b/mackup/applications/git.cfg index 4e07d51a4..0c43b3986 100644 --- a/mackup/applications/git.cfg +++ b/mackup/applications/git.cfg @@ -4,3 +4,4 @@ name = Git [configuration_files] .gitconfig .gitignore_global +.gitignore From a53316669759e9fa9322bb766200f5d6442c0908 Mon Sep 17 00:00:00 2001 From: Eyad Sibai Date: Wed, 8 Oct 2014 22:11:45 +0200 Subject: [PATCH 0135/1256] Add standard ignore file for git --- mackup/applications/git.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mackup/applications/git.cfg b/mackup/applications/git.cfg index 0c43b3986..e373d87b7 100644 --- a/mackup/applications/git.cfg +++ b/mackup/applications/git.cfg @@ -3,5 +3,4 @@ name = Git [configuration_files] .gitconfig -.gitignore_global -.gitignore +.config/git/ignore From 4023fb0b08177d844dc2d24cfc0eb7e441e72b9f Mon Sep 17 00:00:00 2001 From: Daniel Sager Date: Wed, 8 Oct 2014 23:48:56 +0200 Subject: [PATCH 0136/1256] config for IntelliJ IDEA 13 --- CHANGELOG.md | 1 + README.md | 2 +- mackup/applications/intellijidea-13.cfg | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 mackup/applications/intellijidea-13.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 538ef6aed..3b3d36e9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Support for Houdini (via @kfinlay) +- Support for IntelliJ IDEA 13 (via @dsager) ## Mackup 0.7.4 diff --git a/README.md b/README.md index f50a9ff00..70e37abc7 100644 --- a/README.md +++ b/README.md @@ -196,7 +196,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Houdini](http://uglyapps.co.uk/houdini/) - [Htop](http://htop.sourceforge.net/) - [i2cssh](https://github.com/wouterdebie/i2cssh) - - [IntelliJIDEA 12](http://www.jetbrains.com/idea/) + - [IntelliJIDEA](http://www.jetbrains.com/idea/) - [Irssi](http://www.irssi.org/) - [ITerm2](http://www.iterm2.com/) - [JSHint](http://www.jshint.com/) diff --git a/mackup/applications/intellijidea-13.cfg b/mackup/applications/intellijidea-13.cfg new file mode 100644 index 000000000..dd20cd356 --- /dev/null +++ b/mackup/applications/intellijidea-13.cfg @@ -0,0 +1,6 @@ +[application] +name = IntelliJIdea 13 + +[configuration_files] +Library/Application Support/IntelliJIdea13 +Library/Preferences/IntelliJIdea13 From 7f647c878ad898a3ab78d52602cea2864af25017 Mon Sep 17 00:00:00 2001 From: glaszig Date: Wed, 8 Oct 2014 19:01:09 +0200 Subject: [PATCH 0137/1256] backup digrc this adds support for dig and backs up the `~/.digrc`. --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/dig.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/dig.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 538ef6aed..4f46a582a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Support for Houdini (via @kfinlay) +- Support for dig (via @glaszig) ## Mackup 0.7.4 diff --git a/README.md b/README.md index f50a9ff00..15b40f35a 100644 --- a/README.md +++ b/README.md @@ -168,6 +168,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Dash](http://kapeli.com/dash) - [Deal Alert](http://dealalertapp.com/) - [Default Folder X](http://www.stclairsoft.com/DefaultFolderX/) + - [Dig](http://en.wikipedia.org/wiki/Dig_(command)) - [Divvy](http://mizage.com/divvy/) - [Dolphin](https://dolphin-emu.org/) - [Droplr](https://droplr.com/hello) diff --git a/mackup/applications/dig.cfg b/mackup/applications/dig.cfg new file mode 100644 index 000000000..14f0a1f46 --- /dev/null +++ b/mackup/applications/dig.cfg @@ -0,0 +1,5 @@ +[application] +name = dig + +[configuration_files] +.digrc From 6b9523cc3199875f8d905bed08a5afacb922e3ca Mon Sep 17 00:00:00 2001 From: Lars Kappert Date: Fri, 10 Oct 2014 15:50:24 +0200 Subject: [PATCH 0138/1256] Add WebStorm 8 --- mackup/applications/webstorm-8.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/webstorm-8.cfg diff --git a/mackup/applications/webstorm-8.cfg b/mackup/applications/webstorm-8.cfg new file mode 100644 index 000000000..c03580e8f --- /dev/null +++ b/mackup/applications/webstorm-8.cfg @@ -0,0 +1,6 @@ +[application] +name = WebStorm 8 + +[configuration_files] +Library/Application Support/WebStorm8 +Library/Preferences/WebStorm8 From 39c847462a4dd3d1c2b3482ac2e8cc50e1e634dd Mon Sep 17 00:00:00 2001 From: Lars Kappert Date: Fri, 10 Oct 2014 15:59:13 +0200 Subject: [PATCH 0139/1256] Add license path for Dash --- mackup/applications/dash.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/dash.cfg b/mackup/applications/dash.cfg index 935d6c4a9..a03c003cf 100644 --- a/mackup/applications/dash.cfg +++ b/mackup/applications/dash.cfg @@ -3,4 +3,5 @@ name = Dash [configuration_files] Library/Application Support/Dash/library.dash +Library/Application Support/Dash/License/license.dash-license Library/Preferences/com.kapeli.dash.plist From 92f8ce41965ad9d2c35df5b9342e41817a4b97d3 Mon Sep 17 00:00:00 2001 From: Lars Kappert Date: Fri, 10 Oct 2014 16:23:35 +0200 Subject: [PATCH 0140/1256] Add WebStorm to changelog & readme --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b3d36e9d..d58b93b05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Support for Houdini (via @kfinlay) - Support for IntelliJ IDEA 13 (via @dsager) +- Support for Webstorm 8 (via @webpro) ## Mackup 0.7.4 diff --git a/README.md b/README.md index 70e37abc7..3a86e9826 100644 --- a/README.md +++ b/README.md @@ -299,6 +299,7 @@ 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/) + - [WebStorm](https://www.jetbrains.com/webstorm/) - [Wget](https://www.gnu.org/software/wget/) - [Witch](http://manytricks.com/witch/) - [X11](http://www.x.org/) From 9d378d652de7a70ce39c6cc4c07ff6696ba9222e Mon Sep 17 00:00:00 2001 From: Daniel Compton Date: Sun, 12 Oct 2014 11:08:18 +1300 Subject: [PATCH 0141/1256] Fix spelling mistake --- mackup/application.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/application.py b/mackup/application.py index cc59ec479..40ac1e04f 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -74,7 +74,7 @@ def backup(self): # Ask the user if he really want to replace it if utils.confirm("A {} named {} already exists in the" - " backup.\nAre you sure that your want to" + " backup.\nAre you sure that you want to" " replace it ?" .format(file_type, mackup_filepath)): # Delete the file in Mackup From 2b880b4dbe51fcd1b80d3af04b199dcde98c6e7f Mon Sep 17 00:00:00 2001 From: zheng1 Date: Tue, 14 Oct 2014 18:26:17 +0800 Subject: [PATCH 0142/1256] add azure support --- README.md | 1 + mackup/applications/azure.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/azure.cfg diff --git a/README.md b/README.md index 70e37abc7..347302f46 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [AusKey](https://abr.gov.au/AUSkey/) - [Awareness](http://iamfutureproof.com/tools/awareness/) - [AWS Command Line Interface](https://aws.amazon.com/cli/) + - [Microsoft Azure Command Line interface](https://github.com/Azure/azure-sdk-tools-xplat) - [Bartender](http://www.macbartender.com/) - [Bash it](https://github.com/revans/bash-it/) - [Bash](http://www.gnu.org/software/bash/) diff --git a/mackup/applications/azure.cfg b/mackup/applications/azure.cfg new file mode 100644 index 000000000..5ff2c6ac2 --- /dev/null +++ b/mackup/applications/azure.cfg @@ -0,0 +1,5 @@ +[application] +name = Azure CLI + +[configuration_files] +.azure \ No newline at end of file From a1798423d7f27a5eae59670b4b9a57672bc3c8db Mon Sep 17 00:00:00 2001 From: zheng1 Date: Wed, 15 Oct 2014 01:19:04 +0800 Subject: [PATCH 0143/1256] update changelog and new line --- CHANGELOG.md | 1 + mackup/applications/azure.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b3d36e9d..0b98fbe32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ - Improved support for ExpanDrive (via @kfinlay) - Added support for Tower 2 (via @mAAdhaTTah) - Improved support for Textual (via @oalders) +- Added support for Azure (via @zheng1) ## Mackup 0.7.3 diff --git a/mackup/applications/azure.cfg b/mackup/applications/azure.cfg index 5ff2c6ac2..602898785 100644 --- a/mackup/applications/azure.cfg +++ b/mackup/applications/azure.cfg @@ -2,4 +2,4 @@ name = Azure CLI [configuration_files] -.azure \ No newline at end of file +.azure From 1dc5df3a0602ff31ec8dfaab881ee32052cf3548 Mon Sep 17 00:00:00 2001 From: Chris Best Date: Tue, 14 Oct 2014 15:44:27 -0700 Subject: [PATCH 0144/1256] Terminator (terminal emulator) configuration added. --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/terminator.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/terminator.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b3d36e9d..fbdf1282f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Support for Terminator (via @chr2sbest) - Support for Houdini (via @kfinlay) - Support for IntelliJ IDEA 13 (via @dsager) diff --git a/README.md b/README.md index 70e37abc7..bb8a13845 100644 --- a/README.md +++ b/README.md @@ -285,6 +285,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) - [Teamocil](http://remiprev.github.io/teamocil/) + - [Terminator](https://launchpad.net/terminator/) - [TextMate](http://macromates.com/) - [Textual](http://www.codeux.com/textual/) - [Tig](https://github.com/jonas/tig) diff --git a/mackup/applications/terminator.cfg b/mackup/applications/terminator.cfg new file mode 100644 index 000000000..2dc2030d1 --- /dev/null +++ b/mackup/applications/terminator.cfg @@ -0,0 +1,5 @@ +[application] +name = Terminator + +[configuration_files] +.config/terminator/config From 7ef6f507c419a94d8accf4d8ba3b45e69bfadb00 Mon Sep 17 00:00:00 2001 From: Chris Best Date: Tue, 14 Oct 2014 15:46:02 -0700 Subject: [PATCH 0145/1256] Fixed name typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fbdf1282f..9b59e6a1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## WIP -- Support for Terminator (via @chr2sbest) +- Support for Terminator (via @chr1sbest) - Support for Houdini (via @kfinlay) - Support for IntelliJ IDEA 13 (via @dsager) From aedb4f53b81b7d8b1a94942645229e5723990e6d Mon Sep 17 00:00:00 2001 From: zheng1 Date: Wed, 15 Oct 2014 13:14:21 +0800 Subject: [PATCH 0146/1256] new line --- mackup/applications/azure.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/azure.cfg b/mackup/applications/azure.cfg index 602898785..c00c4d6b0 100644 --- a/mackup/applications/azure.cfg +++ b/mackup/applications/azure.cfg @@ -3,3 +3,4 @@ name = Azure CLI [configuration_files] .azure + From 2e294d0b25f0dda74db27595139423e27d548388 Mon Sep 17 00:00:00 2001 From: zheng1 Date: Wed, 15 Oct 2014 20:44:33 +0800 Subject: [PATCH 0147/1256] Added support for npm --- CHANGELOG.md | 1 + mackup/applications/npm.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/npm.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b59e6a1f..b1ab8289a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ - Improved support for ExpanDrive (via @kfinlay) - Added support for Tower 2 (via @mAAdhaTTah) - Improved support for Textual (via @oalders) +- Added support for npm (via @zheng1) ## Mackup 0.7.3 diff --git a/mackup/applications/npm.cfg b/mackup/applications/npm.cfg new file mode 100644 index 000000000..7235b2f3b --- /dev/null +++ b/mackup/applications/npm.cfg @@ -0,0 +1,5 @@ +[application] +name = npm + +[configuration_files] +.npmrc From d588a2e716673fff76cba3ead324490dea4ce3c2 Mon Sep 17 00:00:00 2001 From: zheng1 Date: Wed, 15 Oct 2014 20:46:39 +0800 Subject: [PATCH 0148/1256] no message --- mackup/applications/npm.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/npm.cfg b/mackup/applications/npm.cfg index 7235b2f3b..9ffde96c2 100644 --- a/mackup/applications/npm.cfg +++ b/mackup/applications/npm.cfg @@ -3,3 +3,4 @@ name = npm [configuration_files] .npmrc + From 880955a748566ea825414e38bec7eacb37eee2f2 Mon Sep 17 00:00:00 2001 From: Christopher Kochan Date: Wed, 15 Oct 2014 13:06:52 -0700 Subject: [PATCH 0149/1256] Update path to latest Textual plist file location. --- mackup/applications/textual.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/textual.cfg b/mackup/applications/textual.cfg index 092abfb79..99219885d 100644 --- a/mackup/applications/textual.cfg +++ b/mackup/applications/textual.cfg @@ -4,4 +4,4 @@ name = Textual [configuration_files] Library/Application Support/Textual IRC Library/Preferences/com.codeux.irc.textual.plist -Library/Containers/com.codeux.irc.textual +Library/Containers/com.codeux.irc.textual/Data/Library/Preferences/com.codeux.irc.textual.plist From 03c3bf75d38a428655cb7fa0d2d95076c532a1c5 Mon Sep 17 00:00:00 2001 From: "Kevin Y. Kim" Date: Fri, 17 Oct 2014 14:16:45 -0400 Subject: [PATCH 0150/1256] add support for pass (http://www.passwordstore.org/) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/pass.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/pass.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b59e6a1f..46c8da161 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Support for Terminator (via @chr1sbest) - Support for Houdini (via @kfinlay) - Support for IntelliJ IDEA 13 (via @dsager) +- Support for Pass (via @kykim) ## Mackup 0.7.4 diff --git a/README.md b/README.md index bb8a13845..2c414e3b8 100644 --- a/README.md +++ b/README.md @@ -237,6 +237,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [OmniFocus](http://www.omnigroup.com/products/omnifocus/) - [OmniGraffle](http://www.omnigroup.com/omnigraffle/) - [OpenSSH](http://www.openssh.org/) + - [Pass](http://www.passwordstore.org/) - [Pastebot](http://tapbots.com/software/pastebot/) - [Path Finder](http://www.cocoatech.com/pathfinder/) - [Pear](http://pear.php.net/) diff --git a/mackup/applications/pass.cfg b/mackup/applications/pass.cfg new file mode 100644 index 000000000..095e88d8b --- /dev/null +++ b/mackup/applications/pass.cfg @@ -0,0 +1,5 @@ +[application] +name = pass + +[configuration_files] +.password-store From b847b63594a2d6dd3da1f8e5150de2788263b568 Mon Sep 17 00:00:00 2001 From: Iain Beeston Date: Sat, 18 Oct 2014 17:02:16 +0100 Subject: [PATCH 0151/1256] Added support for rubocop config https://github.com/bbatsov/rubocop --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/rubocop.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/rubocop.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b59e6a1f..50aefd91e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Support for Rubocop (via @iainbeeston) - Support for Terminator (via @chr1sbest) - Support for Houdini (via @kfinlay) - Support for IntelliJ IDEA 13 (via @dsager) diff --git a/README.md b/README.md index bb8a13845..5ccfd6ddf 100644 --- a/README.md +++ b/README.md @@ -255,6 +255,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Rails](http://rubyonrails.org/) - [rTorrent](http://libtorrent.rakshasa.no/) - [R](http://www.r-project.org/) + - [Rubocop](https://github.com/bbatsov/rubocop) - [Ruby Version](https://gist.github.com/fnichol/1912050) - [Ruby](http://ruby-lang.org/) - [RubyMine](http://www.jetbrains.com/ruby/) diff --git a/mackup/applications/rubocop.cfg b/mackup/applications/rubocop.cfg new file mode 100644 index 000000000..cb024912d --- /dev/null +++ b/mackup/applications/rubocop.cfg @@ -0,0 +1,5 @@ +[application] +name = Rubocop + +[configuration_files] +.rubocop.yml From c7f9ef83e7f7b61840b26aa7dfdab9ed97fb8cc3 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Sat, 18 Oct 2014 17:51:04 -0500 Subject: [PATCH 0152/1256] Create ubersicht.cfg --- mackup/applications/ubersicht.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/ubersicht.cfg diff --git a/mackup/applications/ubersicht.cfg b/mackup/applications/ubersicht.cfg new file mode 100644 index 000000000..7fbe86dc0 --- /dev/null +++ b/mackup/applications/ubersicht.cfg @@ -0,0 +1,6 @@ +[application] +name = Ubersicht + +[configuration_files] +Library/Application Support/Übersicht +Library/Preferences/tracesOf.Uebersicht.plist From c91a7393132f6365e9ac7364542e9b85a8339c67 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Sat, 18 Oct 2014 17:52:49 -0500 Subject: [PATCH 0153/1256] Add Ubersicht --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b59e6a1f..cd3f6a7c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Support for Terminator (via @chr1sbest) - Support for Houdini (via @kfinlay) - Support for IntelliJ IDEA 13 (via @dsager) +- Support for Ubersicht (via @kfinlay) ## Mackup 0.7.4 From a24199d484670e43a5a935192fd83c39a9a672d9 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Sat, 18 Oct 2014 17:54:37 -0500 Subject: [PATCH 0154/1256] Add Ubersicht --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index bb8a13845..4b74fa2e0 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. - [Transmission](http://www.transmissionbt.com/) - [Transmit](http://panic.com/transmit/) - [Twitterrific](http://twitterrific.com/) + - [Übersicht](http://tracesof.net/uebersicht/) - [uTorrent](http://www.utorrent.com/) - [Ventrilo](http://www.ventrilo.com/) - [Vim](http://www.vim.org/) From 5193fe91b0c4457dd3c5a51125d0015edb7b0278 Mon Sep 17 00:00:00 2001 From: Fayland Lam Date: Sun, 19 Oct 2014 08:20:29 +0800 Subject: [PATCH 0155/1256] add support for composer --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/composer.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/composer.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b59e6a1f..995521558 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Support for Terminator (via @chr1sbest) - Support for Houdini (via @kfinlay) - Support for IntelliJ IDEA 13 (via @dsager) +- Support for Composer (via @fayland) ## Mackup 0.7.4 diff --git a/README.md b/README.md index bb8a13845..7e6a27140 100644 --- a/README.md +++ b/README.md @@ -161,6 +161,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [CloudApp](http://getcloudapp.com/) - [Coda 2](http://panic.com/coda/) - [Colloquy](http://colloquy.info/) + - [Composer](https://getcomposer.org/) - [Concentrate](http://www.getconcentrating.com/) - [ControlPlane](http://www.controlplaneapp.com/) - [CoRD](http://cord.sourceforge.net/) diff --git a/mackup/applications/composer.cfg b/mackup/applications/composer.cfg new file mode 100644 index 000000000..f3f332514 --- /dev/null +++ b/mackup/applications/composer.cfg @@ -0,0 +1,6 @@ +[application] +name = composer + +[configuration_files] +.composer/auth.json +.composer/config.json From 9fd93b57ccae3229fc06a5a2b8019a0a3f2b36ef Mon Sep 17 00:00:00 2001 From: Ethan L Date: Wed, 22 Oct 2014 11:33:05 -0700 Subject: [PATCH 0156/1256] Add support for XtraFinder http://www.trankynam.com/xtrafinder/ --- mackup/applications/xtrafinder.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/xtrafinder.cfg diff --git a/mackup/applications/xtrafinder.cfg b/mackup/applications/xtrafinder.cfg new file mode 100644 index 000000000..47012cdeb --- /dev/null +++ b/mackup/applications/xtrafinder.cfg @@ -0,0 +1,5 @@ +[application] +name = XtraFinder + +[configuration_files] +Library/Preferences/com.trankynam.XtraFinder.plist From 1d2529854e19c4ba5a04440740ac07f7e0bd20fd Mon Sep 17 00:00:00 2001 From: yliang Date: Wed, 22 Oct 2014 13:30:08 -0700 Subject: [PATCH 0157/1256] Update README and CHANGELOG for XtraFinder --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4140cb0e4..f541d48c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Support for XtraFinder (via @ethanl) - Support for Rubocop (via @iainbeeston) - Support for Terminator (via @chr1sbest) - Support for Houdini (via @kfinlay) diff --git a/README.md b/README.md index a0bb39235..7d48b486a 100644 --- a/README.md +++ b/README.md @@ -310,6 +310,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [XCode](https://developer.apple.com/xcode/) - [XEmacs](http://www.xemacs.org/) - [XLD](http://tmkk.undo.jp/xld/) + - [XtraFinder](http://www.trankynam.com/xtrafinder/) - [Zsh](http://zsh.sourceforge.net/) - iTunes Applescripts From 5a10671955ad7dc3c01294340711a9a9fef3a3bb Mon Sep 17 00:00:00 2001 From: Marco Sero Date: Sun, 26 Oct 2014 20:52:02 +0000 Subject: [PATCH 0158/1256] added ghci --- mackup/applications/ghci.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/ghci.cfg diff --git a/mackup/applications/ghci.cfg b/mackup/applications/ghci.cfg new file mode 100644 index 000000000..93b7e0a6a --- /dev/null +++ b/mackup/applications/ghci.cfg @@ -0,0 +1,5 @@ +[application] +name = ghci + +[configuration_files] +.ghci From aa928309fb4a5cfa5c07d7ade9fc5177ebe8aae7 Mon Sep 17 00:00:00 2001 From: Marco Sero Date: Mon, 27 Oct 2014 08:45:47 +0000 Subject: [PATCH 0159/1256] updated readme anc changelog adding GHCi --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4140cb0e4..df2c49e26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Support for IntelliJ IDEA 13 (via @dsager) - Support for Pass (via @kykim) - Support for Composer (via @fayland) +- Support for GHCi (via @marcosero) ## Mackup 0.7.4 diff --git a/README.md b/README.md index a0bb39235..73e4590af 100644 --- a/README.md +++ b/README.md @@ -184,6 +184,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [FontExplorer X](http://www.fontexplorerx.com/) - [ForkLift 2](http://www.binarynights.com/forklift/) - [GeekTool](http://projects.tynsoe.org/en/geektool/) + - [GHCi](http://www.haskell.org/haskellwiki/GHC/GHCi) - [Git Hooks](https://github.com/icefox/git-hooks) - [Git](http://git-scm.com/) - [Gitbox](http://gitboxapp.com/) From 427c5bc28c63018923b5b4c720702ba2e5be248e Mon Sep 17 00:00:00 2001 From: cnodell Date: Mon, 27 Oct 2014 19:29:29 +0100 Subject: [PATCH 0160/1256] Add support for Spectrwm --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/spectrwm.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/spectrwm.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ac2c17809..517acd649 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Support for Composer (via @fayland) - Support for GHCi (via @marcosero) - Add .gitignore (via @eyadsibai) +- Support for spectrwm (via @cnodell) ## Mackup 0.7.4 diff --git a/README.md b/README.md index 73e4590af..a04b8d48f 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. - [Soulver](http://www.acqualia.com/soulver/) - [SourceTree](http://sourcetreeapp.com) - [Spark](http://www.shadowlab.org/softwares/spark.php) + - [Spectrwm](https://opensource.conformal.com/wiki/spectrwm) - [Spectacle](http://spectacleapp.com/) - [Spotify](https://www.spotify.com/) - [Stata](http://www.stata.com/) diff --git a/mackup/applications/spectrwm.cfg b/mackup/applications/spectrwm.cfg new file mode 100644 index 000000000..8e64b868e --- /dev/null +++ b/mackup/applications/spectrwm.cfg @@ -0,0 +1,5 @@ +[application] +name = Spectrwm + +[configuration_files] +.spectrwm.conf From e7abd86f8a452c5cdb75a88a3707ff4d6bf544f2 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 29 Oct 2014 13:43:02 -0400 Subject: [PATCH 0161/1256] Changeling update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 517acd649..3d18feb34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Support for GHCi (via @marcosero) - Add .gitignore (via @eyadsibai) - Support for spectrwm (via @cnodell) +- Fixed Textual support (via @crkochan) ## Mackup 0.7.4 From 5ec9fdeb6b49bec8cbfb3c6d1d90d87ee7b05992 Mon Sep 17 00:00:00 2001 From: Daniel Sager Date: Thu, 6 Nov 2014 12:43:30 +0100 Subject: [PATCH 0162/1256] config for IntelliJ IDEA 14 --- CHANGELOG.md | 2 +- mackup/applications/intellijidea-12.cfg | 2 +- mackup/applications/intellijidea-13.cfg | 2 +- mackup/applications/intellijidea-14.cfg | 6 ++++++ 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 mackup/applications/intellijidea-14.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d18feb34..bd871add4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ - Support for Rubocop (via @iainbeeston) - Support for Terminator (via @chr1sbest) - Support for Houdini (via @kfinlay) -- Support for IntelliJ IDEA 13 (via @dsager) +- Support for IntelliJ IDEA 13 & 14 (via @dsager) - Support for Pass (via @kykim) - Support for Composer (via @fayland) - Support for GHCi (via @marcosero) diff --git a/mackup/applications/intellijidea-12.cfg b/mackup/applications/intellijidea-12.cfg index 3bf843db5..105256a84 100644 --- a/mackup/applications/intellijidea-12.cfg +++ b/mackup/applications/intellijidea-12.cfg @@ -1,5 +1,5 @@ [application] -name = IntelliJIdea 12 +name = IntelliJ IDEA 12 [configuration_files] Library/Application Support/IntelliJIdea12 diff --git a/mackup/applications/intellijidea-13.cfg b/mackup/applications/intellijidea-13.cfg index dd20cd356..06501f503 100644 --- a/mackup/applications/intellijidea-13.cfg +++ b/mackup/applications/intellijidea-13.cfg @@ -1,5 +1,5 @@ [application] -name = IntelliJIdea 13 +name = IntelliJ IDEA 13 [configuration_files] Library/Application Support/IntelliJIdea13 diff --git a/mackup/applications/intellijidea-14.cfg b/mackup/applications/intellijidea-14.cfg new file mode 100644 index 000000000..c3abb2241 --- /dev/null +++ b/mackup/applications/intellijidea-14.cfg @@ -0,0 +1,6 @@ +[application] +name = IntelliJ IDEA 14 + +[configuration_files] +Library/Application Support/IntelliJIdea14 +Library/Preferences/IntelliJIdea14 From 79711d3cb3ff03022acce31befd904ad57339faf Mon Sep 17 00:00:00 2001 From: Joeri Verdeyen Date: Fri, 21 Nov 2014 19:17:40 +0100 Subject: [PATCH 0163/1256] Added 1Password 4 --- mackup/applications/1password-4.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/1password-4.cfg diff --git a/mackup/applications/1password-4.cfg b/mackup/applications/1password-4.cfg new file mode 100644 index 000000000..a826f137d --- /dev/null +++ b/mackup/applications/1password-4.cfg @@ -0,0 +1,5 @@ +[application] +name = 1Password 4 + +[configuration_files] +Library/Preferences/ws.agile.1Password.plist From 02022da9a2fdc2631c6e274b97d84218c27979a4 Mon Sep 17 00:00:00 2001 From: Joeri Verdeyen Date: Sat, 22 Nov 2014 17:46:38 +0100 Subject: [PATCH 0164/1256] Added 1Password 4 in README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a04b8d48f..dafce4fb9 100644 --- a/README.md +++ b/README.md @@ -127,6 +127,7 @@ See the [README](doc/README.md) file in the doc directory for more info. ## Supported Applications + - [1Password 4](https://agilebits.com/onepassword) - [Ack](http://beyondgrep.com/) - [Adium](http://adium.im/) - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) From 68f9354f6ec4fa7af969ae201236e4b9434f345b Mon Sep 17 00:00:00 2001 From: Joeri Verdeyen Date: Sat, 22 Nov 2014 17:48:30 +0100 Subject: [PATCH 0165/1256] Update Changelog with 1Password 4 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd871add4..71b25dd76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Add .gitignore (via @eyadsibai) - Support for spectrwm (via @cnodell) - Fixed Textual support (via @crkochan) +- Support for 1Password 4 (via @jverdeyen) ## Mackup 0.7.4 From 3da259122dc7ec884796840e388bd72cb8e0a1cd Mon Sep 17 00:00:00 2001 From: Joeri Verdeyen Date: Sat, 22 Nov 2014 18:28:01 +0100 Subject: [PATCH 0166/1256] Added support for Grand Total 3 --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/grandtotal-3.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/grandtotal-3.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 71b25dd76..4a4f84428 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Support for spectrwm (via @cnodell) - Fixed Textual support (via @crkochan) - Support for 1Password 4 (via @jverdeyen) +- Support for GrandTotal 3 (via @jverdeyen) ## Mackup 0.7.4 diff --git a/README.md b/README.md index dafce4fb9..b0aa0afbd 100644 --- a/README.md +++ b/README.md @@ -192,6 +192,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Gmail Notifr](http://ashchan.com/projects/gmail-notifr) - [Go2Shell](http://zipzapmac.com/Go2Shell) - [GnuPG](http://www.gnupg.org/) + - [GrandTotal 3](http://www.mediaatelier.com/GrandTotal3/) - [Hands Off!](http://www.oneperiodic.com/products/handsoff/) - [Hazel](http://www.noodlesoft.com/hazel.php) - [Heroku](https://www.heroku.com/) diff --git a/mackup/applications/grandtotal-3.cfg b/mackup/applications/grandtotal-3.cfg new file mode 100644 index 000000000..c84b2d735 --- /dev/null +++ b/mackup/applications/grandtotal-3.cfg @@ -0,0 +1,6 @@ +[application] +name = GrandTotal 3 + +[configuration_files] +Library/Application Support/GrandTotal/AddressBook.plist +Library/Preferences/com.mediaatelier.GrandTotal3.plist From 57bb785835246c6893617358a5cc8bc882932d6d Mon Sep 17 00:00:00 2001 From: Michael Bianco Date: Tue, 25 Nov 2014 08:13:45 -0500 Subject: [PATCH 0167/1256] Adding TaskPaper --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/taskpaper.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/taskpaper.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a4f84428..fa6fb5b3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Fixed Textual support (via @crkochan) - Support for 1Password 4 (via @jverdeyen) - Support for GrandTotal 3 (via @jverdeyen) +- Support for TaskPaper (via @iloveitaly) ## Mackup 0.7.4 diff --git a/README.md b/README.md index b0aa0afbd..7bae40841 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. - [Sublime Text](http://www.sublimetext.com/) - [Subversion](http://subversion.apache.org/) - [SuperDuper!](http://www.shirt-pocket.com/SuperDuper/SuperDuperDescription.html) + - [TaskPaper](http://www.hogbaysoftware.com/products/taskpaper) - [Teamocil](http://remiprev.github.io/teamocil/) - [Terminator](https://launchpad.net/terminator/) - [TextMate](http://macromates.com/) diff --git a/mackup/applications/taskpaper.cfg b/mackup/applications/taskpaper.cfg new file mode 100644 index 000000000..a60f0ebea --- /dev/null +++ b/mackup/applications/taskpaper.cfg @@ -0,0 +1,6 @@ +[application] +name = Task Paper + +[configuration_files] +Library/Preferences/com.hogbaysoftware.TaskPaper.mac.plist +Library/Application Support/TaskPaper From b123f800b1f11588775ce6042db1f70f8bd090b6 Mon Sep 17 00:00:00 2001 From: Michael Bianco Date: Tue, 25 Nov 2014 11:14:05 -0500 Subject: [PATCH 0168/1256] Adding SequelPro plist config --- CHANGELOG.md | 1 + mackup/applications/sequel-pro.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a4f84428..7f1e08963 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Fixed Textual support (via @crkochan) - Support for 1Password 4 (via @jverdeyen) - Support for GrandTotal 3 (via @jverdeyen) +- Support for SequelPro plist (via @iloveitaly) ## Mackup 0.7.4 diff --git a/mackup/applications/sequel-pro.cfg b/mackup/applications/sequel-pro.cfg index 7df1511cb..76361d66c 100644 --- a/mackup/applications/sequel-pro.cfg +++ b/mackup/applications/sequel-pro.cfg @@ -3,3 +3,4 @@ name = Sequel Pro [configuration_files] Library/Application Support/Sequel Pro/Data +Library/Preferences/com.sequelpro.SequelPro.plist From 2bb01392057d93b77ee239b6500ae27ed38f1504 Mon Sep 17 00:00:00 2001 From: Michael Bianco Date: Tue, 25 Nov 2014 13:04:03 -0500 Subject: [PATCH 0169/1256] Adding Kaleidoscope.app support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/kaleidoscope.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/kaleidoscope.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a4f84428..6d146b173 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Fixed Textual support (via @crkochan) - Support for 1Password 4 (via @jverdeyen) - Support for GrandTotal 3 (via @jverdeyen) +- Support for Kaleidoscope (via @iloveitaly) ## Mackup 0.7.4 diff --git a/README.md b/README.md index b0aa0afbd..8cfe077b2 100644 --- a/README.md +++ b/README.md @@ -205,6 +205,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [ITerm2](http://www.iterm2.com/) - [JSHint](http://www.jshint.com/) - [Janus](https://github.com/carlhuda/janus) + - [Kaleidoscope](http://www.kaleidoscopeapp.com/) - [Karabiner](https://pqrs.org/osx/karabiner) - [Keka](http://kekaosx.com/) - [Keybase](https://keybase.io/) diff --git a/mackup/applications/kaleidoscope.cfg b/mackup/applications/kaleidoscope.cfg new file mode 100644 index 000000000..e4494259c --- /dev/null +++ b/mackup/applications/kaleidoscope.cfg @@ -0,0 +1,6 @@ +[application] +name = Kaleidoscope + +[configuration_files] +Library/Preferences/com.blackpixel.kaleidoscope.plist +Library/Application Support/Kaleidoscope From 719698b154e92cef97cc6621a2031decf7b15cf6 Mon Sep 17 00:00:00 2001 From: Michael Bianco Date: Tue, 25 Nov 2014 13:17:23 -0500 Subject: [PATCH 0170/1256] Adding stay --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/stay.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/stay.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a4f84428..b1aba5159 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Fixed Textual support (via @crkochan) - Support for 1Password 4 (via @jverdeyen) - Support for GrandTotal 3 (via @jverdeyen) +- Support for Stay (via @iloveitaly) ## Mackup 0.7.4 diff --git a/README.md b/README.md index b0aa0afbd..88d8b2144 100644 --- a/README.md +++ b/README.md @@ -288,6 +288,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Spectacle](http://spectacleapp.com/) - [Spotify](https://www.spotify.com/) - [Stata](http://www.stata.com/) + - [Stay](https://cordlessdog.com/stay/) - [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/stay.cfg b/mackup/applications/stay.cfg new file mode 100644 index 000000000..6f69685f7 --- /dev/null +++ b/mackup/applications/stay.cfg @@ -0,0 +1,6 @@ +[application] +name = Stay + +[configuration_files] +Library/Preferences/com.cordlessdog.Stay.plist +Library/Application Support/Stay From e6e64790b34c23e16dca7cbd6696ed03e7a1d96e Mon Sep 17 00:00:00 2001 From: Michael Bianco Date: Tue, 25 Nov 2014 13:18:49 -0500 Subject: [PATCH 0171/1256] Adding screenhero --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/screenhero.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/screenhero.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a4f84428..b8e18ba3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Fixed Textual support (via @crkochan) - Support for 1Password 4 (via @jverdeyen) - Support for GrandTotal 3 (via @jverdeyen) +- Support for Screenhero (via @iloveitaly) ## Mackup 0.7.4 diff --git a/README.md b/README.md index b0aa0afbd..3e90c04e4 100644 --- a/README.md +++ b/README.md @@ -270,6 +270,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [SBT](http://www.scala-sbt.org/) - [Scenario](http://www.lagentesoft.com/scenario/) - [Screen](http://www.gnu.org/software/screen/) + - [Screenhero](https://screenhero.com) - [SelfControl](http://selfcontrolapp.com/) - [Seil](https://pqrs.org/macosx/keyremap4macbook/seil.html.en) - [Sequel Pro](http://www.sequelpro.com/) diff --git a/mackup/applications/screenhero.cfg b/mackup/applications/screenhero.cfg new file mode 100644 index 000000000..d1c41ddb7 --- /dev/null +++ b/mackup/applications/screenhero.cfg @@ -0,0 +1,5 @@ +[application] +name = Screenhero + +[configuration_files] +Library/Preferences/com.screenhero.screenhero.plist From 8adc33c5f6479ca03829243a6962f0b4ff377a1e Mon Sep 17 00:00:00 2001 From: Michael Bianco Date: Tue, 25 Nov 2014 13:21:13 -0500 Subject: [PATCH 0172/1256] Adding support for Scrivener --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/scrivener.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/scrivener.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a4f84428..1162f63bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Fixed Textual support (via @crkochan) - Support for 1Password 4 (via @jverdeyen) - Support for GrandTotal 3 (via @jverdeyen) +- Support for Scrivener (via @iloveitaly) ## Mackup 0.7.4 diff --git a/README.md b/README.md index b0aa0afbd..635fd7176 100644 --- a/README.md +++ b/README.md @@ -270,6 +270,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [SBT](http://www.scala-sbt.org/) - [Scenario](http://www.lagentesoft.com/scenario/) - [Screen](http://www.gnu.org/software/screen/) + - [Scrivener](http://www.literatureandlatte.com/scrivener.php) - [SelfControl](http://selfcontrolapp.com/) - [Seil](https://pqrs.org/macosx/keyremap4macbook/seil.html.en) - [Sequel Pro](http://www.sequelpro.com/) diff --git a/mackup/applications/scrivener.cfg b/mackup/applications/scrivener.cfg new file mode 100644 index 000000000..f0622f322 --- /dev/null +++ b/mackup/applications/scrivener.cfg @@ -0,0 +1,6 @@ +[application] +name = Scrivener + +[configuration_files] +Library/Preferences/com.literatureandlatte.scrivener2.plist +Library/Application Support/Scrivener From 0e3a548c22ba5cedd1e4b4ba7b0a98d6467de97a Mon Sep 17 00:00:00 2001 From: Michael Bianco Date: Tue, 25 Nov 2014 13:28:30 -0500 Subject: [PATCH 0173/1256] Adding color schemer studio 2 --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/colorschemer-studio-2.cnf | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/colorschemer-studio-2.cnf diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a4f84428..699bf83b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Fixed Textual support (via @crkochan) - Support for 1Password 4 (via @jverdeyen) - Support for GrandTotal 3 (via @jverdeyen) +- Support for ColorSchemer Studio 2 (via @iloveitaly) ## Mackup 0.7.4 diff --git a/README.md b/README.md index b0aa0afbd..13c522574 100644 --- a/README.md +++ b/README.md @@ -162,6 +162,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [CloudApp](http://getcloudapp.com/) - [Coda 2](http://panic.com/coda/) - [Colloquy](http://colloquy.info/) + - [ColorSchemer Studio 2](http://www.colorschemer.com/osx_info.php) - [Composer](https://getcomposer.org/) - [Concentrate](http://www.getconcentrating.com/) - [ControlPlane](http://www.controlplaneapp.com/) diff --git a/mackup/applications/colorschemer-studio-2.cnf b/mackup/applications/colorschemer-studio-2.cnf new file mode 100644 index 000000000..f6894f542 --- /dev/null +++ b/mackup/applications/colorschemer-studio-2.cnf @@ -0,0 +1,6 @@ +[application] +name = ColorSchemer Studio 2 + +[configuration_files] +Library/Preferences/com.colorschemer.studio2.plist +Library/Application Support/ColorSchemer From 46dca11f4b9a98450ed58398a192a1a7d2e8fb05 Mon Sep 17 00:00:00 2001 From: Michael Bianco Date: Tue, 25 Nov 2014 15:37:31 -0500 Subject: [PATCH 0174/1256] Support for Billings Pro Server Admin --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/billings-pro-server-admin.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/billings-pro-server-admin.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a4f84428..70a812b6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Fixed Textual support (via @crkochan) - Support for 1Password 4 (via @jverdeyen) - Support for GrandTotal 3 (via @jverdeyen) +- Support for Billings Pro Server Admin (via @jverdeyen) ## Mackup 0.7.4 diff --git a/README.md b/README.md index b0aa0afbd..1a4379f80 100644 --- a/README.md +++ b/README.md @@ -148,6 +148,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [BetterSnapTool](http://blog.boastr.net/) - [BetterTouchTool](http://blog.boastr.net/) - [BibDesk](http://bibdesk.sourceforge.net/) + - [Billings Pro Server Admin](https://www.marketcircle.com/billingspro/download/billingspro-server/) - [Boto](https://github.com/boto/boto) - [Brackets](http://brackets.io/) - [Bundler](http://bundler.io) diff --git a/mackup/applications/billings-pro-server-admin.cfg b/mackup/applications/billings-pro-server-admin.cfg new file mode 100644 index 000000000..bfff75dbf --- /dev/null +++ b/mackup/applications/billings-pro-server-admin.cfg @@ -0,0 +1,5 @@ +[application] +name = Billings Pro Server Admin + +[configuration_files] +Library/Preferences/com.marketcircle.BillingsProServerAdmin.plist From 07712b0abed7ddeb59637dafe5ce7b0380b469f0 Mon Sep 17 00:00:00 2001 From: Joeri Verdeyen Date: Wed, 26 Nov 2014 08:01:38 +0100 Subject: [PATCH 0175/1256] Added istat-menus 5 --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/istat-menus-5.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/istat-menus-5.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 71b25dd76..730c5bf27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Support for spectrwm (via @cnodell) - Fixed Textual support (via @crkochan) - Support for 1Password 4 (via @jverdeyen) +- Support for iStat Menus 5 (via @jverdeyen) ## Mackup 0.7.4 diff --git a/README.md b/README.md index dafce4fb9..bb9c33132 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. - [i2cssh](https://github.com/wouterdebie/i2cssh) - [IntelliJIDEA](http://www.jetbrains.com/idea/) - [Irssi](http://www.irssi.org/) + - [iStat Menus 5](http://bjango.com/mac/istatmenus/) - [ITerm2](http://www.iterm2.com/) - [JSHint](http://www.jshint.com/) - [Janus](https://github.com/carlhuda/janus) diff --git a/mackup/applications/istat-menus-5.cfg b/mackup/applications/istat-menus-5.cfg new file mode 100644 index 000000000..78710a0e2 --- /dev/null +++ b/mackup/applications/istat-menus-5.cfg @@ -0,0 +1,6 @@ +[application] +name = iStat Menus + +[configuration_files] +Library/Preferences/com.bjango.istatmenus.plist +Library/Preferences/com.bjango.istatmenus5.extras.plist From c579bca8e78d9b8d81544d0d49c5046a18cff3ff Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Fri, 28 Nov 2014 12:52:42 -0600 Subject: [PATCH 0176/1256] Proposals for changes in contribution principles See: - https://github.com/lra/mackup/pull/405 - https://github.com/lra/mackup/pull/153 - https://github.com/lra/mackup/pull/175 - https://github.com/lra/mackup/pull/127 --- CONTRIBUTING.md | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index da11be409..9f0d34a9e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,15 +1,12 @@ # How to contribute -To speed up the process of getting your PR (Pull Request) approved and merged -into Mackup, make sure you follow those guidelines: +To speed up Pull Request (PR) approval and merger into Mackup, please follow these guidelines: - Keep one application supported per PR -- Add the application you want to support in the list of supported applications - in the README.md file -- Add yourself a changelog line at the top WIP section of the CHANGELOG.md file -- Don't contribute an application that already provide a way to sync its - config. e.g. Google Chrome or Alfred (paid version) -- If you want to sync the config of your favorite application, sync only the - config, not the data. You don't want to have MB of always changing data in - your syncing folders. +- Add the application to the list of supported applications in README.md +- Add your change to the WIP section of CHANGELOG.md +- Sync configurations should follow the follow principles: + - Syncing should not break the application, and PRs should be tested + - Syncing should not break any syncing functionality internal to the application + - The configuation should sync the minimal set of data, so that syncing happens quickly. Leave large app data out of the sync configuration. -Thanks in advance for your contribution ! +Thank you for your contribution! From 1e78f2d1b0a6a0c23a32059a3df7cfff115f0ac2 Mon Sep 17 00:00:00 2001 From: Chris Morrell Date: Tue, 2 Dec 2014 10:29:09 -0500 Subject: [PATCH 0177/1256] Added support for WebStorm 9 --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/webstorm-9.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/webstorm-9.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 69c07930c..ae3974e5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ - Support for ColorSchemer Studio 2 (via @iloveitaly) - Support for Billings Pro Server Admin (via @iloveitaly) - Support for iStat Menus 5 (via @jverdeyen) +- Support for WebStorm 9 (via @inxilpro) ## Mackup 0.7.4 diff --git a/README.md b/README.md index 7741fcfe5..1356d8d0c 100644 --- a/README.md +++ b/README.md @@ -315,6 +315,7 @@ 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/) + - [WebStorm 9](https://www.jetbrains.com/webstorm/) - [Wget](https://www.gnu.org/software/wget/) - [Witch](http://manytricks.com/witch/) - [X11](http://www.x.org/) diff --git a/mackup/applications/webstorm-9.cfg b/mackup/applications/webstorm-9.cfg new file mode 100644 index 000000000..105ebee88 --- /dev/null +++ b/mackup/applications/webstorm-9.cfg @@ -0,0 +1,6 @@ +[application] +name = WebStorm 9 + +[configuration_files] +Library/Application Support/WebStorm9 +Library/Preferences/WebStorm9 From 56fc1c362ddc98c738ae18efe30a3aac4080cdbe Mon Sep 17 00:00:00 2001 From: Chris Morrell Date: Tue, 2 Dec 2014 10:31:30 -0500 Subject: [PATCH 0178/1256] Oh My Fish support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/oh-my-fish.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/oh-my-fish.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 69c07930c..59da5fd7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ - Support for ColorSchemer Studio 2 (via @iloveitaly) - Support for Billings Pro Server Admin (via @iloveitaly) - Support for iStat Menus 5 (via @jverdeyen) +- Support for Oh My Fish (via @inxilpro) ## Mackup 0.7.4 diff --git a/README.md b/README.md index 7741fcfe5..051a9d41a 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. - [ngrok](https://ngrok.com/) - [nvALT](http://brettterpstra.com/projects/nvalt/) - [nvpy](https://github.com/cpbotha/nvpy) + - [Oh My Fish](https://github.com/bpinto/oh-my-fish) - [Oh My Zsh](https://github.com/robbyrussell/oh-my-zsh) - [OmniFocus](http://www.omnigroup.com/products/omnifocus/) - [OmniGraffle](http://www.omnigroup.com/omnigraffle/) diff --git a/mackup/applications/oh-my-fish.cfg b/mackup/applications/oh-my-fish.cfg new file mode 100644 index 000000000..3cab482d8 --- /dev/null +++ b/mackup/applications/oh-my-fish.cfg @@ -0,0 +1,5 @@ +[application] +name = Oh My Fish + +[configuration_files] +.oh-my-fish From 32dbcfff8d185e6d50190f3509c73d363f0984c7 Mon Sep 17 00:00:00 2001 From: Chris Morrell Date: Tue, 2 Dec 2014 14:49:57 -0500 Subject: [PATCH 0179/1256] Switched to only syncing 'custom' directory --- mackup/applications/oh-my-fish.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/oh-my-fish.cfg b/mackup/applications/oh-my-fish.cfg index 3cab482d8..07e4fe2ef 100644 --- a/mackup/applications/oh-my-fish.cfg +++ b/mackup/applications/oh-my-fish.cfg @@ -2,4 +2,4 @@ name = Oh My Fish [configuration_files] -.oh-my-fish +.oh-my-fish/custom From 756a6bbc31ff332f942d67b480893eea41af23de Mon Sep 17 00:00:00 2001 From: Leo Koppelkamm Date: Mon, 8 Dec 2014 20:49:42 +0100 Subject: [PATCH 0180/1256] Add Scroll Reverser --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/scroll-reverser.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/scroll-reverser.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a93bcc63..55bd56f85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - Support for iStat Menus 5 (via @jverdeyen) - Support for WebStorm 9 (via @inxilpro) - Support for Oh My Fish (via @inxilpro) +- Support for Scroll Reverser (via @ponychicken) ## Mackup 0.7.4 diff --git a/README.md b/README.md index 1b68b8129..5529a3efa 100644 --- a/README.md +++ b/README.md @@ -277,6 +277,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Screen](http://www.gnu.org/software/screen/) - [Screenhero](https://screenhero.com) - [Scrivener](http://www.literatureandlatte.com/scrivener.php) + - [Scroll Reverser](https://pilotmoon.com/scrollreverser/) - [SelfControl](http://selfcontrolapp.com/) - [Seil](https://pqrs.org/macosx/keyremap4macbook/seil.html.en) - [Sequel Pro](http://www.sequelpro.com/) diff --git a/mackup/applications/scroll-reverser.cfg b/mackup/applications/scroll-reverser.cfg new file mode 100644 index 000000000..b265dba8a --- /dev/null +++ b/mackup/applications/scroll-reverser.cfg @@ -0,0 +1,5 @@ +[application] +name = Scroll Reverser + +[configuration_files] +Library/Preferences/com.pilotmoon.scroll-reverser.plist From 8ff0bedbdca527246c753dcca32c8a18f8ce0890 Mon Sep 17 00:00:00 2001 From: Daniel Suo Date: Wed, 10 Dec 2014 04:28:55 -0500 Subject: [PATCH 0181/1256] Add julialang configuration file --- mackup/applications/julia.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/julia.cfg diff --git a/mackup/applications/julia.cfg b/mackup/applications/julia.cfg new file mode 100644 index 000000000..8eb124285 --- /dev/null +++ b/mackup/applications/julia.cfg @@ -0,0 +1,5 @@ +[application] +name = Julia + +[configuration_files] +.juliarc.jl From 93458ad5247faed021f7ceccd9aa9ead23ecdfa4 Mon Sep 17 00:00:00 2001 From: Daniel Suo Date: Wed, 10 Dec 2014 10:55:39 -0500 Subject: [PATCH 0182/1256] add support for Julia --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/julia.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/julia.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 55bd56f85..64c520773 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ - Support for WebStorm 9 (via @inxilpro) - Support for Oh My Fish (via @inxilpro) - Support for Scroll Reverser (via @ponychicken) +- Support for JuliaLang (via @danielsuo) ## Mackup 0.7.4 diff --git a/README.md b/README.md index 5529a3efa..51b52a55a 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. - [ITerm2](http://www.iterm2.com/) - [JSHint](http://www.jshint.com/) - [Janus](https://github.com/carlhuda/janus) + - [Julia](http://julialang.org) - [Kaleidoscope](http://www.kaleidoscopeapp.com/) - [Karabiner](https://pqrs.org/osx/karabiner) - [Keka](http://kekaosx.com/) diff --git a/mackup/applications/julia.cfg b/mackup/applications/julia.cfg new file mode 100644 index 000000000..8eb124285 --- /dev/null +++ b/mackup/applications/julia.cfg @@ -0,0 +1,5 @@ +[application] +name = Julia + +[configuration_files] +.juliarc.jl From cda954aed347168e7d44a2d06558cbc0c55a8369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=88=82jalel?= Date: Wed, 10 Dec 2014 17:53:24 +0100 Subject: [PATCH 0183/1256] Added a simple cfg files for stickies Stickies is the native lightweight note taking application in Mac OsX. --- mackup/applications/stickies.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/stickies.cfg diff --git a/mackup/applications/stickies.cfg b/mackup/applications/stickies.cfg new file mode 100644 index 000000000..8737b39d6 --- /dev/null +++ b/mackup/applications/stickies.cfg @@ -0,0 +1,5 @@ +[application] +name = Stickies + +[configuration_files] +Library/StickiesDatabase \ No newline at end of file From 70b59c0f899671b94e5254f1feb258bd03b4d200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=88=82jalel?= Date: Wed, 10 Dec 2014 18:01:09 +0100 Subject: [PATCH 0184/1256] README and CHANGELOG updated --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55bd56f85..e309e96d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ - Support for WebStorm 9 (via @inxilpro) - Support for Oh My Fish (via @inxilpro) - Support for Scroll Reverser (via @ponychicken) +- Support for OsX Stickies (via @djabbz) ## Mackup 0.7.4 diff --git a/README.md b/README.md index 5529a3efa..24be2ca10 100644 --- a/README.md +++ b/README.md @@ -297,6 +297,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/) + - [Stickies](https://en.wikipedia.org/wiki/Stickies_%28software%29) - [Sublime Text](http://www.sublimetext.com/) - [Subversion](http://subversion.apache.org/) - [SuperDuper!](http://www.shirt-pocket.com/SuperDuper/SuperDuperDescription.html) From 8ec15ead8263d457cc877d570da78fe98185f62c Mon Sep 17 00:00:00 2001 From: Huy Hong Date: Wed, 10 Dec 2014 13:14:42 -0800 Subject: [PATCH 0185/1256] adding jrnl - http://maebert.github.io/jrnl/ --- README.md | 1 + mackup/applications/jrnl.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/jrnl.cfg diff --git a/README.md b/README.md index 51b52a55a..422d4e302 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. - [ITerm2](http://www.iterm2.com/) - [JSHint](http://www.jshint.com/) - [Janus](https://github.com/carlhuda/janus) + - [jrnl](http://maebert.github.io/jrnl/) - [Julia](http://julialang.org) - [Kaleidoscope](http://www.kaleidoscopeapp.com/) - [Karabiner](https://pqrs.org/osx/karabiner) diff --git a/mackup/applications/jrnl.cfg b/mackup/applications/jrnl.cfg new file mode 100644 index 000000000..d09c8fe3f --- /dev/null +++ b/mackup/applications/jrnl.cfg @@ -0,0 +1,5 @@ +[application] +name = jrnl + +[configuration_files] +.jrnl_config From 45de057c194a801a41291c5936d98ad9c3212083 Mon Sep 17 00:00:00 2001 From: Huy Hong Date: Wed, 10 Dec 2014 14:52:21 -0800 Subject: [PATCH 0186/1256] Updating CHANGELOG.md for jrnl --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64c520773..d7f905f98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Support for jrnl (via @huyhong) - Support for Rubocop (via @iainbeeston) - Support for Terminator (via @chr1sbest) - Support for Houdini (via @kfinlay) From f2f3b937026b6a2ba1c7493766fa558ae95dbe3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=88=82jalel?= Date: Thu, 11 Dec 2014 12:36:09 +0100 Subject: [PATCH 0187/1256] New line added at the end of the cfg file. --- mackup/applications/stickies.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/stickies.cfg b/mackup/applications/stickies.cfg index 8737b39d6..c4b02c066 100644 --- a/mackup/applications/stickies.cfg +++ b/mackup/applications/stickies.cfg @@ -2,4 +2,4 @@ name = Stickies [configuration_files] -Library/StickiesDatabase \ No newline at end of file +Library/StickiesDatabase From 951ef74d976fa27350842ada526d50d9b7a27d70 Mon Sep 17 00:00:00 2001 From: Hariharan Iyer Date: Fri, 12 Dec 2014 10:08:40 +0530 Subject: [PATCH 0188/1256] fix st3 to only sync essential files, excluding cache, session, etc --- CHANGELOG.md | 1 + mackup/applications/sublime-text-3.cfg | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e34a4c3d9..b4136c66f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ - Support for Scroll Reverser (via @ponychicken) - Support for JuliaLang (via @danielsuo) - Support for OsX Stickies (via @djabbz) +- Sublime Text 3 now only syncs essential files, excluding session and cache folders ## Mackup 0.7.4 diff --git a/mackup/applications/sublime-text-3.cfg b/mackup/applications/sublime-text-3.cfg index 2e878a17c..f3ec32e9d 100644 --- a/mackup/applications/sublime-text-3.cfg +++ b/mackup/applications/sublime-text-3.cfg @@ -3,4 +3,5 @@ name = Sublime Text 3 [configuration_files] Library/Application Support/Sublime Text 3/Packages/User -.config/sublime-text-3 +.config/sublime-text-3/Installed Packages +.config/sublime-text-3/Packages From 3e80de5b2ad7f715172d207ba54159b86a86f868 Mon Sep 17 00:00:00 2001 From: Troy Murray Date: Sat, 13 Dec 2014 12:00:40 -0500 Subject: [PATCH 0189/1256] Added support for the Navicat database GUI applications for OS X. --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/navicat.cfg | 6 ++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/navicat.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e34a4c3d9..5912f5a1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,8 @@ - Support for Scroll Reverser (via @ponychicken) - Support for JuliaLang (via @danielsuo) - Support for OsX Stickies (via @djabbz) +- Support for Navicat Database GUI tools (via @tdm00) + ## Mackup 0.7.4 diff --git a/README.md b/README.md index 8aa0b11be..c797e4eab 100644 --- a/README.md +++ b/README.md @@ -238,6 +238,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [mpd](http://www.musicpd.org) - [MPV](http://mpv.io/) - [Nano](http://www.nano-editor.org/) + - [Navicat](http://navicat.com/) - [ncmpcpp](http://ncmpcpp.rybczak.net) - [newsbeuter](http://newsbeuter.org/) - [ngrok](https://ngrok.com/) diff --git a/mackup/applications/navicat.cfg b/mackup/applications/navicat.cfg new file mode 100644 index 000000000..48f5c76d6 --- /dev/null +++ b/mackup/applications/navicat.cfg @@ -0,0 +1,6 @@ +[application] +name = Navicat + +[configuration_files] +Library/Application Support/PremiumSoft CyberTech +Library/Preferences/com.prect.NavicatPremiumEssentials.plist From 8ed1d5e4d11619a967b7efd82d930b63389869d4 Mon Sep 17 00:00:00 2001 From: Troy Murray Date: Sat, 13 Dec 2014 12:01:15 -0500 Subject: [PATCH 0190/1256] Fix "woule" typo. --- TODO.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TODO.md b/TODO.md index 77b4720d4..9399e1721 100644 --- a/TODO.md +++ b/TODO.md @@ -4,7 +4,7 @@ Feel free to implement any of those ;) - `mackup status` to display any synced app, and any app that could be synced by launching `mackup backup` -- A GUI, we could definitely use an OS X gui that woule display the status: +- A GUI, we could definitely use an OS X gui that would display the status: synced apps, unsynced apps, using wxPython ? - Try with hard links to support the Fonts pb - 100% test coverage From 6a9dd64bc05491e2c41e3f8993630f78f0c2e191 Mon Sep 17 00:00:00 2001 From: Jonathan Pares Date: Mon, 15 Dec 2014 10:06:39 +0100 Subject: [PATCH 0191/1256] Update README.md, mention mackup.cfg at the top --- doc/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/README.md b/doc/README.md index 3285ebd9c..ab7647f62 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,5 +1,7 @@ # Configuration +All the configuration is done into a file named `.mackup.cfg` to store at the root of your home folder. + ## Storage ### Dropbox From b7507df39f20a75a8b86a65fc521a15b5dfb204a Mon Sep 17 00:00:00 2001 From: Basil Shubin Date: Mon, 15 Dec 2014 16:30:27 +0600 Subject: [PATCH 0192/1256] PostgreSQL support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/pgsql.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/pgsql.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5912f5a1f..3f84de105 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Support for PostgreSQL (via @bashu) - Support for jrnl (via @huyhong) - Support for Rubocop (via @iainbeeston) - Support for Terminator (via @chr1sbest) diff --git a/README.md b/README.md index c797e4eab..57dfd1019 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. - [PIP](http://www.pip-installer.org/) - [PokerStars](http://www.pokerstars.com/) - [PopClip](http://pilotmoon.com/popclip/) + - [PostgreSQL](http://postgresql.org/) - [Pow](http://pow.cx/) - [Prezto](https://github.com/sorin-ionescu/prezto) - [Processing](http://processing.org/) diff --git a/mackup/applications/pgsql.cfg b/mackup/applications/pgsql.cfg new file mode 100644 index 000000000..47c762e4c --- /dev/null +++ b/mackup/applications/pgsql.cfg @@ -0,0 +1,5 @@ +[application] +name = PostgreSQL + +[configuration_files] +.pgpass From 9d6fb78d82356d35cfa42ed696dd51048525563b Mon Sep 17 00:00:00 2001 From: Basil Shubin Date: Mon, 15 Dec 2014 16:56:54 +0600 Subject: [PATCH 0193/1256] Support for Consular --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/consular.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/consular.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5912f5a1f..5f7a8fedb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Support for consular (via @bashu) - Support for jrnl (via @huyhong) - Support for Rubocop (via @iainbeeston) - Support for Terminator (via @chr1sbest) diff --git a/README.md b/README.md index c797e4eab..74394e1c9 100644 --- a/README.md +++ b/README.md @@ -165,6 +165,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Colloquy](http://colloquy.info/) - [ColorSchemer Studio 2](http://www.colorschemer.com/osx_info.php) - [Composer](https://getcomposer.org/) + - [Consular](http://www.rubydoc.info/github/achiu/consular/master/file/README.md) - [Concentrate](http://www.getconcentrating.com/) - [ControlPlane](http://www.controlplaneapp.com/) - [CoRD](http://cord.sourceforge.net/) diff --git a/mackup/applications/consular.cfg b/mackup/applications/consular.cfg new file mode 100644 index 000000000..8c1778cf8 --- /dev/null +++ b/mackup/applications/consular.cfg @@ -0,0 +1,5 @@ +[application] +name = Consular + +[configuration_files] +.consularc From 93e17c2bc809a2eb242b106f105c992e3122d4bf Mon Sep 17 00:00:00 2001 From: Basil Shubin Date: Mon, 15 Dec 2014 17:09:42 +0600 Subject: [PATCH 0194/1256] Update consular.cfg --- mackup/applications/consular.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/consular.cfg b/mackup/applications/consular.cfg index 8c1778cf8..cc0a3290c 100644 --- a/mackup/applications/consular.cfg +++ b/mackup/applications/consular.cfg @@ -2,4 +2,5 @@ name = Consular [configuration_files] +.config/consular .consularc From fc5b42dc6655240c7803aed3a38107caf6c8e723 Mon Sep 17 00:00:00 2001 From: Basil Shubin Date: Mon, 15 Dec 2014 17:36:28 +0600 Subject: [PATCH 0195/1256] Support for Punto Switcher --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/punto-switcher.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/punto-switcher.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5912f5a1f..f061ed52d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Support for Punto Switcher (via @bashu) - Support for jrnl (via @huyhong) - Support for Rubocop (via @iainbeeston) - Support for Terminator (via @chr1sbest) diff --git a/README.md b/README.md index c797e4eab..80f33d7e5 100644 --- a/README.md +++ b/README.md @@ -263,6 +263,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Pow](http://pow.cx/) - [Prezto](https://github.com/sorin-ionescu/prezto) - [Processing](http://processing.org/) + - [Punto Switcher](http://punto.yandex.ru/) - [PyPI](https://pypi.python.org/pypi) - [Quicksilver](http://qsapp.com/) - [Rails](http://rubyonrails.org/) diff --git a/mackup/applications/punto-switcher.cfg b/mackup/applications/punto-switcher.cfg new file mode 100644 index 000000000..5b7ba9fbd --- /dev/null +++ b/mackup/applications/punto-switcher.cfg @@ -0,0 +1,5 @@ +[application] +name = Punto Switcher + +[configuration_files] +Library/Preferences/ru.yandex.punto.plist From be97d34c8ed2e16e6e2a486ea7863b93d63436f6 Mon Sep 17 00:00:00 2001 From: Basil Shubin Date: Mon, 15 Dec 2014 17:47:07 +0600 Subject: [PATCH 0196/1256] Support for Poedit --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/poedit.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/poedit.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5912f5a1f..94b23b243 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Support for Poedit (via @bashu) - Support for jrnl (via @huyhong) - Support for Rubocop (via @iainbeeston) - Support for Terminator (via @chr1sbest) diff --git a/README.md b/README.md index c797e4eab..fd6516c36 100644 --- a/README.md +++ b/README.md @@ -258,6 +258,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Phoenix](https://github.com/sdegutis/Phoenix) - [PhpStorm](http://www.jetbrains.com/phpstorm/) - [PIP](http://www.pip-installer.org/) + - [Poedit](http://poedit.net/) - [PokerStars](http://www.pokerstars.com/) - [PopClip](http://pilotmoon.com/popclip/) - [Pow](http://pow.cx/) diff --git a/mackup/applications/poedit.cfg b/mackup/applications/poedit.cfg new file mode 100644 index 000000000..6dc0c2c9e --- /dev/null +++ b/mackup/applications/poedit.cfg @@ -0,0 +1,6 @@ +[application] +name = Poedit + +[configuration_files] +Library/Preferences/net.poedit.Poedit.cfg +Library/Preferences/net.poedit.Poedit.plist From 744ce03c8d8722c0d47716229a895c923de51bbb Mon Sep 17 00:00:00 2001 From: Basil Shubin Date: Mon, 15 Dec 2014 17:56:11 +0600 Subject: [PATCH 0197/1256] Support for Max.app --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/max.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/max.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5912f5a1f..d08dd746b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Support for Max (via @bashu) - Support for jrnl (via @huyhong) - Support for Rubocop (via @iainbeeston) - Support for Terminator (via @chr1sbest) diff --git a/README.md b/README.md index c797e4eab..b04820de1 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. - [Magic Launch](https://www.oneperiodic.com/products/magiclaunch/) - [MagicPrefs](http://magicprefs.com/) - [Mailplane](http://mailplaneapp.com/) + - [Max](http://sbooth.org/Max/) - [MenuMeters](http://www.ragingmenace.com/software/menumeters/) - [Mercurial](http://mercurial.selenic.com/) - [MercuryMover](http://www.heliumfoot.com/mercurymover/) diff --git a/mackup/applications/max.cfg b/mackup/applications/max.cfg new file mode 100644 index 000000000..e280858f9 --- /dev/null +++ b/mackup/applications/max.cfg @@ -0,0 +1,5 @@ +[application] +name = Max + +[configuration_files] +Library/Preferences/org.sbooth.Max.plist From fa24fdaf1a4dca6297fb8e70e3c087ebc7aaeb8f Mon Sep 17 00:00:00 2001 From: James Chen Date: Thu, 18 Dec 2014 20:56:44 +0900 Subject: [PATCH 0198/1256] Backup credentials file for ruby .gem folder only --- mackup/applications/ruby.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/ruby.cfg b/mackup/applications/ruby.cfg index ef51b71a6..060dd66e6 100644 --- a/mackup/applications/ruby.cfg +++ b/mackup/applications/ruby.cfg @@ -4,6 +4,6 @@ name = Ruby [configuration_files] .gemrc .irbrc -.gem +.gem/credentials .pryrc .aprc From 26f6ff7888673a6167ecce4b868df97b568729ad Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 19 Dec 2014 09:03:06 +0900 Subject: [PATCH 0199/1256] Update CHANGELOG regarding Ruby .gem folder change --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2eef4822f..19ac9d770 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Limit .gem folder backup for Ruby, including credentials file only (via @ashchan) - Support for PostgreSQL (via @bashu) - Support for consular (via @bashu) - Support for Punto Switcher (via @bashu) From d1467b59a444b9a7d0ed4380be358602862e0db5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20B=C3=A4chtold?= Date: Fri, 19 Dec 2014 09:13:56 +0100 Subject: [PATCH 0200/1256] Sync .psqlrc The .psqlrc file can be used to customize the psql prompt. See http://www.postgresql.org/docs/9.3/static/app-psql.html#AEN88717 for more information. --- mackup/applications/pgsql.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/pgsql.cfg b/mackup/applications/pgsql.cfg index 47c762e4c..87e6b513b 100644 --- a/mackup/applications/pgsql.cfg +++ b/mackup/applications/pgsql.cfg @@ -3,3 +3,4 @@ name = PostgreSQL [configuration_files] .pgpass +.psqlrc From dbb7fda2bb2368cc3119295af9acd0c0a546ff8b Mon Sep 17 00:00:00 2001 From: Matthew Seiler Date: Fri, 19 Dec 2014 17:13:01 -0500 Subject: [PATCH 0201/1256] Adding Conky --- CHANGELOG.md | 1 + README.md | 3 ++- mackup/applications/conky.cfg | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 mackup/applications/conky.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 19ac9d770..7e76f19e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ - Support for OsX Stickies (via @djabbz) - Support for Navicat Database GUI tools (via @tdm00) - Sublime Text 3 now only syncs essential files, excluding session and cache folders +- Support for Conky ## Mackup 0.7.4 diff --git a/README.md b/README.md index a6ca63bc7..a9b3287e2 100644 --- a/README.md +++ b/README.md @@ -165,8 +165,9 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Colloquy](http://colloquy.info/) - [ColorSchemer Studio 2](http://www.colorschemer.com/osx_info.php) - [Composer](https://getcomposer.org/) - - [Consular](http://www.rubydoc.info/github/achiu/consular/master/file/README.md) - [Concentrate](http://www.getconcentrating.com/) + - [Conky](http://conky.sourceforge.net/) + - [Consular](http://www.rubydoc.info/github/achiu/consular/master/file/README.md) - [ControlPlane](http://www.controlplaneapp.com/) - [CoRD](http://cord.sourceforge.net/) - [Cyberduck](http://cyberduck.ch/) diff --git a/mackup/applications/conky.cfg b/mackup/applications/conky.cfg new file mode 100644 index 000000000..37bf8910d --- /dev/null +++ b/mackup/applications/conky.cfg @@ -0,0 +1,6 @@ +[application] +name = Conky + +[configuration_files] +.conkyrc + From 512669119dfffd1aa048f998833ec5ad45a91711 Mon Sep 17 00:00:00 2001 From: Matthew Seiler Date: Fri, 19 Dec 2014 17:20:34 -0500 Subject: [PATCH 0202/1256] Adding tint2 --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/tint2.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/tint2.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 19ac9d770..25ba069f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ - Support for OsX Stickies (via @djabbz) - Support for Navicat Database GUI tools (via @tdm00) - Sublime Text 3 now only syncs essential files, excluding session and cache folders +- Support for tint2 ## Mackup 0.7.4 diff --git a/README.md b/README.md index a6ca63bc7..ea99f59c7 100644 --- a/README.md +++ b/README.md @@ -315,6 +315,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) + - [tint2](https://code.google.com/p/tint2/) - [Tmux](http://tmux.sourceforge.net/) - [Tmuxinator](https://github.com/aziz/tmuxinator) - [Tower](http://www.git-tower.com/) diff --git a/mackup/applications/tint2.cfg b/mackup/applications/tint2.cfg new file mode 100644 index 000000000..7d1860294 --- /dev/null +++ b/mackup/applications/tint2.cfg @@ -0,0 +1,6 @@ +[application] +name = tint2 + +[configuration_files] +.config/tint2/tint2rc + From 12977e3590a2cd1ec4a5e5db3bc0467be730122c Mon Sep 17 00:00:00 2001 From: Matthew Seiler Date: Fri, 19 Dec 2014 18:02:47 -0500 Subject: [PATCH 0203/1256] whitespace fix --- mackup/applications/conky.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/mackup/applications/conky.cfg b/mackup/applications/conky.cfg index 37bf8910d..90f2fc6bb 100644 --- a/mackup/applications/conky.cfg +++ b/mackup/applications/conky.cfg @@ -3,4 +3,3 @@ name = Conky [configuration_files] .conkyrc - From 5ec9fd39c3f6ddb4cd8053d002503fae33b446c0 Mon Sep 17 00:00:00 2001 From: Matthew Seiler Date: Fri, 19 Dec 2014 18:03:26 -0500 Subject: [PATCH 0204/1256] whitespace fix --- mackup/applications/tint2.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/mackup/applications/tint2.cfg b/mackup/applications/tint2.cfg index 7d1860294..bf1a1f7d8 100644 --- a/mackup/applications/tint2.cfg +++ b/mackup/applications/tint2.cfg @@ -3,4 +3,3 @@ name = tint2 [configuration_files] .config/tint2/tint2rc - From db4173c1521d725f67fe64958952e9f73c819e2f Mon Sep 17 00:00:00 2001 From: Matthew Robinson Date: Thu, 1 Jan 2015 19:57:13 +0800 Subject: [PATCH 0205/1256] Support for ProxyChains & ProxyChains NG --- CHANGELOG.md | 1 + README.md | 2 ++ mackup/applications/proxychains.cfg | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/proxychains.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 19ac9d770..317e9abd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ - Support for OsX Stickies (via @djabbz) - Support for Navicat Database GUI tools (via @tdm00) - Sublime Text 3 now only syncs essential files, excluding session and cache folders +- Support for ProxyChains & ProxyChains NG (via @mttrb) ## Mackup 0.7.4 diff --git a/README.md b/README.md index a6ca63bc7..ca39a7baf 100644 --- a/README.md +++ b/README.md @@ -267,6 +267,8 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Pow](http://pow.cx/) - [Prezto](https://github.com/sorin-ionescu/prezto) - [Processing](http://processing.org/) + - [ProxyChains](http://proxychains.sourceforge.net) + - [ProxyChains NG](https://sourceforge.net/projects/proxychains-ng) - [Punto Switcher](http://punto.yandex.ru/) - [PyPI](https://pypi.python.org/pypi) - [Quicksilver](http://qsapp.com/) diff --git a/mackup/applications/proxychains.cfg b/mackup/applications/proxychains.cfg new file mode 100644 index 000000000..6a3f26c09 --- /dev/null +++ b/mackup/applications/proxychains.cfg @@ -0,0 +1,5 @@ +[application] +name = ProxyChains + +[configuration_files] +.proxychains From 09686042108d912900748a0c162b8e8130b088ea Mon Sep 17 00:00:00 2001 From: Akash Shende Date: Sat, 3 Jan 2015 09:00:47 +0530 Subject: [PATCH 0206/1256] Add support for i3-wm tiling manager. --- README.md | 1 + mackup/applications/i3wm.cfg | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 mackup/applications/i3wm.cfg diff --git a/README.md b/README.md index a6ca63bc7..eddc30036 100644 --- a/README.md +++ b/README.md @@ -203,6 +203,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Houdini](http://uglyapps.co.uk/houdini/) - [Htop](http://htop.sourceforge.net/) - [i2cssh](https://github.com/wouterdebie/i2cssh) + - [i3wm](http://i3wm.org/) - [IntelliJIDEA](http://www.jetbrains.com/idea/) - [Irssi](http://www.irssi.org/) - [iStat Menus 5](http://bjango.com/mac/istatmenus/) diff --git a/mackup/applications/i3wm.cfg b/mackup/applications/i3wm.cfg new file mode 100644 index 000000000..fda76269e --- /dev/null +++ b/mackup/applications/i3wm.cfg @@ -0,0 +1,8 @@ +[application] +name=i3wm + +[configuration_files] +.i3/config +.i3status.conf +.xsession + From 0899497baa37e53aa61ba8603e3799d1fdb99a8c Mon Sep 17 00:00:00 2001 From: Akash Shende Date: Sat, 3 Jan 2015 10:05:44 +0530 Subject: [PATCH 0207/1256] removed blank line --- mackup/applications/i3wm.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/mackup/applications/i3wm.cfg b/mackup/applications/i3wm.cfg index fda76269e..c36ee0f66 100644 --- a/mackup/applications/i3wm.cfg +++ b/mackup/applications/i3wm.cfg @@ -5,4 +5,3 @@ name=i3wm .i3/config .i3status.conf .xsession - From 11b711a805d79a0a9a10dfc1503ff0a06ad164cf Mon Sep 17 00:00:00 2001 From: Akash Shende Date: Sun, 4 Jan 2015 00:20:14 +0530 Subject: [PATCH 0208/1256] removed .xsession as its not specific to i3WM --- mackup/applications/i3wm.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/mackup/applications/i3wm.cfg b/mackup/applications/i3wm.cfg index c36ee0f66..6d9a15cc3 100644 --- a/mackup/applications/i3wm.cfg +++ b/mackup/applications/i3wm.cfg @@ -4,4 +4,3 @@ name=i3wm [configuration_files] .i3/config .i3status.conf -.xsession From 15a455c1b327309ac064d098918deaf629d742f2 Mon Sep 17 00:00:00 2001 From: Akash Shende Date: Sun, 4 Jan 2015 00:39:14 +0530 Subject: [PATCH 0209/1256] added i3WM --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 317e9abd9..e5a31a439 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ - Support for Navicat Database GUI tools (via @tdm00) - Sublime Text 3 now only syncs essential files, excluding session and cache folders - Support for ProxyChains & ProxyChains NG (via @mttrb) +- Support for i3WM (via @akash0x53) ## Mackup 0.7.4 From 2c5c43262b097cb9c1f01397c4982e16b6a48a72 Mon Sep 17 00:00:00 2001 From: Ramsay Stirling II Date: Sat, 3 Jan 2015 17:12:15 -0500 Subject: [PATCH 0210/1256] Added support for Ipython More info on ipython profiles here: http://ipython.org/ipython-doc/dev/config/intro.html#setting-configurabl e-options --- CHANGELOG.md | 1 + mackup/applications/ipython.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/ipython.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 317e9abd9..2344bb513 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ - Support for Navicat Database GUI tools (via @tdm00) - Sublime Text 3 now only syncs essential files, excluding session and cache folders - Support for ProxyChains & ProxyChains NG (via @mttrb) +- Support for IPython (via @nrvs) ## Mackup 0.7.4 diff --git a/mackup/applications/ipython.cfg b/mackup/applications/ipython.cfg new file mode 100644 index 000000000..44824759c --- /dev/null +++ b/mackup/applications/ipython.cfg @@ -0,0 +1,5 @@ +[application] +name = IPython + +[configuration_files] +.ipython From e2f2e0042765b67ed0b40baccceffb01769c36a7 Mon Sep 17 00:00:00 2001 From: Brandon Harper Date: Tue, 6 Jan 2015 12:11:12 -0700 Subject: [PATCH 0211/1256] #438 Splitting ColorSync settings into its own app --- mackup/applications/colorsync.cfg | 5 +++++ mackup/applications/macosx.cfg | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 mackup/applications/colorsync.cfg diff --git a/mackup/applications/colorsync.cfg b/mackup/applications/colorsync.cfg new file mode 100644 index 000000000..43bbea363 --- /dev/null +++ b/mackup/applications/colorsync.cfg @@ -0,0 +1,5 @@ +[application] +name = ColorSync + +[configuration_files] +Library/ColorSync/Profiles diff --git a/mackup/applications/macosx.cfg b/mackup/applications/macosx.cfg index a09a76b15..529580e55 100644 --- a/mackup/applications/macosx.cfg +++ b/mackup/applications/macosx.cfg @@ -3,4 +3,3 @@ name = MacOSX [configuration_files] .MacOSX -Library/ColorSync/Profiles From b0e461a6465067edc5f0c6d3de709c6e6aeecb81 Mon Sep 17 00:00:00 2001 From: Jean-Christophe GAY Date: Sat, 24 Jan 2015 15:32:35 +0100 Subject: [PATCH 0212/1256] Add support for Maven http://maven.apache.org --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/maven.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/maven.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 317e9abd9..49134babd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ - Support for Navicat Database GUI tools (via @tdm00) - Sublime Text 3 now only syncs essential files, excluding session and cache folders - Support for ProxyChains & ProxyChains NG (via @mttrb) +- Support for Maven (via @jcgay) ## Mackup 0.7.4 diff --git a/README.md b/README.md index ca39a7baf..4bd256fd9 100644 --- a/README.md +++ b/README.md @@ -229,6 +229,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Magic Launch](https://www.oneperiodic.com/products/magiclaunch/) - [MagicPrefs](http://magicprefs.com/) - [Mailplane](http://mailplaneapp.com/) + - [Maven](http://maven.apache.org) - [Max](http://sbooth.org/Max/) - [MenuMeters](http://www.ragingmenace.com/software/menumeters/) - [Mercurial](http://mercurial.selenic.com/) diff --git a/mackup/applications/maven.cfg b/mackup/applications/maven.cfg new file mode 100644 index 000000000..a557174d9 --- /dev/null +++ b/mackup/applications/maven.cfg @@ -0,0 +1,5 @@ +[application] +name = Maven + +[configuration_files] +.m2/settings.xml From 3589b71797be109d14bee549e4eda79fceb46b51 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 13:21:14 -0500 Subject: [PATCH 0213/1256] Added changeling + readme --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49134babd..31433a283 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ - Sublime Text 3 now only syncs essential files, excluding session and cache folders - Support for ProxyChains & ProxyChains NG (via @mttrb) - Support for Maven (via @jcgay) +- Improved support for Apple ColorSync (via @devnulled) ## Mackup 0.7.4 diff --git a/README.md b/README.md index 4bd256fd9..77d47c590 100644 --- a/README.md +++ b/README.md @@ -164,6 +164,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) + - [ColorSync](http://en.wikipedia.org/wiki/ColorSync) - [Composer](https://getcomposer.org/) - [Consular](http://www.rubydoc.info/github/achiu/consular/master/file/README.md) - [Concentrate](http://www.getconcentrating.com/) From fb63f91bb16a87a048cbd9bc8ee3d47774fc5db2 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 13:24:24 -0500 Subject: [PATCH 0214/1256] Add Python to the README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 77d47c590..e65b55e77 100644 --- a/README.md +++ b/README.md @@ -207,6 +207,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [IntelliJIDEA](http://www.jetbrains.com/idea/) - [Irssi](http://www.irssi.org/) - [iStat Menus 5](http://bjango.com/mac/istatmenus/) + - [IPython](http://ipython.org/) - [ITerm2](http://www.iterm2.com/) - [JSHint](http://www.jshint.com/) - [Janus](https://github.com/carlhuda/janus) From 2f089102ccb443fec948e7d09013502d310cf5db Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 13:28:37 -0500 Subject: [PATCH 0215/1256] Renamed i3wn to i3 --- README.md | 1 + mackup/applications/{i3wm.cfg => i3.cfg} | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) rename mackup/applications/{i3wm.cfg => i3.cfg} (86%) diff --git a/README.md b/README.md index 49fe773b2..369fa8aec 100644 --- a/README.md +++ b/README.md @@ -207,6 +207,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [i3wm](http://i3wm.org/) - [IntelliJIDEA](http://www.jetbrains.com/idea/) - [Irssi](http://www.irssi.org/) + - [i3](https://i3wm.org/) - [iStat Menus 5](http://bjango.com/mac/istatmenus/) - [IPython](http://ipython.org/) - [ITerm2](http://www.iterm2.com/) diff --git a/mackup/applications/i3wm.cfg b/mackup/applications/i3.cfg similarity index 86% rename from mackup/applications/i3wm.cfg rename to mackup/applications/i3.cfg index 6d9a15cc3..9317fc866 100644 --- a/mackup/applications/i3wm.cfg +++ b/mackup/applications/i3.cfg @@ -1,5 +1,5 @@ [application] -name=i3wm +name = i3 [configuration_files] .i3/config From ac01e057e830a47283273ab3bff5691618ffe6f5 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 13:34:17 -0500 Subject: [PATCH 0216/1256] Fixed Consular home in the README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 570e3f4a9..efe5e2d90 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Composer](https://getcomposer.org/) - [Concentrate](http://www.getconcentrating.com/) - [Conky](http://conky.sourceforge.net/) - - [Consular](http://www.rubydoc.info/github/achiu/consular/master/file/README.md) + - [Consular](https://github.com/achiu/consular) - [ControlPlane](http://www.controlplaneapp.com/) - [CoRD](http://cord.sourceforge.net/) - [Cyberduck](http://cyberduck.ch/) From 41a7c2e6bb3f5a1a9eea0929f015b175480fc1c4 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 13:47:51 -0500 Subject: [PATCH 0217/1256] Ignore WIP files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0d20b6487..4515c6755 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.pyc +/mackup.egg-info/ From 5b82836ab38f09d410d27f37c7c713ab0f57e7ad Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 14:00:45 -0500 Subject: [PATCH 0218/1256] Custom app config must take precedence over stock app config Fixed #374 and #389 --- mackup/appsdb.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/mackup/appsdb.py b/mackup/appsdb.py index 979a99d60..6d920a335 100644 --- a/mackup/appsdb.py +++ b/mackup/appsdb.py @@ -59,6 +59,9 @@ def get_config_files(): Mackup. The files return are absolute fullpath to those files. e.g. /usr/lib/mackup/applications/bash.cfg + Only one config file per application should be returned, custom config + having a priority over stock config. + Returns: set of strings. """ @@ -67,18 +70,28 @@ def get_config_files(): APPS_DIR) custom_apps_dir = os.path.join(os.environ['HOME'], CUSTOM_APPS_DIR) - # Build the list of stock application config files + # List of stock application config files config_files = set() - for filename in os.listdir(apps_dir): - if filename.endswith('.cfg'): - config_files.add(os.path.join(apps_dir, filename)) - # Append the list of custom application config files + # Temp list of user added app config filenames + custom_files = set() + + # 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)) + # 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) + + # 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: + config_files.add(os.path.join(apps_dir, filename)) + return config_files def get_name(self, name): From 0f19add18813a49098f33469d3ac1f892276d337 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 14:02:08 -0500 Subject: [PATCH 0219/1256] Added change --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8d363eb8..ce742b7cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ - Support for i3 (via @akash0x53) - Support for tint2 (via @mr-seiler) - Support for Conky (via @mr-seiler) +- Fix: Custom app config must take precedence over stock app config (thx @Gyran and @jalaziz) ## Mackup 0.7.4 From 57f712baa3d728057748afd0afcd78a12c00e95e Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 14:12:26 -0500 Subject: [PATCH 0220/1256] PR cleanup --- CHANGELOG.md | 2 +- README.md | 1 + mackup/applications/npm.cfg | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 570184c0e..5fc6fe109 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ - Support for Conky (via @mr-seiler) - Fix: Custom app config must take precedence over stock app config (thx @Gyran and @jalaziz) - Support for Ubersicht (via @kfinlay) +- Added support for npm (via @zheng1) ## Mackup 0.7.4 @@ -79,7 +80,6 @@ - Improved support for ExpanDrive (via @kfinlay) - Added support for Tower 2 (via @mAAdhaTTah) - Improved support for Textual (via @oalders) -- Added support for npm (via @zheng1) ## Mackup 0.7.3 diff --git a/README.md b/README.md index ab921dd1f..e442d9947 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. - [ncmpcpp](http://ncmpcpp.rybczak.net) - [newsbeuter](http://newsbeuter.org/) - [ngrok](https://ngrok.com/) + - [npm](https://www.npmjs.com/) - [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/npm.cfg b/mackup/applications/npm.cfg index 9ffde96c2..7235b2f3b 100644 --- a/mackup/applications/npm.cfg +++ b/mackup/applications/npm.cfg @@ -3,4 +3,3 @@ name = npm [configuration_files] .npmrc - From 5796225dd5a1e9f8c2f9f2b12a5dca26741de77f Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 14:15:49 -0500 Subject: [PATCH 0221/1256] Polished PR --- CHANGELOG.md | 2 +- README.md | 2 +- mackup/applications/azure.cfg | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11d0cf532..76a7ef77d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ - Fix: Custom app config must take precedence over stock app config (thx @Gyran and @jalaziz) - Support for Ubersicht (via @kfinlay) - Added support for npm (via @zheng1) +- Added support for Microsoft Azure CLI (via @zheng1) ## Mackup 0.7.4 @@ -80,7 +81,6 @@ - Improved support for ExpanDrive (via @kfinlay) - Added support for Tower 2 (via @mAAdhaTTah) - Improved support for Textual (via @oalders) -- Added support for Azure (via @zheng1) ## Mackup 0.7.3 diff --git a/README.md b/README.md index 2a49eef49..69f5978bf 100644 --- a/README.md +++ b/README.md @@ -142,7 +142,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [AusKey](https://abr.gov.au/AUSkey/) - [Awareness](http://iamfutureproof.com/tools/awareness/) - [AWS Command Line Interface](https://aws.amazon.com/cli/) - - [Microsoft Azure Command Line interface](https://github.com/Azure/azure-sdk-tools-xplat) + - [Microsoft Azure CLI](https://github.com/Azure/azure-xplat-cli) - [Bartender](http://www.macbartender.com/) - [Bash it](https://github.com/revans/bash-it/) - [Bash](http://www.gnu.org/software/bash/) diff --git a/mackup/applications/azure.cfg b/mackup/applications/azure.cfg index c00c4d6b0..602898785 100644 --- a/mackup/applications/azure.cfg +++ b/mackup/applications/azure.cfg @@ -3,4 +3,3 @@ name = Azure CLI [configuration_files] .azure - From ba64c95f986d99ffca508d86081798fd835e8bb6 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 14:31:29 -0500 Subject: [PATCH 0222/1256] Fix: Take into account apps specified in .mackup.cfg for the restore and uninstall operations --- CHANGELOG.md | 2 ++ mackup/main.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76a7ef77d..7d80d143e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,8 @@ - Support for Ubersicht (via @kfinlay) - Added support for npm (via @zheng1) - Added support for Microsoft Azure CLI (via @zheng1) +- Fix: Take into account apps specified in .mackup.cfg for the restore and + uninstall operations ## Mackup 0.7.4 diff --git a/mackup/main.py b/mackup/main.py index 33ddbd24d..0c6902408 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -51,7 +51,7 @@ def main(): # Check the env where the command is being run mckp.check_for_usable_restore_env() - for app_name in app_db.get_app_names(): + for app_name in mckp.get_apps_to_backup(): app = ApplicationProfile(mckp, app_db.get_files(app_name)) app.restore() @@ -64,7 +64,7 @@ def main(): " managed by Mackup will be unlinked and moved back" " to their original place, in your home folder.\n" "Are you sure ?"): - for app_name in app_db.get_app_names(): + for app_name in mckp.get_apps_to_backup(): app = ApplicationProfile(mckp, app_db.get_files(app_name)) app.uninstall() From 68c9f04693dc9c4f794b2f50271c81680e8878ea Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 14:31:40 -0500 Subject: [PATCH 0223/1256] Limit changeling to 80chars wide --- CHANGELOG.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d80d143e..efba66f10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,8 @@ ## WIP -- Limit .gem folder backup for Ruby, including credentials file only (via @ashchan) +- Limit .gem folder backup for Ruby, including credentials file only (via + @ashchan) - Support for PostgreSQL (via @bashu) - Support for consular (via @bashu) - Support for Punto Switcher (via @bashu) @@ -37,7 +38,8 @@ - Support for JuliaLang (via @danielsuo) - Support for OsX Stickies (via @djabbz) - Support for Navicat Database GUI tools (via @tdm00) -- Sublime Text 3 now only syncs essential files, excluding session and cache folders +- Sublime Text 3 now only syncs essential files, excluding session and cache + folders - Support for ProxyChains & ProxyChains NG (via @mttrb) - Support for Maven (via @jcgay) - Improved support for Apple ColorSync (via @devnulled) @@ -45,7 +47,8 @@ - Support for i3 (via @akash0x53) - Support for tint2 (via @mr-seiler) - Support for Conky (via @mr-seiler) -- Fix: Custom app config must take precedence over stock app config (thx @Gyran and @jalaziz) +- Fix: Custom app config must take precedence over stock app config (thx @Gyran + and @jalaziz) - Support for Ubersicht (via @kfinlay) - Added support for npm (via @zheng1) - Added support for Microsoft Azure CLI (via @zheng1) @@ -59,7 +62,8 @@ - Added support for JSHints .jshintrc - Improved support for Slate (via @bradcerasani) - Added support for nvpy - a Linux client for SimpleNote (via @hiyer) -- Atom now only syncs essential files, excluding compiled and cache folders (via @lmartins) +- Atom now only syncs essential files, excluding compiled and cache folders + (via @lmartins) - Support for Artistic Style (via @feigaochn) - Support for Tig (via @damiankloip) - Added bundle directory to vim config (via @alanlamielle) From bef3b140f0e9ddb373dff97664b1dcbdfbe0dbc8 Mon Sep 17 00:00:00 2001 From: Daniel Compton Date: Sun, 12 Oct 2014 22:02:01 +1300 Subject: [PATCH 0224/1256] Specify the full filepath getting backed up It would be more useful to see the full filepath being backed up including the home directory. This allows you to copy and paste the file into the Terminal to open or edit it, and in iTerm2 you can command click on a path to open it directly. --- mackup/application.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/application.py b/mackup/application.py index 40ac1e04f..dcecedc7d 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -56,7 +56,7 @@ def backup(self): or os.path.isdir(mackup_filepath)) and os.path.samefile(filepath, mackup_filepath))): - print "Backing up {}...".format(filename) + print "Backing up {} ...".format(filepath) # Check if we already have a backup if os.path.exists(mackup_filepath): From 906bd9fbd59a0554bb3db8acf0f4d0199bfa5a97 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 14:40:43 -0500 Subject: [PATCH 0225/1256] Let's be consistent in all modes --- CHANGELOG.md | 1 + mackup/application.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index efba66f10..5f37feefe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,6 +54,7 @@ - Added support for Microsoft Azure CLI (via @zheng1) - Fix: Take into account apps specified in .mackup.cfg for the restore and uninstall operations +- Improvement: More explicit file paths displayed (thx @danielcompton) ## Mackup 0.7.4 diff --git a/mackup/application.py b/mackup/application.py index dcecedc7d..2b0ca6746 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -124,7 +124,7 @@ def restore(self): home_filepath)) and utils.can_file_be_synced_on_current_platform(filename)): - print "Restoring {}...".format(filename) + print "Restoring {} ...".format(home_filepath) # Check if there is already a file in the home folder if os.path.exists(home_filepath): @@ -174,7 +174,7 @@ def uninstall(self): # Check if there is a corresponding file in the home folder if os.path.exists(home_filepath): - print "Moving {} back into your home...".format(filename) + print "Reverting {} ...".format(home_filepath) # If there is, delete it as we are gonna copy the Dropbox # one there utils.delete(home_filepath) From 1aa460f63d71ac1c4eaa3f96a4098551f9df7310 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 15:00:34 -0500 Subject: [PATCH 0226/1256] PEP8 compliance --- mackup/config.py | 6 ++++-- mackup/utils.py | 24 +++++++++++++++--------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/mackup/config.py b/mackup/config.py index 31390853d..bf745a50d 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -165,8 +165,10 @@ def _parse_engine(self): assert isinstance(engine, str) - if engine not in [ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_COPY, - ENGINE_FS]: + if engine not in [ENGINE_DROPBOX, + ENGINE_GDRIVE, + ENGINE_COPY, + ENGINE_FS]: raise ConfigError('Unknown storage engine: {}'.format(engine)) return str(engine) diff --git a/mackup/utils.py b/mackup/utils.py index f151201f4..686fae348 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -265,6 +265,7 @@ def get_google_drive_folder_location(): return googledrive_home + def get_copy_folder_location(): """ Try to locate the Copy folder @@ -280,15 +281,20 @@ def get_copy_folder_location(): if (os.path.isfile(copy_settings)): db = sqlite3.connect(copy_settings) if db: - c = db.cursor() - query = ("SELECT value " "FROM config2 " - "WHERE option = 'csmRootPath';") - c.execute(query) - data = c.fetchone() - copy_location = unicode(data[0]) - c.close() - - return copy_location + cur = db.cursor() + query = ("SELECT value " + "FROM config2 " + "WHERE option = 'csmRootPath';") + cur.execute(query) + data = cur.fetchone() + copy_home = unicode(data[0]) + cur.close() + + if not copy_home: + error("Unable to find your Google Drive install =(") + + return copy_home + def is_process_running(process_name): """ From 63827af12e2f9abf9033999010979ab83e026dae Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 15:08:06 -0500 Subject: [PATCH 0227/1256] Added the official .bash_login file --- mackup/applications/bash.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/bash.cfg b/mackup/applications/bash.cfg index cfac52d80..4ed38c5dc 100644 --- a/mackup/applications/bash.cfg +++ b/mackup/applications/bash.cfg @@ -4,6 +4,7 @@ name = Bash [configuration_files] .aliases .bash_aliases +.bash_login .bash_logout .bashrc .profile From 1c800bbb07a7de5853b158b6433c122bc1fe5bd1 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 15:08:44 -0500 Subject: [PATCH 0228/1256] Added change --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7f1af56e..3699cdccd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ - Support for Webstorm 8 (via @webpro) - Support for dig (via @glaszig) - Support for Copy sync engine (via @exiva) +- Improved bash support (via @pkyeck) ## Mackup 0.7.4 From c121816ef730f75f02b620d749e285ac36967619 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 15:12:12 -0500 Subject: [PATCH 0229/1256] More greetings (fixes #321) --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3699cdccd..baeabe4e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,7 +50,7 @@ - Fix: Custom app config must take precedence over stock app config (thx @Gyran and @jalaziz) - Support for Ubersicht (via @kfinlay) -- Added support for npm (via @zheng1) +- Added support for npm (via @zheng1 and @jaxgeller) - Added support for Microsoft Azure CLI (via @zheng1) - Fix: Take into account apps specified in .mackup.cfg for the restore and uninstall operations From 0a8a7979f1ec185fe9ba49f9e018bb9aef23913b Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 15:21:19 -0500 Subject: [PATCH 0230/1256] PEP8 --- mackup/config.py | 16 ++++++++-------- mackup/utils.py | 7 +++++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/mackup/config.py b/mackup/config.py index b1e271244..d6e590ca1 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -6,16 +6,16 @@ import os.path from .constants import (MACKUP_BACKUP_PATH, - MACKUP_CONFIG_FILE, - ENGINE_DROPBOX, - ENGINE_GDRIVE, - ENGINE_COPY, - ENGINE_FS) + MACKUP_CONFIG_FILE, + ENGINE_DROPBOX, + ENGINE_GDRIVE, + ENGINE_COPY, + ENGINE_FS) from .utils import (error, - get_dropbox_folder_location, - get_copy_folder_location, - get_google_drive_folder_location) + get_dropbox_folder_location, + get_copy_folder_location, + get_google_drive_folder_location) try: import configparser except ImportError: diff --git a/mackup/utils.py b/mackup/utils.py index 40cc06512..a3f106a92 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -24,8 +24,11 @@ def confirm(question): """ while True: # Python 3 hack - try: input = raw_input - except NameError: pass + try: + input = raw_input + except NameError: + pass + answer = input(question + ' ').lower() if answer == 'yes' or answer == 'y': confirmed = True From b2e75a593b83ceaf3a7b8dd104142ac7c8ec6a28 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 15:22:25 -0500 Subject: [PATCH 0231/1256] Added change --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index baeabe4e0..b8a748ac7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,6 +59,7 @@ - Support for dig (via @glaszig) - Support for Copy sync engine (via @exiva) - Improved bash support (via @pkyeck) +- Improved Python 3 support (via @dannluciano) ## Mackup 0.7.4 From 66067eea48c42a0be8a8fac780a55234552c4ef9 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 16:07:13 -0500 Subject: [PATCH 0232/1256] added VLC (by @kiliankoe) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/vlc.cfg | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 mackup/applications/vlc.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b8a748ac7..9f24ec6a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -60,6 +60,7 @@ - Support for Copy sync engine (via @exiva) - Improved bash support (via @pkyeck) - Improved Python 3 support (via @dannluciano) +- Added support for VLC (via @kiliankoe) ## Mackup 0.7.4 diff --git a/README.md b/README.md index 8fff78750..5b3c16e3f 100644 --- a/README.md +++ b/README.md @@ -340,6 +340,7 @@ 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/) + - [VLC](http://www.videolan.org/) - [WebStorm](https://www.jetbrains.com/webstorm/) - [Wget](https://www.gnu.org/software/wget/) - [Witch](http://manytricks.com/witch/) diff --git a/mackup/applications/vlc.cfg b/mackup/applications/vlc.cfg new file mode 100644 index 000000000..c4ae814fd --- /dev/null +++ b/mackup/applications/vlc.cfg @@ -0,0 +1,8 @@ +[application] +name = VLC + +[configuration_files] +Library/Application Support/org.videolan.vlc +Library/Preferences/org.videolan.vlc +Library/Preferences/org.videolan.vlc.LSSharedFileList.plist +Library/Preferences/org.videolan.vlc.plist From b2ac85b26d2970fd8df40389b0c0955af60e169f Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 16:10:07 -0500 Subject: [PATCH 0233/1256] Merge appcode 2 & 3 in the app list --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 8c2302044..76f6753a5 100644 --- a/README.md +++ b/README.md @@ -133,8 +133,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adium](http://adium.im/) - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - [Adobe Lightroom](http://www.adobe.com/products/photoshop-lightroom.html) - - [AppCode 2](http://www.jetbrains.com/objc/) - - [AppCode 3](http://www.jetbrains.com/objc/) + - [AppCode](http://www.jetbrains.com/objc/) - [aria2c](http://aria2.sourceforge.net/) - [Arara](http://cereda.github.io/arara/) - [Artistic Style](http://astyle.sourceforge.net) From 9b03af8c0e0795eb70dbea9654c846130fd3ce89 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 16:17:33 -0500 Subject: [PATCH 0234/1256] Add changeling --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1eed8f0c8..48223ec71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -64,6 +64,7 @@ - Added doc, ftdetect, ftplugin, indent, syntax directories to vim config (via @feigaochn) - Added support of AppCode 3 (via @turygo and @dsiu) +- Feature: Display error messages in red (via @Timidger) ## Mackup 0.7.4 From 48b4cc711109e792efe7b5aa7cad35baea024614 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 16:26:19 -0500 Subject: [PATCH 0235/1256] Makeup 0.8 release --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48223ec71..a75a894c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8 + - Limit .gem folder backup for Ruby, including credentials file only (via @ashchan) - Support for PostgreSQL (via @bashu) diff --git a/mackup/constants.py b/mackup/constants.py index ff33713a4..11e1ad60d 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup""" # Current version -VERSION = '0.7.4' +VERSION = '0.8' # Mode used to list supported applications LIST_MODE = 'list' From 7a288d8e2d0a10308282c0a1500b1a1ee058224c Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 16:28:33 -0500 Subject: [PATCH 0236/1256] Ignore build folder --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 4515c6755..bb5ee26d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.pyc /mackup.egg-info/ +/dist/ From 3a31db1e8edb10e72e9bc4842cc7ed43503d5ef3 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 20:34:12 -0500 Subject: [PATCH 0237/1256] Whitespace --- mackup/application.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/mackup/application.py b/mackup/application.py index 70ff13db2..6faddce73 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -42,7 +42,6 @@ def backup(self): mv home/file mackup/file link mackup/file home/file """ - # For each file used by the application for filename in self.files: # Get the full path of each file @@ -107,7 +106,6 @@ def restore(self): else link mackup/file home/file """ - # For each file used by the application for filename in self.files: # Get the full path of each file From 691ca2009ae0c2be91553b948b52485172c49f8c Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 20:44:46 -0500 Subject: [PATCH 0238/1256] Prioritize the Mackup config over other apps --- mackup/constants.py | 3 +++ mackup/main.py | 26 ++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/mackup/constants.py b/mackup/constants.py index 11e1ad60d..1c8e38ca3 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -21,6 +21,9 @@ # Directory containing the application configs APPS_DIR = 'applications' +# Mackup application name +MACKUP_APP_NAME = 'mackup' + # Default Mackup backup path where it stores its files in Dropbox MACKUP_BACKUP_PATH = 'Mackup' diff --git a/mackup/main.py b/mackup/main.py index 02eb54136..3436bfb49 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -24,7 +24,8 @@ RESTORE_MODE, UNINSTALL_MODE, LIST_MODE, - VERSION) + VERSION, + MACKUP_APP_NAME) from .mackup import Mackup from . import utils @@ -51,7 +52,17 @@ def main(): # Check the env where the command is being run mckp.check_for_usable_restore_env() - for app_name in mckp.get_apps_to_backup(): + # 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)) + mackup_app.restore() + + # Restore the rest of the app configs, using the restored Mackup config + app_names = mckp.get_apps_to_backup() + # Mackup has already been done + app_names.remove(MACKUP_APP_NAME) + for app_name in app_names: app = ApplicationProfile(mckp, app_db.get_files(app_name)) app.restore() @@ -64,10 +75,21 @@ def main(): " 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 + app_names = mckp.get_apps_to_backup() + app_names.remove(MACKUP_APP_NAME) for app_name in mckp.get_apps_to_backup(): app = ApplicationProfile(mckp, app_db.get_files(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)) + mackup_app.uninstall() + # Delete the Mackup folder in Dropbox # Don't delete this as there might be other Macs that aren't # uninstalled yet From f71140d26475a4dbded1e14239f27373b5d12832 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 20:57:39 -0500 Subject: [PATCH 0239/1256] Initialize again the apps db, as the Mackup config might have changed it --- mackup/main.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mackup/main.py b/mackup/main.py index 3436bfb49..9fe399934 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -58,10 +58,16 @@ def main(): app_db.get_files(MACKUP_APP_NAME)) mackup_app.restore() + # Initialize again the apps db, as the Mackup config might have changed + # it + mckp = Mackup() + app_db = ApplicationsDatabase() + # Restore the rest of the app configs, using the restored Mackup config app_names = mckp.get_apps_to_backup() # Mackup has already been done app_names.remove(MACKUP_APP_NAME) + for app_name in app_names: app = ApplicationProfile(mckp, app_db.get_files(app_name)) app.restore() From 35a4cece0ce7f3ced972ce5e78a01bcdc05b70a1 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 21:09:30 -0500 Subject: [PATCH 0240/1256] PEP8! --- mackup/application.py | 18 +++++++++--------- mackup/utils.py | 8 ++++---- setup.py | 3 ++- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/mackup/application.py b/mackup/application.py index 6faddce73..2601fa2f5 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -115,13 +115,14 @@ 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) - if ((os.path.isfile(mackup_filepath) - or os.path.isdir(mackup_filepath)) - and not (os.path.islink(home_filepath) - and os.path.samefile(mackup_filepath, - home_filepath)) - and utils.can_file_be_synced_on_current_platform(filename)): - + 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.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: print("Restoring {} ...".format(home_filepath)) # Check if there is already a file in the home folder @@ -168,8 +169,7 @@ def uninstall(self): # If the mackup file exists if (os.path.isfile(mackup_filepath) - or os.path.isdir(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): print("Reverting {} ...".format(home_filepath)) diff --git a/mackup/utils.py b/mackup/utils.py index 7c9c5d62e..e546db605 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -338,10 +338,10 @@ def remove_acl(path): """ # Some files have ACLs, let's remove them recursively if (platform.system() == constants.PLATFORM_DARWIN - and os.path.isfile('/bin/chmod')): + 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')): + and os.path.isfile('/bin/setfacl')): subprocess.call(['/bin/setfacl', '-R', '-b', path]) @@ -357,10 +357,10 @@ def remove_immutable_attribute(path): """ # Some files have ACLs, let's remove them recursively if ((platform.system() == constants.PLATFORM_DARWIN) - and os.path.isfile('/usr/bin/chflags')): + 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')): + and os.path.isfile('/usr/bin/chattr')): subprocess.call(['/usr/bin/chattr', '-R', '-i', path]) diff --git a/setup.py b/setup.py index 4b5703393..30cf5fee0 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,8 @@ 'Development Status :: 4 - Beta', 'Environment :: Console', 'Intended Audience :: End Users/Desktop', - 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', + ('License :: OSI Approved :: ' + 'GNU General Public License v3 or later (GPLv3+)'), 'Natural Language :: English', 'Operating System :: POSIX', 'Programming Language :: Python', From a7c0cdd4461fb2b539f74cf849021b5c9cfcb16f Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 25 Jan 2015 21:12:04 -0500 Subject: [PATCH 0241/1256] Mackup 0.8.1 --- CHANGELOG.md | 6 ++++++ mackup/constants.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a75a894c5..c12b3b1e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## WIP +## Mackup 0.8.1 + +- Fix: Restore and uninstall the Mackup config before any other application + config +- PEP8 compliance + ## Mackup 0.8 - Limit .gem folder backup for Ruby, including credentials file only (via diff --git a/mackup/constants.py b/mackup/constants.py index 1c8e38ca3..c57299b24 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup""" # Current version -VERSION = '0.8' +VERSION = '0.8.1' # Mode used to list supported applications LIST_MODE = 'list' From 0c0ce4eb5b0638ffe0b42e9a5fe329bc3de9ccd0 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 26 Jan 2015 18:33:14 -0500 Subject: [PATCH 0242/1256] Fix: Users with a list of apps to sync were getting an error on restore or uninstall Fixes #445 --- CHANGELOG.md | 5 +++++ mackup/constants.py | 2 +- mackup/main.py | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c12b3b1e1..5be32dea7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## WIP +## Mackup 0.8.2 + +- Fix: Users with a list of apps to sync were getting an error on restore or + uninstall + ## Mackup 0.8.1 - Fix: Restore and uninstall the Mackup config before any other application diff --git a/mackup/constants.py b/mackup/constants.py index c57299b24..0574473d9 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup""" # Current version -VERSION = '0.8.1' +VERSION = '0.8.2' # Mode used to list supported applications LIST_MODE = 'list' diff --git a/mackup/main.py b/mackup/main.py index 9fe399934..6102d40bf 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -66,7 +66,7 @@ def main(): # Restore the rest of the app configs, using the restored Mackup config app_names = mckp.get_apps_to_backup() # Mackup has already been done - app_names.remove(MACKUP_APP_NAME) + app_names.discard(MACKUP_APP_NAME) for app_name in app_names: app = ApplicationProfile(mckp, app_db.get_files(app_name)) @@ -85,7 +85,7 @@ def main(): # 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() - app_names.remove(MACKUP_APP_NAME) + app_names.discard(MACKUP_APP_NAME) for app_name in mckp.get_apps_to_backup(): app = ApplicationProfile(mckp, app_db.get_files(app_name)) app.uninstall() From de9b678d901e430ca5a70d00d048b9943dcc929c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= Date: Mon, 26 Jan 2015 23:50:39 +0000 Subject: [PATCH 0243/1256] messages.cfg: remove scripts dir Closes #444. --- mackup/applications/messages.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/mackup/applications/messages.cfg b/mackup/applications/messages.cfg index 5235947e7..31b7c3f50 100644 --- a/mackup/applications/messages.cfg +++ b/mackup/applications/messages.cfg @@ -2,7 +2,6 @@ name = Messages [configuration_files] -Library/Application Scripts/com.apple.iChat Library/Preferences/com.apple.iChat.AIM.plist Library/Preferences/com.apple.iChat.Jabber.plist Library/Preferences/com.apple.iChat.StatusMessages.plist From 13c192b42c129e307b3b3fb3717e2652bffdb460 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 26 Jan 2015 19:09:36 -0500 Subject: [PATCH 0244/1256] Add changes --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5be32dea7..d85cb9555 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Remove the scripts dir from Messages syncing (@vitorgalvao) + ## Mackup 0.8.2 - Fix: Users with a list of apps to sync were getting an error on restore or From 1eca4f25ed8050fcda2f917125d9915589d83982 Mon Sep 17 00:00:00 2001 From: Wan Yi Date: Tue, 27 Jan 2015 08:47:27 +0800 Subject: [PATCH 0245/1256] add support for AppCode 3.1 --- mackup/applications/appcode-31.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/appcode-31.cfg diff --git a/mackup/applications/appcode-31.cfg b/mackup/applications/appcode-31.cfg new file mode 100644 index 000000000..caf2c4989 --- /dev/null +++ b/mackup/applications/appcode-31.cfg @@ -0,0 +1,6 @@ +[application] +name = AppCode 3.1 + +[configuration_files] +Library/Application Support/appCode31 +Library/Preferences/appCode31 \ No newline at end of file From 78c1365122d3f6d376ca359b7b0381c41a9e5930 Mon Sep 17 00:00:00 2001 From: Wan Yi Date: Tue, 27 Jan 2015 08:52:32 +0800 Subject: [PATCH 0246/1256] add changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d85cb9555..c18c697e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ - Fix: Users with a list of apps to sync were getting an error on restore or uninstall +- Added support of AppCode 3.1 (via @morphinewan) + ## Mackup 0.8.1 From f95f64ab1672df040398c4dbd7061515901b911e Mon Sep 17 00:00:00 2001 From: Wan Yi Date: Tue, 27 Jan 2015 08:55:08 +0800 Subject: [PATCH 0247/1256] fixed changelog miss --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c18c697e8..3ba4b769a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,12 +3,12 @@ ## WIP - Remove the scripts dir from Messages syncing (@vitorgalvao) +- Added support of AppCode 3.1 (via @morphinewan) ## Mackup 0.8.2 - Fix: Users with a list of apps to sync were getting an error on restore or uninstall -- Added support of AppCode 3.1 (via @morphinewan) ## Mackup 0.8.1 From ed493682067644f672ab4fd354a00c0f0d2f3608 Mon Sep 17 00:00:00 2001 From: Wan Yi Date: Tue, 27 Jan 2015 09:51:54 +0800 Subject: [PATCH 0248/1256] fix for newline --- mackup/applications/appcode-31.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/appcode-31.cfg b/mackup/applications/appcode-31.cfg index caf2c4989..0860ccc67 100644 --- a/mackup/applications/appcode-31.cfg +++ b/mackup/applications/appcode-31.cfg @@ -3,4 +3,4 @@ name = AppCode 3.1 [configuration_files] Library/Application Support/appCode31 -Library/Preferences/appCode31 \ No newline at end of file +Library/Preferences/appCode31 From c2514ecbcb51c9615eae845922d3628833a76470 Mon Sep 17 00:00:00 2001 From: Wan Yi Date: Tue, 27 Jan 2015 09:56:33 +0800 Subject: [PATCH 0249/1256] delete an unnecessary newline --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ba4b769a..c1a80c0a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,6 @@ - Fix: Users with a list of apps to sync were getting an error on restore or uninstall - ## Mackup 0.8.1 - Fix: Restore and uninstall the Mackup config before any other application From 89105b43cacdf2d36c95f893f4b8338195149987 Mon Sep 17 00:00:00 2001 From: Wan Yi Date: Tue, 27 Jan 2015 09:57:11 +0800 Subject: [PATCH 0250/1256] add an newline character --- mackup/applications/appcode-31.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/appcode-31.cfg b/mackup/applications/appcode-31.cfg index caf2c4989..0860ccc67 100644 --- a/mackup/applications/appcode-31.cfg +++ b/mackup/applications/appcode-31.cfg @@ -3,4 +3,4 @@ name = AppCode 3.1 [configuration_files] Library/Application Support/appCode31 -Library/Preferences/appCode31 \ No newline at end of file +Library/Preferences/appCode31 From b7c3ed973c435a252540757390459f6cce92ca50 Mon Sep 17 00:00:00 2001 From: Esteban Date: Tue, 27 Jan 2015 10:28:53 -0300 Subject: [PATCH 0251/1256] KeePassX support --- mackup/applications/keepassx.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/keepassx.cfg diff --git a/mackup/applications/keepassx.cfg b/mackup/applications/keepassx.cfg new file mode 100644 index 000000000..413da10a6 --- /dev/null +++ b/mackup/applications/keepassx.cfg @@ -0,0 +1,5 @@ +[application] +name = KeePassX + +[configuration_files] +.keepassx From adc1e9c564482d19b72d058c472500a8881f1e87 Mon Sep 17 00:00:00 2001 From: Esteban Date: Tue, 27 Jan 2015 19:11:31 -0300 Subject: [PATCH 0252/1256] KeePassX support --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1a80c0a5..5ee51f799 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Remove the scripts dir from Messages syncing (@vitorgalvao) - Added support of AppCode 3.1 (via @morphinewan) +- Added support for KeePassX (via @TCattd) ## Mackup 0.8.2 diff --git a/README.md b/README.md index 76f6753a5..513b1d596 100644 --- a/README.md +++ b/README.md @@ -221,6 +221,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Julia](http://julialang.org) - [Kaleidoscope](http://www.kaleidoscopeapp.com/) - [Karabiner](https://pqrs.org/osx/karabiner) + - [KeePassX](http://www.keepassx.org/) - [Keka](http://kekaosx.com/) - [Keybase](https://keybase.io/) - [Keymo](http://manytricks.com/keymo/) From 4b961f893f0f0b8c6563d1bceb317b5a15f11b96 Mon Sep 17 00:00:00 2001 From: Damian Lee Date: Fri, 30 Jan 2015 11:11:34 +0000 Subject: [PATCH 0253/1256] Remove the packages folder from atom integration --- mackup/applications/atom.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/mackup/applications/atom.cfg b/mackup/applications/atom.cfg index 4d6043fb9..43cd0dcf3 100644 --- a/mackup/applications/atom.cfg +++ b/mackup/applications/atom.cfg @@ -8,6 +8,5 @@ Library/Preferences/com.github.atom.plist .atom/init.coffee .atom/keymap.cson .atom/keymaps -.atom/packages .atom/snippets.cson .atom/styles.less From da63f2794555f2b3c639e48bffe78a660835f94a Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Fri, 30 Jan 2015 14:21:50 -0500 Subject: [PATCH 0254/1256] Add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ee51f799..969909a4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Remove the scripts dir from Messages syncing (@vitorgalvao) - Added support of AppCode 3.1 (via @morphinewan) - Added support for KeePassX (via @TCattd) +- Fix support for the Atom editor (via @damiankloip) ## Mackup 0.8.2 From af28c3c15479d2d91f3375030beae2c12b3561a8 Mon Sep 17 00:00:00 2001 From: Adam Clark Date: Sat, 31 Jan 2015 10:54:49 -0800 Subject: [PATCH 0255/1256] adding defaultkeybinding --- mackup/applications/defaultkeybinding.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/defaultkeybinding.cfg diff --git a/mackup/applications/defaultkeybinding.cfg b/mackup/applications/defaultkeybinding.cfg new file mode 100644 index 000000000..294c2e7db --- /dev/null +++ b/mackup/applications/defaultkeybinding.cfg @@ -0,0 +1,5 @@ +[application] +name = DefaultKeyBinding + +[configuration_files] +Library/KeyBindings/DefaultKeyBinding.dict From c2053e1b013cfa640aca210d12270d515897682b Mon Sep 17 00:00:00 2001 From: Adam Clark Date: Sat, 31 Jan 2015 10:58:40 -0800 Subject: [PATCH 0256/1256] updating docs --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 969909a4f..62376e976 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Remove the scripts dir from Messages syncing (@vitorgalvao) - Added support of AppCode 3.1 (via @morphinewan) - Added support for KeePassX (via @TCattd) +- Added support for DefaultKeyBinding (via @adamclerk) - Fix support for the Atom editor (via @damiankloip) ## Mackup 0.8.2 diff --git a/README.md b/README.md index 513b1d596..41c74089e 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. - [Dash](http://kapeli.com/dash) - [Deal Alert](http://dealalertapp.com/) - [Default Folder X](http://www.stclairsoft.com/DefaultFolderX/) + - [DefaultKeyBinding](http://apple.stackexchange.com/questions/16135/remap-home-and-end-to-beginning-and-end-of-line) - [dig](http://en.wikipedia.org/wiki/Dig_(command)) - [Divvy](http://mizage.com/divvy/) - [Dolphin](https://dolphin-emu.org/) From 9c0e9114aeffb31fce34a8448fec0956f5f6fafb Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 31 Jan 2015 17:13:27 -0500 Subject: [PATCH 0257/1256] Moved the config into macosx --- CHANGELOG.md | 2 +- README.md | 1 - mackup/applications/macosx.cfg | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62376e976..9dce47564 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ - Remove the scripts dir from Messages syncing (@vitorgalvao) - Added support of AppCode 3.1 (via @morphinewan) - Added support for KeePassX (via @TCattd) -- Added support for DefaultKeyBinding (via @adamclerk) +- Added support for DefaultKeyBinding in OSX (via @adamclerk and @kfinlay) - Fix support for the Atom editor (via @damiankloip) ## Mackup 0.8.2 diff --git a/README.md b/README.md index 41c74089e..513b1d596 100644 --- a/README.md +++ b/README.md @@ -177,7 +177,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Dash](http://kapeli.com/dash) - [Deal Alert](http://dealalertapp.com/) - [Default Folder X](http://www.stclairsoft.com/DefaultFolderX/) - - [DefaultKeyBinding](http://apple.stackexchange.com/questions/16135/remap-home-and-end-to-beginning-and-end-of-line) - [dig](http://en.wikipedia.org/wiki/Dig_(command)) - [Divvy](http://mizage.com/divvy/) - [Dolphin](https://dolphin-emu.org/) diff --git a/mackup/applications/macosx.cfg b/mackup/applications/macosx.cfg index 529580e55..06b2826e8 100644 --- a/mackup/applications/macosx.cfg +++ b/mackup/applications/macosx.cfg @@ -3,3 +3,4 @@ name = MacOSX [configuration_files] .MacOSX +Library/KeyBindings/DefaultKeyBinding.dict From b6dc32f998fb5c2f07411068590eef805d25804f Mon Sep 17 00:00:00 2001 From: Timidger Date: Wed, 4 Feb 2015 11:28:33 -0500 Subject: [PATCH 0258/1256] Added test when there is no config file, which should do the same thing if there is an empty mackup.cfg --- tests/config_tests.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/config_tests.py b/tests/config_tests.py index 9f99e5b0e..bf8ea6359 100644 --- a/tests/config_tests.py +++ b/tests/config_tests.py @@ -13,6 +13,12 @@ def setUp(self): realpath = os.path.dirname(os.path.realpath(__file__)) os.environ['HOME'] = os.path.join(realpath, 'fixtures') + def test_config_no_config(self): + cfg = Config() + + # Should should do the same as the default, empty configuration + self.test_config_empty() + def test_config_empty(self): cfg = Config('mackup-empty.cfg') From 6b355d327128ada8790b323ab65b62aa7a0c0f9c Mon Sep 17 00:00:00 2001 From: Timidger Date: Wed, 4 Feb 2015 11:28:59 -0500 Subject: [PATCH 0259/1256] Added test for a config file with old configuration options, which should throw a SystemExit Exception --- tests/config_tests.py | 3 +++ tests/fixtures/mackup-old-config.cfg | 15 +++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 tests/fixtures/mackup-old-config.cfg diff --git a/tests/config_tests.py b/tests/config_tests.py index bf8ea6359..cddfd27cd 100644 --- a/tests/config_tests.py +++ b/tests/config_tests.py @@ -184,3 +184,6 @@ def test_config_apps_to_ignore_and_sync(self): 'sublime-text-3', 'x11', 'vim']) + + def test_config_old_config(self): + self.assertRaises(SystemExit, Config, 'mackup-old-config.cfg') diff --git a/tests/fixtures/mackup-old-config.cfg b/tests/fixtures/mackup-old-config.cfg new file mode 100644 index 000000000..87de8c5c6 --- /dev/null +++ b/tests/fixtures/mackup-old-config.cfg @@ -0,0 +1,15 @@ +[storage] +engine = file_system +path = /some/absolute/folder +directory = custom_folder + +[applications_to_ignore] +subversion +sequel-pro + +[Allowed Applications] +ssh +git + +[Ignored Applications] +vim From 11775bdd6298ee164413c79fd2ef5a4f444a6f34 Mon Sep 17 00:00:00 2001 From: Timidger Date: Wed, 4 Feb 2015 12:41:57 -0500 Subject: [PATCH 0260/1256] Changed test_copy_dir to test_copy_file_to_dir to be more precise about what we are doing (copying a source file to a source directior). Also added a doc string to explain this --- tests/utils_test.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/utils_test.py b/tests/utils_test.py index f66248010..ed6790539 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -130,7 +130,10 @@ def test_copy_fail(self): utils.delete(srcfile) utils.delete(dstpath) - def test_copy_dir(self): + def test_copy_file_to_dir(self): + """ + Copies a file to a destination folder that already exists + """ # Create a tmp folder srcpath = tempfile.mkdtemp() From 48282f17dad3c2144367d58c45db19bbeda72071 Mon Sep 17 00:00:00 2001 From: Timidger Date: Wed, 4 Feb 2015 12:42:39 -0500 Subject: [PATCH 0261/1256] Added test_copy_dir, which tests recursively copying a directory to the given path --- tests/utils_test.py | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/tests/utils_test.py b/tests/utils_test.py index ed6790539..a060b4a3f 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -169,6 +169,44 @@ def test_copy_file_to_dir(self): utils.delete(srcpath) utils.delete(dstpath) + def test_copy_dir(self): + """ + Copies a directory recursively to the destination path + """ + # Create a tmp folder + srcpath = tempfile.mkdtemp() + + # Create a tmp file + tf = tempfile.NamedTemporaryFile(delete=False, dir=srcpath) + srcfile = tf.name + tf.close() + + # Create a tmp folder + dstpath = tempfile.mkdtemp() + + # Set the destination filename + srcpath_basename = os.path.basename(srcpath) + 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) + assert os.path.isfile(srcfile) + assert os.path.isdir(dstpath) + assert not os.path.exists(dstfile) + + # Check if mackup can copy it + utils.copy(srcpath, dstfile) + assert os.path.isdir(srcpath) + assert os.path.isfile(srcfile) + assert os.path.isdir(dstpath) + assert os.path.exists(dstfile) + + # Let's clean up + utils.delete(srcpath) + utils.delete(dstpath) + def test_link_file(self): # Create a tmp file tf = tempfile.NamedTemporaryFile(delete=False) From 7845cd9a2e36b7f700a14b732fb1dce2f69a7f40 Mon Sep 17 00:00:00 2001 From: Timidger Date: Wed, 4 Feb 2015 13:57:04 -0500 Subject: [PATCH 0262/1256] Added chmod tests --- tests/utils_test.py | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/tests/utils_test.py b/tests/utils_test.py index a060b4a3f..92d6844b4 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -7,6 +7,12 @@ from mackup import utils +def convert_to_octal(file_name): + """ + Using os.stat, returns file permissions (read, write, execute) as an octal + """ + return oct(os.stat(file_name)[stat.ST_MODE])[-3:] + class TestMackup(unittest.TestCase): @@ -233,3 +239,39 @@ def test_link_file(self): # Let's clean up utils.delete(dstpath) + + def test_chmod_file(self): + # Create a tmp file + tf = tempfile.NamedTemporaryFile(delete=False) + file_name = tf.name + + # Create a tmp directory with a sub folder + dir_name = tempfile.mkdtemp() + nested_dir = tempfile.mkdtemp(dir=dir_name) + + ## File Tests + + # Change the tmp file stats to S_IWRITE (200), write access only + os.chmod(file_name, stat.S_IWRITE) + convert_to_octal(file_name) == "200" + + # Check to make sure that utils.chmod changes the bits to 600, + # which is read and write access for the owner + utils.chmod(file_name) + convert_to_octal(file_name) == "600" + + ## Directory Tests + + # Change the tmp folder stats to S_IREAD (400), read access only + os.chmod(dir_name, stat.S_IREAD) + convert_to_octal(dir_name) == "400" + + # Check to make sure that utils.chmod changes the bits of all directories + # to 700, which is read, write, and execute access for the owner + utils.chmod(dir_name) + convert_to_octal(dir_name) == "700" + convert_to_octal(nested_dir) == "700" + + # Use an "unsupported file type". In this case, /dev/null + assert os.path.exists("/dev/null") + self.assertRaises(ValueError, utils.chmod, "/dev/null") From 53f8580803146e80d73a68df292e028c1f8ae233 Mon Sep 17 00:00:00 2001 From: Timidger Date: Wed, 4 Feb 2015 13:57:30 -0500 Subject: [PATCH 0263/1256] Added error string test (not that it tests much) --- tests/utils_test.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/utils_test.py b/tests/utils_test.py index 92d6844b4..ec1e0aae4 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -275,3 +275,9 @@ def test_chmod_file(self): # Use an "unsupported file type". In this case, /dev/null assert os.path.exists("/dev/null") self.assertRaises(ValueError, utils.chmod, "/dev/null") + + def test_error(self): + test_string = "Hello World" + self.assertRaises(SystemExit, + utils.error, + test_string) From 42ffc2bab9f1a0fd69bf742182229fbd17394e5b Mon Sep 17 00:00:00 2001 From: Timidger Date: Wed, 4 Feb 2015 17:27:11 -0500 Subject: [PATCH 0264/1256] Copied the test code from test_config_empty into test_config_no_config. Before, the configuration file was being overridden by calling the other function. --- tests/config_tests.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tests/config_tests.py b/tests/config_tests.py index cddfd27cd..4a3f0b9af 100644 --- a/tests/config_tests.py +++ b/tests/config_tests.py @@ -17,7 +17,20 @@ def test_config_no_config(self): cfg = Config() # Should should do the same as the default, empty configuration - self.test_config_empty() + assert isinstance(cfg.engine, str) + assert cfg.engine == ENGINE_DROPBOX + + assert isinstance(cfg.path, str) + assert cfg.path == u'/home/some_user/Dropbox' + + assert isinstance(cfg.directory, str) + assert cfg.directory == u'Mackup' + + assert isinstance(cfg.fullpath, str) + 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') From 8559328a0bbbe85cdc3b33833adf7497db7cc066 Mon Sep 17 00:00:00 2001 From: Timidger Date: Wed, 4 Feb 2015 17:31:49 -0500 Subject: [PATCH 0265/1256] Added test_failed_backup_location, which tests that a missing backup folder calls error (thereby raising a SystemExit) --- tests/utils_test.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/tests/utils_test.py b/tests/utils_test.py index ec1e0aae4..73e043bb0 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -281,3 +281,26 @@ def test_error(self): self.assertRaises(SystemExit, utils.error, test_string) + + 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 + """ + # Hack to make our home folder some temporary folder + temp_home = tempfile.mkdtemp() + 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")) + 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) From 10b3775b92272be7cda23cb4a5161f4c78a32943 Mon Sep 17 00:00:00 2001 From: Timidger Date: Wed, 4 Feb 2015 17:32:57 -0500 Subject: [PATCH 0266/1256] Added test_is_process_running to utils_test module --- tests/utils_test.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/utils_test.py b/tests/utils_test.py index 73e043bb0..d65f517b2 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -304,3 +304,8 @@ def test_failed_backup_location(self): 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*") + assert not utils.is_process_running("some imaginary process") From 610a36cddecaf9a35841bcf748d1b5ec435c1d19 Mon Sep 17 00:00:00 2001 From: Timidger Date: Wed, 4 Feb 2015 19:34:10 -0500 Subject: [PATCH 0267/1256] Added test_can_file_be_synced_on_current_platform to utils_test module --- tests/utils_test.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/utils_test.py b/tests/utils_test.py index d65f517b2..f33b0ec62 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -309,3 +309,20 @@ 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*") assert not utils.is_process_running("some imaginary process") + + def test_can_file_be_synced_on_current_platform(self): + # Any file path will do, even if it doesn't exist + path = "some/file" + + # Force the Mac OSX Test using lambda magic + utils.system = lambda _: utils.constants.PLATFORM_DARWIN + assert utils.can_file_be_synced_on_current_platform(path) + + # Force the Linux Test using lambda magic + utils.system = lambda _: utils.constants.PLATFORM_LINUX + assert utils.can_file_be_synced_on_current_platform(path) + + # Try to use the library path on Linux, which shouldn't work + path = os.path.join(os.environ["HOME"], "Library/") + print(path) + assert not utils.can_file_be_synced_on_current_platform(path) From 0ac33d5e4e9407b22188021305e62644988a9f18 Mon Sep 17 00:00:00 2001 From: Timidger Date: Wed, 4 Feb 2015 21:00:39 -0500 Subject: [PATCH 0268/1256] Added test_parse_cmdline_args to utils_test module --- tests/utils_test.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/utils_test.py b/tests/utils_test.py index f33b0ec62..7b3f99733 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -30,6 +30,13 @@ def custom_raw_input(_): utils.raw_input = custom_raw_input assert not utils.confirm('Answer No to this question') + def test_confirm_python3(self): + # Override the raw_input used in utils + def custom_raw_input(_): + raise NameError + # Also override input used in utils, because + utils.raw_input = custom_raw_input + def test_confirm_typo(self): # Override the raw_input used in utils def custom_raw_input(_): @@ -282,6 +289,21 @@ def test_error(self): utils.error, test_string) + def test_parse_cmdline_args(self): + modes = [utils.constants.BACKUP_MODE, + utils.constants.RESTORE_MODE, + utils.constants.UNINSTALL_MODE, + utils.constants.LIST_MODE] + + for mode in modes: + # Change the command line arguments to contain the correct mode + utils.sys.argv = ["the_program", mode] + assert str(utils.parse_cmdline_args()) == "Namespace(mode='%s')" %mode + + # Change the command line arguments to have an incorrect mode + utils.sys.argv = ["the_program", "some wrong mode"] + self.assertRaises(SystemExit, utils.parse_cmdline_args) + def test_failed_backup_location(self): """ Tests for the error that should occur if the backup folder cannot be found From b3ba2efd7c2a0d11b3dbfb9e522c1890e93ebd0a Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 6 Feb 2015 18:15:10 +0100 Subject: [PATCH 0269/1256] Add HexChat support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/hexchat.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/hexchat.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dce47564..aeebcd04c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Added support for KeePassX (via @TCattd) - Added support for DefaultKeyBinding in OSX (via @adamclerk and @kfinlay) - Fix support for the Atom editor (via @damiankloip) +- Added support for HexChat (via @jubalh) ## Mackup 0.8.2 diff --git a/README.md b/README.md index 513b1d596..7ac035c67 100644 --- a/README.md +++ b/README.md @@ -204,6 +204,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Hands Off!](http://www.oneperiodic.com/products/handsoff/) - [Hazel](http://www.noodlesoft.com/hazel.php) - [Heroku](https://www.heroku.com/) + - [HexChat](https://hexchat.github.io/) - [Hexels](http://hexraystudios.com/hexels/) - [Houdini](http://uglyapps.co.uk/houdini/) - [Htop](http://htop.sourceforge.net/) diff --git a/mackup/applications/hexchat.cfg b/mackup/applications/hexchat.cfg new file mode 100644 index 000000000..62de963df --- /dev/null +++ b/mackup/applications/hexchat.cfg @@ -0,0 +1,5 @@ +[application] +name = HexChat + +[configuration_files] +.config/hexchat From c3e2ae76520a4538cf991256e2475f3fe3cbbd82 Mon Sep 17 00:00:00 2001 From: Timidger Date: Fri, 6 Feb 2015 16:46:29 -0500 Subject: [PATCH 0270/1256] Removed print statement and fixed the function overriding to deteremine operating system type. Tests should now work on OSX --- tests/utils_test.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/utils_test.py b/tests/utils_test.py index 7b3f99733..a25d6e7d7 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -337,14 +337,13 @@ def test_can_file_be_synced_on_current_platform(self): path = "some/file" # Force the Mac OSX Test using lambda magic - utils.system = lambda _: utils.constants.PLATFORM_DARWIN + utils.platform.system = lambda *args: utils.constants.PLATFORM_DARWIN assert utils.can_file_be_synced_on_current_platform(path) # Force the Linux Test using lambda magic - utils.system = lambda _: utils.constants.PLATFORM_LINUX + utils.platform.system = lambda *args: utils.constants.PLATFORM_LINUX assert utils.can_file_be_synced_on_current_platform(path) # Try to use the library path on Linux, which shouldn't work path = os.path.join(os.environ["HOME"], "Library/") - print(path) assert not utils.can_file_be_synced_on_current_platform(path) From d037c1e9eb8a88d57f1501d85084aedb85310896 Mon Sep 17 00:00:00 2001 From: Timidger Date: Fri, 6 Feb 2015 17:11:37 -0500 Subject: [PATCH 0271/1256] Fixed the error output, and also abstracted a hardcoded /dev/null reference away --- tests/utils_test.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/utils_test.py b/tests/utils_test.py index a25d6e7d7..a378ee70c 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -280,8 +280,8 @@ def test_chmod_file(self): convert_to_octal(nested_dir) == "700" # Use an "unsupported file type". In this case, /dev/null - assert os.path.exists("/dev/null") - self.assertRaises(ValueError, utils.chmod, "/dev/null") + dev_null = open(os.devnull, 'wb') + self.assertRaises(ValueError, utils.chmod, dev_null) def test_error(self): test_string = "Hello World" @@ -290,6 +290,8 @@ def test_error(self): test_string) def test_parse_cmdline_args(self): + # /dev/null to throwaway the error + dev_null = open(os.devnull, 'wb') modes = [utils.constants.BACKUP_MODE, utils.constants.RESTORE_MODE, utils.constants.UNINSTALL_MODE, @@ -302,6 +304,7 @@ def test_parse_cmdline_args(self): # Change the command line arguments to have an incorrect mode utils.sys.argv = ["the_program", "some wrong mode"] + utils.sys.stderr = dev_null self.assertRaises(SystemExit, utils.parse_cmdline_args) def test_failed_backup_location(self): From 16cd5332e7585b15e942c6bd06aee6c828486914 Mon Sep 17 00:00:00 2001 From: Timidger Date: Fri, 6 Feb 2015 17:14:48 -0500 Subject: [PATCH 0272/1256] Accidentally was opening the file instead of just using the path --- tests/utils_test.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/utils_test.py b/tests/utils_test.py index a378ee70c..7301a7f05 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -280,8 +280,7 @@ def test_chmod_file(self): convert_to_octal(nested_dir) == "700" # Use an "unsupported file type". In this case, /dev/null - dev_null = open(os.devnull, 'wb') - self.assertRaises(ValueError, utils.chmod, dev_null) + self.assertRaises(ValueError, utils.chmod, os.devnull) def test_error(self): test_string = "Hello World" From 85008f380cd8862d166a62334058826e1c4d38cf Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Sat, 7 Feb 2015 11:45:52 +0100 Subject: [PATCH 0273/1256] Add support for todo.txt-cli --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/todotxt-cli.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/todotxt-cli.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index aeebcd04c..bd2e48010 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Added support for DefaultKeyBinding in OSX (via @adamclerk and @kfinlay) - Fix support for the Atom editor (via @damiankloip) - Added support for HexChat (via @jubalh) +- Added support for todo.txt-cli (via @jubalh) ## Mackup 0.8.2 diff --git a/README.md b/README.md index 7ac035c67..f599c3a63 100644 --- a/README.md +++ b/README.md @@ -332,6 +332,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [tint2](https://code.google.com/p/tint2/) - [Tmux](http://tmux.sourceforge.net/) - [Tmuxinator](https://github.com/aziz/tmuxinator) + - [todo.txt-cli](http://todotxt.com/) - [Tower](http://www.git-tower.com/) - [Transmission](http://www.transmissionbt.com/) - [Transmit](http://panic.com/transmit/) diff --git a/mackup/applications/todotxt-cli.cfg b/mackup/applications/todotxt-cli.cfg new file mode 100644 index 000000000..3efae15f2 --- /dev/null +++ b/mackup/applications/todotxt-cli.cfg @@ -0,0 +1,5 @@ +[application] +name = todo.txt-cli + +[configuration_files] +.todo/config From e9eb68b27ce131471e5e64c405f9693f9e68867b Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 7 Feb 2015 16:47:34 -0500 Subject: [PATCH 0274/1256] Use the official Todo.txt CLI name --- CHANGELOG.md | 2 +- README.md | 2 +- mackup/applications/todotxt-cli.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd2e48010..f479d2b10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ - Added support for DefaultKeyBinding in OSX (via @adamclerk and @kfinlay) - Fix support for the Atom editor (via @damiankloip) - Added support for HexChat (via @jubalh) -- Added support for todo.txt-cli (via @jubalh) +- Added support for Todo.txt CLI (via @jubalh) ## Mackup 0.8.2 diff --git a/README.md b/README.md index f599c3a63..35d7de0f9 100644 --- a/README.md +++ b/README.md @@ -332,7 +332,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [tint2](https://code.google.com/p/tint2/) - [Tmux](http://tmux.sourceforge.net/) - [Tmuxinator](https://github.com/aziz/tmuxinator) - - [todo.txt-cli](http://todotxt.com/) + - [Todo.txt CLI](http://todotxt.com/) - [Tower](http://www.git-tower.com/) - [Transmission](http://www.transmissionbt.com/) - [Transmit](http://panic.com/transmit/) diff --git a/mackup/applications/todotxt-cli.cfg b/mackup/applications/todotxt-cli.cfg index 3efae15f2..025849aa6 100644 --- a/mackup/applications/todotxt-cli.cfg +++ b/mackup/applications/todotxt-cli.cfg @@ -1,5 +1,5 @@ [application] -name = todo.txt-cli +name = Todo.txt CLI [configuration_files] .todo/config From a6e35f0637baca2983d5c3d181698dbcace07ddf Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 8 Feb 2015 17:58:31 -0500 Subject: [PATCH 0275/1256] Switch testing from travis to CCI --- .travis.yml | 9 --------- circle.yml | 5 +++++ requirements.txt | 3 ++- 3 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 .travis.yml create mode 100644 circle.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 765e29819..000000000 --- a/.travis.yml +++ /dev/null @@ -1,9 +0,0 @@ -language: python -python: - - 2.7 -install: - - pip install coveralls -script: - - nosetests --with-coverage --cover-package=mackup -after_success: - - coveralls diff --git a/circle.yml b/circle.yml new file mode 100644 index 000000000..3c07ac124 --- /dev/null +++ b/circle.yml @@ -0,0 +1,5 @@ +test: + override: + - nosetests --with-coverage --cover-package=mackup + post: + - coveralls diff --git a/requirements.txt b/requirements.txt index 743a8ab77..fc9f3e1ea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ -# Let's install nose to run some tests +# Needed to run the tests # Run "pip install -r requirements.txt" then "nosetests" nose==1.3.4 +coveralls==0.5 From 32d3ac12172b64862053175878240ff2131a70d3 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 8 Feb 2015 18:03:19 -0500 Subject: [PATCH 0276/1256] Fix coveralls --- .coveralls.yml | 1 + README.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 .coveralls.yml diff --git a/.coveralls.yml b/.coveralls.yml new file mode 100644 index 000000000..15821c7ba --- /dev/null +++ b/.coveralls.yml @@ -0,0 +1 @@ +repo_token: JJzjaIYHvblZjhLYj0GAOfGJ0QFUi6aHO diff --git a/README.md b/README.md index 35d7de0f9..736f43d2f 100644 --- a/README.md +++ b/README.md @@ -3,7 +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) -[![Coverage Status](https://img.shields.io/coveralls/lra/mackup.svg)](https://coveralls.io/r/lra/mackup?branch=master) +[![Coverage Status](https://coveralls.io/repos/lra/mackup/badge.svg)](https://coveralls.io/r/lra/mackup) [![Code Health](https://landscape.io/github/lra/mackup/master/landscape.png)](https://landscape.io/github/lra/mackup/master) ## Quickstart From d68daf6308c51d661375abb14b4f842106af7fba Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 8 Feb 2015 18:06:31 -0500 Subject: [PATCH 0277/1256] New coveralls key --- .coveralls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.coveralls.yml b/.coveralls.yml index 15821c7ba..18b57e14a 100644 --- a/.coveralls.yml +++ b/.coveralls.yml @@ -1 +1 @@ -repo_token: JJzjaIYHvblZjhLYj0GAOfGJ0QFUi6aHO +repo_token: YJdQuTEbdh7ThzUSXKzsIbvsVl6Ksz8HX From 61a35f198ccfcb8e43f4e1665162c7fae6f2e7d9 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 8 Feb 2015 18:16:04 -0500 Subject: [PATCH 0278/1256] Too many arguments for format string --- mackup/main.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mackup/main.py b/mackup/main.py index 6102d40bf..710d02332 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -16,8 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . """ -import os - from .appsdb import ApplicationsDatabase from .application import ApplicationProfile from .constants import (BACKUP_MODE, @@ -105,8 +103,7 @@ def main(): "All your files have been put back into place. You can now" " safely uninstall Mackup.\n" "\n" - "Thanks for using Mackup !" - .format(os.path.abspath(__file__))) + "Thanks for using Mackup !") elif args.mode == LIST_MODE: # Display the list of supported applications From 792136691dbfa0c9ff4abd89403f5d9f9bf26e29 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 8 Feb 2015 18:28:50 -0500 Subject: [PATCH 0279/1256] PEP8 compliance --- mackup/utils.py | 22 ++++----- tests/utils_test.py | 117 +++++++++++++++++++++++--------------------- 2 files changed, 71 insertions(+), 68 deletions(-) diff --git a/mackup/utils.py b/mackup/utils.py index e546db605..ca5fed2ba 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -104,10 +104,10 @@ def copy(src, dst): chmod(dst) -def link(target, link): +def link(target, link_to): """ Create a link to a target file or a folder. - For simplicity sake, both target and link must be absolute path and must + For simplicity sake, 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. @@ -118,14 +118,14 @@ def link(target, link): Args: target (str): file or folder the link will point to - link (str): Link to create + link_to (str): Link to create """ assert isinstance(target, str) assert os.path.exists(target) - assert isinstance(link, str) + assert isinstance(link_to, str) # Create the path to the link if it does not exists - abs_path = os.path.dirname(os.path.abspath(link)) + abs_path = os.path.dirname(os.path.abspath(link_to)) if not os.path.isdir(abs_path): os.makedirs(abs_path) @@ -133,7 +133,7 @@ def link(target, link): chmod(target) # Create the link to target - os.symlink(target, link) + os.symlink(target, link_to) def chmod(target): @@ -256,7 +256,7 @@ def get_google_drive_folder_location(): googledrive_home = None gdrive_db = os.path.join(os.environ['HOME'], gdrive_db_path) - if (os.path.isfile(gdrive_db)): + if os.path.isfile(gdrive_db): con = sqlite3.connect(gdrive_db) if con: cur = con.cursor() @@ -286,10 +286,10 @@ def get_copy_folder_location(): copy_settings = os.path.join(os.environ['HOME'], copy_settings_path) - if (os.path.isfile(copy_settings)): - db = sqlite3.connect(copy_settings) - if db: - cur = db.cursor() + if os.path.isfile(copy_settings): + database = sqlite3.connect(copy_settings) + if database: + cur = database.cursor() query = ("SELECT value " "FROM config2 " "WHERE option = 'csmRootPath';") diff --git a/tests/utils_test.py b/tests/utils_test.py index 7301a7f05..8cf4bf3b4 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -7,6 +7,7 @@ from mackup import utils + def convert_to_octal(file_name): """ Using os.stat, returns file permissions (read, write, execute) as an octal @@ -46,9 +47,9 @@ def custom_raw_input(_): def test_delete_file(self): # Create a tmp file - tf = tempfile.NamedTemporaryFile(delete=False) - tfpath = tf.name - tf.close() + tfile = tempfile.NamedTemporaryFile(delete=False) + tfpath = tfile.name + tfile.close() # Make sure the created file exists assert os.path.isfile(tfpath) @@ -62,17 +63,17 @@ def test_delete_folder_recursively(self): tfpath = tempfile.mkdtemp() # Let's put a file in it just for fun - tf = tempfile.NamedTemporaryFile(dir=tfpath, delete=False) - filepath = tf.name - tf.close() + tfile = tempfile.NamedTemporaryFile(dir=tfpath, delete=False) + filepath = tfile.name + tfile.close() # Let's put another folder in it subfolder_path = tempfile.mkdtemp(dir=tfpath) # And a file in the subfolder - tf = tempfile.NamedTemporaryFile(dir=subfolder_path, delete=False) - subfilepath = tf.name - tf.close() + tfile = tempfile.NamedTemporaryFile(dir=subfolder_path, delete=False) + subfilepath = tfile.name + tfile.close() # Make sure the created files and folders exists assert os.path.isdir(tfpath) @@ -89,9 +90,9 @@ def test_delete_folder_recursively(self): def test_copy_file(self): # Create a tmp file - tf = tempfile.NamedTemporaryFile(delete=False) - srcfile = tf.name - tf.close() + tfile = tempfile.NamedTemporaryFile(delete=False) + srcfile = tfile.name + tfile.close() # Create a tmp folder dstpath = tempfile.mkdtemp() @@ -115,9 +116,9 @@ def test_copy_file(self): def test_copy_fail(self): # Create a tmp FIFO file - tf = tempfile.NamedTemporaryFile() - srcfile = tf.name - tf.close() + tfile = tempfile.NamedTemporaryFile() + srcfile = tfile.name + tfile.close() os.mkfifo(srcfile) # Create a tmp folder @@ -151,9 +152,9 @@ def test_copy_file_to_dir(self): srcpath = tempfile.mkdtemp() # Create a tmp file - tf = tempfile.NamedTemporaryFile(delete=False, dir=srcpath) - srcfile = tf.name - tf.close() + tfile = tempfile.NamedTemporaryFile(delete=False, dir=srcpath) + srcfile = tfile.name + tfile.close() # Create a tmp folder dstpath = tempfile.mkdtemp() @@ -190,9 +191,9 @@ def test_copy_dir(self): srcpath = tempfile.mkdtemp() # Create a tmp file - tf = tempfile.NamedTemporaryFile(delete=False, dir=srcpath) - srcfile = tf.name - tf.close() + tfile = tempfile.NamedTemporaryFile(delete=False, dir=srcpath) + srcfile = tfile.name + tfile.close() # Create a tmp folder dstpath = tempfile.mkdtemp() @@ -222,9 +223,9 @@ def test_copy_dir(self): def test_link_file(self): # Create a tmp file - tf = tempfile.NamedTemporaryFile(delete=False) - srcfile = tf.name - tf.close() + tfile = tempfile.NamedTemporaryFile(delete=False) + srcfile = tfile.name + tfile.close() # Create a tmp folder dstpath = tempfile.mkdtemp() @@ -248,45 +249,44 @@ def test_link_file(self): utils.delete(dstpath) def test_chmod_file(self): - # Create a tmp file - tf = tempfile.NamedTemporaryFile(delete=False) - file_name = tf.name + # Create a tmp file + tfile = tempfile.NamedTemporaryFile(delete=False) + file_name = tfile.name - # Create a tmp directory with a sub folder - dir_name = tempfile.mkdtemp() - nested_dir = tempfile.mkdtemp(dir=dir_name) + # Create a tmp directory with a sub folder + dir_name = tempfile.mkdtemp() + nested_dir = tempfile.mkdtemp(dir=dir_name) - ## File Tests + # # File Tests - # Change the tmp file stats to S_IWRITE (200), write access only - os.chmod(file_name, stat.S_IWRITE) - convert_to_octal(file_name) == "200" + # Change the tmp file stats to S_IWRITE (200), write access only + os.chmod(file_name, stat.S_IWRITE) + assert convert_to_octal(file_name) == "200" - # Check to make sure that utils.chmod changes the bits to 600, - # which is read and write access for the owner - utils.chmod(file_name) - convert_to_octal(file_name) == "600" + # Check to make sure that utils.chmod changes the bits to 600, + # which is read and write access for the owner + utils.chmod(file_name) + assert convert_to_octal(file_name) == "600" - ## Directory Tests + # # Directory Tests - # Change the tmp folder stats to S_IREAD (400), read access only - os.chmod(dir_name, stat.S_IREAD) - convert_to_octal(dir_name) == "400" + # Change the tmp folder stats to S_IREAD (400), read access only + os.chmod(dir_name, stat.S_IREAD) + assert convert_to_octal(dir_name) == "400" - # Check to make sure that utils.chmod changes the bits of all directories - # to 700, which is read, write, and execute access for the owner - utils.chmod(dir_name) - convert_to_octal(dir_name) == "700" - convert_to_octal(nested_dir) == "700" + # Check to make sure that utils.chmod changes the bits of all + # directories to 700, which is read, write, and execute access for the + # owner + utils.chmod(dir_name) + assert convert_to_octal(dir_name) == "700" + assert convert_to_octal(nested_dir) == "700" - # Use an "unsupported file type". In this case, /dev/null - self.assertRaises(ValueError, utils.chmod, os.devnull) + # Use an "unsupported file type". In this case, /dev/null + self.assertRaises(ValueError, utils.chmod, os.devnull) def test_error(self): test_string = "Hello World" - self.assertRaises(SystemExit, - utils.error, - test_string) + self.assertRaises(SystemExit, utils.error, test_string) def test_parse_cmdline_args(self): # /dev/null to throwaway the error @@ -299,7 +299,8 @@ def test_parse_cmdline_args(self): for mode in modes: # Change the command line arguments to contain the correct mode utils.sys.argv = ["the_program", mode] - assert str(utils.parse_cmdline_args()) == "Namespace(mode='%s')" %mode + expected_str = "Namespace(mode='{}')".format(mode) + assert str(utils.parse_cmdline_args()) == expected_str # Change the command line arguments to have an incorrect mode utils.sys.argv = ["the_program", "some wrong mode"] @@ -308,8 +309,8 @@ def test_parse_cmdline_args(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 + Tests for the error that should occur if the backup folder cannot be + found for Dropbox, Google, and Copy """ # Hack to make our home folder some temporary folder temp_home = tempfile.mkdtemp() @@ -320,12 +321,14 @@ def test_failed_backup_location(self): 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, + 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 Copy Folder - assert not os.path.exists(os.path.join(temp_home, + 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) From 6963a91159dba0a13d0d3959132e781b3fb3e035 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 8 Feb 2015 20:16:06 -0500 Subject: [PATCH 0280/1256] Landscape suggestions --- mackup/__init__.py | 2 +- mackup/application.py | 12 ++++++++---- mackup/appsdb.py | 24 +++++++++++++++--------- mackup/config.py | 15 ++++++++++++--- 4 files changed, 36 insertions(+), 17 deletions(-) diff --git a/mackup/__init__.py b/mackup/__init__.py index 95b916c6b..808313434 100644 --- a/mackup/__init__.py +++ b/mackup/__init__.py @@ -1 +1 @@ -"""The Mackup Package""" +"""The Mackup Package.""" diff --git a/mackup/application.py b/mackup/application.py index 2601fa2f5..e6c9cd504 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -1,4 +1,6 @@ """ +Application Profile. + An Application Profile contains all the information about an application in Mackup. Name, files, ... """ @@ -9,11 +11,12 @@ class ApplicationProfile(object): - """Instantiate this class with application specific data""" + + """Instantiate this class with application specific data.""" def __init__(self, mackup, files): """ - Create an ApplicationProfile instance + Create an ApplicationProfile instance. Args: mackup (Mackup) @@ -27,7 +30,7 @@ def __init__(self, mackup, files): def backup(self): """ - Backup the application config files + Backup the application config files. Algorithm: if exists home/file @@ -94,7 +97,7 @@ def backup(self): def restore(self): """ - Restore the application config files + Restore the application config files. Algorithm: if exists mackup/file @@ -150,6 +153,7 @@ def restore(self): def uninstall(self): """ Uninstall Mackup. + Restore any file where it was before the 1st Mackup backup. Algorithm: diff --git a/mackup/appsdb.py b/mackup/appsdb.py index 6d920a335..86f7bb91b 100644 --- a/mackup/appsdb.py +++ b/mackup/appsdb.py @@ -1,6 +1,8 @@ """ +The applications database. + The Applications Database provides an easy to use interface to load application -data from the Mackup Database (files) +data from the Mackup Database (files). """ import os @@ -15,12 +17,11 @@ class ApplicationsDatabase(object): - """Database containing all the configured applications""" + + """Database containing all the configured applications.""" def __init__(self): - """ - Create a ApplicationsDatabase instance - """ + """Create a ApplicationsDatabase instance.""" # Build the dict that will contain the properties of each application self.apps = dict() @@ -55,6 +56,8 @@ def __init__(self): @staticmethod def get_config_files(): """ + Return the application configuraion files. + Return a list of configuration files describing the apps supported by Mackup. The files return are absolute fullpath to those files. e.g. /usr/lib/mackup/applications/bash.cfg @@ -96,7 +99,7 @@ def get_config_files(): def get_name(self, name): """ - Return the fancy name of an application + Return the fancy name of an application. Args: name (str) @@ -108,7 +111,7 @@ def get_name(self, name): def get_files(self, name): """ - Return the list of config files of an application + Return the list of config files of an application. Args: name (str) @@ -120,7 +123,10 @@ def get_files(self, name): def get_app_names(self): """ - Return the list of application names that are available in the database + Return application names. + + Return the list of application names that are available in the + database. Returns: set of str. @@ -133,7 +139,7 @@ def get_app_names(self): def get_pretty_app_names(self): """ - Return the list of pretty app names that are available in the database + Return the list of pretty app names that are available in the database. Returns: set of str. diff --git a/mackup/config.py b/mackup/config.py index d6e590ca1..f724e8d29 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -1,6 +1,4 @@ -""" -Package used to manage the .mackup.cfg config file -""" +"""Package used to manage the .mackup.cfg config file.""" import os import os.path @@ -24,8 +22,12 @@ class Config(object): + """The Mackup Config class.""" + def __init__(self, filename=None): """ + Create a Config instance. + Args: filename (str): Optional filename of the config file. If empty, defaults to MACKUP_CONFIG_FILE @@ -57,6 +59,7 @@ def __init__(self, filename=None): def engine(self): """ The engine used by the storage. + ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_COPY or ENGINE_FS. Returns: @@ -67,6 +70,8 @@ def engine(self): @property def path(self): """ + Path to the Mackup configuration files. + The path to the directory where Mackup is gonna create and store his directory. @@ -88,6 +93,8 @@ def directory(self): @property def fullpath(self): """ + Full path to the Mackup configuration files. + The full path to the directory when Mackup is storing the configuration files. @@ -118,6 +125,8 @@ def apps_to_sync(self): def _setup_parser(self, filename=None): """ + Configure the ConfigParser instance the way we want it. + Args: filename (str) or None From 98ec331ffe4454ee4f99152e75dad97bd3462989 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 8 Feb 2015 21:05:29 -0500 Subject: [PATCH 0281/1256] More PEP8 stuff --- mackup/config.py | 14 ++++++++++++++ mackup/constants.py | 2 +- mackup/mackup.py | 19 +++++++++++-------- mackup/main.py | 3 +-- mackup/utils.py | 26 +++++++++++++++++--------- setup.py | 2 +- 6 files changed, 45 insertions(+), 21 deletions(-) diff --git a/mackup/config.py b/mackup/config.py index f724e8d29..34317b197 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -145,6 +145,7 @@ def _setup_parser(self, filename=None): 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'] for old_section in old_sections: @@ -164,6 +165,8 @@ def _warn_on_old_config(self): def _parse_engine(self): """ + Parse the storage engine in the config. + Returns: str """ @@ -184,6 +187,8 @@ def _parse_engine(self): def _parse_path(self): """ + Parse the storage path in the config. + Returns: str """ @@ -205,6 +210,8 @@ def _parse_path(self): def _parse_directory(self): """ + Parse the storage directory in the config. + Returns: str """ @@ -217,6 +224,8 @@ def _parse_directory(self): def _parse_apps_to_ignore(self): """ + Parse the applications to ignore in the config. + Returns: set """ @@ -232,6 +241,8 @@ def _parse_apps_to_ignore(self): def _parse_apps_to_sync(self): """ + Parse the applications to backup in the config. + Returns: set """ @@ -247,4 +258,7 @@ def _parse_apps_to_sync(self): class ConfigError(Exception): + + """Exception used for handle errors in the configuration.""" + pass diff --git a/mackup/constants.py b/mackup/constants.py index 0574473d9..8e8ac9f0e 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,4 +1,4 @@ -"""Constants used in Mackup""" +"""Constants used in Mackup.""" # Current version VERSION = '0.8.2' diff --git a/mackup/mackup.py b/mackup/mackup.py index 970fdae38..46e84c002 100644 --- a/mackup/mackup.py +++ b/mackup/mackup.py @@ -1,4 +1,6 @@ """ +The Mackup Class. + The Mackup class is keeping all the state that mackup needs to keep during its runtime. It also provides easy to use interface that is used by the Mackup UI. The only UI for now is the command line. @@ -14,18 +16,18 @@ class Mackup(object): - """Main Mackup class""" + + """Main Mackup class.""" def __init__(self): - """Mackup Constructor""" + """Mackup Constructor.""" self._config = config.Config() self.mackup_folder = self._config.fullpath self.temp_folder = tempfile.mkdtemp(prefix="mackup_tmp_") def check_for_usable_environment(self): - """Check if the current env is usable and has everything's required""" - + """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" @@ -44,12 +46,12 @@ def check_for_usable_environment(self): # " run me again.") def check_for_usable_backup_env(self): - """Check if the current env can be used to back up files""" + """Check if the current env can be used to back up files.""" self.check_for_usable_environment() self.create_mackup_home() def check_for_usable_restore_env(self): - """Check if the current env can be used to restore files""" + """Check if the current env can be used to restore files.""" self.check_for_usable_environment() if not os.path.isdir(self.mackup_folder): @@ -59,11 +61,11 @@ def check_for_usable_restore_env(self): .format(self.mackup_folder)) def clean_temp_folder(self): - """Delete the temp folder and files created while running""" + """Delete the temp folder and files created while running.""" shutil.rmtree(self.temp_folder) def create_mackup_home(self): - """If the Mackup home folder does not exist, create it""" + """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" @@ -76,6 +78,7 @@ def create_mackup_home(self): def get_apps_to_backup(self): """ Get the list of application that should be backup by Mackup. + It's the list of allowed apps minus the list of ignored apps. Returns: diff --git a/mackup/main.py b/mackup/main.py index 710d02332..c26c715af 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -29,8 +29,7 @@ def main(): - """Main function""" - + """Main function.""" # Get the command line arg args = utils.parse_cmdline_args() diff --git a/mackup/utils.py b/mackup/utils.py index ca5fed2ba..591e5bb1b 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -1,4 +1,4 @@ -"""System static utilities being used by the modules""" +"""System static utilities being used by the modules.""" import argparse import base64 import os @@ -14,7 +14,7 @@ def confirm(question): """ - Ask the user if he really want something to happen + Ask the user if he really want something to happen. Args: question(str): What can happen @@ -43,7 +43,8 @@ def confirm(question): def delete(filepath): """ Delete the given file, directory or link. - Should support undelete later on. + + It Should support undelete later on. Args: filepath (str): Absolute full path to a file. e.g. /path/to/file @@ -64,6 +65,7 @@ def delete(filepath): 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 include the filename of the file or folder. Also do not include any trailing slash. @@ -107,6 +109,7 @@ def copy(src, dst): 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 include the filename of the file or folder. Also do not include any trailing slash. @@ -139,6 +142,7 @@ def link(target, link_to): def chmod(target): """ Recursively set the chmod for files to 0600 and 0700 for folders. + It's ok unless we need something more specific. Args: @@ -185,12 +189,11 @@ def error(message): def parse_cmdline_args(): """ - Setup the engine that's gonna parse the command line arguments + Setup the engine that's gonna parse the command line arguments. Returns: (argparse.Namespace) """ - # Format the description text description = ("Mackup {}\n" "Keep your application settings in sync.\n" @@ -229,7 +232,7 @@ def parse_cmdline_args(): def get_dropbox_folder_location(): """ - Try to locate the Dropbox folder + Try to locate the Dropbox folder. Returns: (str) Full path to the current Dropbox folder @@ -247,7 +250,7 @@ def get_dropbox_folder_location(): def get_google_drive_folder_location(): """ - Try to locate the Google Drive folder + Try to locate the Google Drive folder. Returns: (unicode) Full path to the current Google Drive folder @@ -276,7 +279,7 @@ def get_google_drive_folder_location(): def get_copy_folder_location(): """ - Try to locate the Copy folder + Try to locate the Copy folder. Returns: (unicode) Full path to the current Copy folder @@ -306,7 +309,7 @@ def get_copy_folder_location(): def is_process_running(process_name): """ - Check if a process with the given name is running + Check if a process with the given name is running. Args: (str): Process name, e.g. "Sublime Text" @@ -329,6 +332,7 @@ def is_process_running(process_name): def remove_acl(path): """ Remove the ACL of the file or folder located on the given path. + Also remove the ACL of any file and folder below the given one, recursively. @@ -347,6 +351,8 @@ def remove_acl(path): def remove_immutable_attribute(path): """ + Remove the immutable attribute of the given path. + Remove the immutable attribute of the file or folder located on the given path. Also remove the immutable attribute of any file and folder below the given one, recursively. @@ -366,6 +372,8 @@ def remove_immutable_attribute(path): def can_file_be_synced_on_current_platform(path): """ + Chec if the given path can be synced locally. + Check if it makes sens to sync the file at the given path on the current platform. For now we don't sync any file in the ~/Library folder on GNU/Linux. diff --git a/setup.py b/setup.py index 30cf5fee0..1e2b644ea 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -"""Setup file to automate the install of Mackup in the Python environment""" +"""Setup file to automate the install of Mackup in the Python environment.""" from setuptools import setup from mackup.constants import VERSION From f8a41cfeacb9299069dc07a29ef72386a625f82c Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 8 Feb 2015 21:11:06 -0500 Subject: [PATCH 0282/1256] Just for the sake of it --- tests/utils_test.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/utils_test.py b/tests/utils_test.py index 8cf4bf3b4..6377de893 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -10,7 +10,7 @@ def convert_to_octal(file_name): """ - Using os.stat, returns file permissions (read, write, execute) as an octal + Using os.stat, returns file permissions (read, write, execute) as an octal. """ return oct(os.stat(file_name)[stat.ST_MODE])[-3:] @@ -145,9 +145,7 @@ def test_copy_fail(self): utils.delete(dstpath) def test_copy_file_to_dir(self): - """ - Copies a file to a destination folder that already exists - """ + """Copies a file to a destination folder that already exists.""" # Create a tmp folder srcpath = tempfile.mkdtemp() @@ -184,9 +182,7 @@ def test_copy_file_to_dir(self): utils.delete(dstpath) def test_copy_dir(self): - """ - Copies a directory recursively to the destination path - """ + """Copies a directory recursively to the destination path.""" # Create a tmp folder srcpath = tempfile.mkdtemp() From 523dfa19d8c739cc9eb8cb56fc6dabc3dfe802dc Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 8 Feb 2015 22:15:58 -0500 Subject: [PATCH 0283/1256] Mackup 0.8.3 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f479d2b10..0c41df39b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.3 + - Remove the scripts dir from Messages syncing (@vitorgalvao) - Added support of AppCode 3.1 (via @morphinewan) - Added support for KeePassX (via @TCattd) diff --git a/mackup/constants.py b/mackup/constants.py index 8e8ac9f0e..8d1bdf5bf 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.2' +VERSION = '0.8.3' # Mode used to list supported applications LIST_MODE = 'list' From 685de11601f4b303995c3e8e02c6d40212e0fe2f Mon Sep 17 00:00:00 2001 From: Leo Koppelkamm Date: Tue, 10 Feb 2015 22:38:38 +0100 Subject: [PATCH 0284/1256] Adding Photoshop CC --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/photoshop.cfg | 9 +++++++++ 3 files changed, 12 insertions(+) create mode 100644 mackup/applications/photoshop.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c41df39b..f358349ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Added support for Photoshop CC (@ponychicken) + ## Mackup 0.8.3 - Remove the scripts dir from Messages syncing (@vitorgalvao) diff --git a/README.md b/README.md index 736f43d2f..fc8ab1dfa 100644 --- a/README.md +++ b/README.md @@ -133,6 +133,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adium](http://adium.im/) - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - [Adobe Lightroom](http://www.adobe.com/products/photoshop-lightroom.html) + - [Adobe Photoshop CC](http://www.adobe.com/products/photoshop.html) - [AppCode](http://www.jetbrains.com/objc/) - [aria2c](http://aria2.sourceforge.net/) - [Arara](http://cereda.github.io/arara/) diff --git a/mackup/applications/photoshop.cfg b/mackup/applications/photoshop.cfg new file mode 100644 index 000000000..e1eaf721d --- /dev/null +++ b/mackup/applications/photoshop.cfg @@ -0,0 +1,9 @@ +[application] +name = Adobe Photoshop + +[configuration_files] +Library/Application Support/Adobe/Adobe Photoshop CC 2013/Presets +Library/Application Support/Adobe/Adobe Photoshop CC 2014/Presets +Library/Preferences/Adobe Photoshop CC 2013 Settings +Library/Preferences/Adobe Photoshop CC 2014 Settings +Library/Preferences/com.adobe.Photoshop.plist From 09d151d5406b12a4c42743baf81b810a777c96cc Mon Sep 17 00:00:00 2001 From: Filipe Varela Date: Fri, 13 Feb 2015 17:44:43 +0000 Subject: [PATCH 0285/1256] Adds PyCharm 4 support --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/pycharm40.cfg | 6 ++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/pycharm40.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c41df39b..7bfca745c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Added support for PyCharm 4 (via @fcvarela) + ## Mackup 0.8.3 - Remove the scripts dir from Messages syncing (@vitorgalvao) diff --git a/README.md b/README.md index 736f43d2f..0ff45d538 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. - [ProxyChains](http://proxychains.sourceforge.net) - [ProxyChains NG](https://sourceforge.net/projects/proxychains-ng) - [Punto Switcher](http://punto.yandex.ru/) + - [PyCharm 4](https://www.jetbrains.com/pycharm/) - [PyPI](https://pypi.python.org/pypi) - [Quicksilver](http://qsapp.com/) - [Rails](http://rubyonrails.org/) diff --git a/mackup/applications/pycharm40.cfg b/mackup/applications/pycharm40.cfg new file mode 100644 index 000000000..b9fa72cd3 --- /dev/null +++ b/mackup/applications/pycharm40.cfg @@ -0,0 +1,6 @@ +[application] +name = PyCharm 4 + +[configuration_files] +Library/Application Support/PyCharm40 +Library/Preferences/PyCharm40 From bb3aa8143d90874e0522a1b1294a17d886a07199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20Tunal=C4=B1?= Date: Fri, 27 Feb 2015 10:33:07 +0200 Subject: [PATCH 0286/1256] Adding Popcorn-Time support Re-submitted file with a clean fork --- mackup/applications/popcorn-time.cfg | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 mackup/applications/popcorn-time.cfg diff --git a/mackup/applications/popcorn-time.cfg b/mackup/applications/popcorn-time.cfg new file mode 100644 index 000000000..6f95c926a --- /dev/null +++ b/mackup/applications/popcorn-time.cfg @@ -0,0 +1,9 @@ +[application] +name = Popcorn-Time + +[configuration_files] +Library/Application Support/Popcorn-Time/data/bookmarks.db +Library/Application Support/Popcorn-Time/data/settings.db +Library/Application Support/Popcorn-Time/data/watched.db +Library/Application Support/Popcorn-Time/data/movies.db +Library/Application Support/Popcorn-Time/data/shows.db From 180df0cc93dcda7d2123707879543a775c77300c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20Tunal=C4=B1?= Date: Fri, 27 Feb 2015 10:39:42 +0200 Subject: [PATCH 0287/1256] Update README.md Added Popcorn-Time link --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0ff45d538..571102dcc 100644 --- a/README.md +++ b/README.md @@ -275,6 +275,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Poedit](http://poedit.net/) - [PokerStars](http://www.pokerstars.com/) - [PopClip](http://pilotmoon.com/popclip/) + - [Popcorn-Time](https://popcorntime.io/) - [PostgreSQL](http://postgresql.org/) - [Pow](http://pow.cx/) - [Prezto](https://github.com/sorin-ionescu/prezto) From ee67aacfac1d79b8ed0f65e8407f40212dcdb5a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20Tunal=C4=B1?= Date: Fri, 27 Feb 2015 19:07:27 +0200 Subject: [PATCH 0288/1256] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bfca745c..0faab8fc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Added support for PyCharm 4 (via @fcvarela) +- Added support for Popcorn Time (via @JacopKane) ## Mackup 0.8.3 From bd25ecb3b9713472a1cc06ada03d4bd978230f46 Mon Sep 17 00:00:00 2001 From: Jan Vlnas Date: Sat, 28 Feb 2015 15:48:27 -0600 Subject: [PATCH 0289/1256] sublime-text-3: Sync only User folder on Linux --- CHANGELOG.md | 1 + mackup/applications/sublime-text-3.cfg | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0faab8fc5..3f076a86c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Added support for PyCharm 4 (via @fcvarela) - Added support for Popcorn Time (via @JacopKane) +- Sublime Text 3 syncs only Packages/User directory on Linux ## Mackup 0.8.3 diff --git a/mackup/applications/sublime-text-3.cfg b/mackup/applications/sublime-text-3.cfg index f3ec32e9d..c2e05e83d 100644 --- a/mackup/applications/sublime-text-3.cfg +++ b/mackup/applications/sublime-text-3.cfg @@ -3,5 +3,4 @@ name = Sublime Text 3 [configuration_files] Library/Application Support/Sublime Text 3/Packages/User -.config/sublime-text-3/Installed Packages -.config/sublime-text-3/Packages +.config/sublime-text-3/Packages/User From 9ca6e273bbd30c5569e3a672f8413333ac8b6bc1 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 28 Feb 2015 18:05:10 -0500 Subject: [PATCH 0290/1256] Fix the ST2 config sync --- CHANGELOG.md | 2 +- mackup/applications/sublime-text-2.cfg | 6 +++--- mackup/applications/sublime-text-3.cfg | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f076a86c..3f58f6191 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ - Added support for PyCharm 4 (via @fcvarela) - Added support for Popcorn Time (via @JacopKane) -- Sublime Text 3 syncs only Packages/User directory on Linux +- Sublime Text syncs only Packages/User directory on Linux (via @jnv) ## Mackup 0.8.3 diff --git a/mackup/applications/sublime-text-2.cfg b/mackup/applications/sublime-text-2.cfg index 1bd9b25c8..694049111 100644 --- a/mackup/applications/sublime-text-2.cfg +++ b/mackup/applications/sublime-text-2.cfg @@ -2,6 +2,6 @@ name = Sublime Text 2 [configuration_files] -Library/Application Support/Sublime Text 2/Installed Packages -Library/Application Support/Sublime Text 2/Packages -Library/Application Support/Sublime Text 2/Pristine Packages +# Based on https://packagecontrol.io/docs/syncing +Library/Application Support/Sublime Text 2/Packages/User +.config/sublime-text-2/Packages/User diff --git a/mackup/applications/sublime-text-3.cfg b/mackup/applications/sublime-text-3.cfg index c2e05e83d..6f4e3b67d 100644 --- a/mackup/applications/sublime-text-3.cfg +++ b/mackup/applications/sublime-text-3.cfg @@ -2,5 +2,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 From e2f6e047eec731a5d7c738cd83bf7f6bf64a9a18 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 28 Feb 2015 18:31:31 -0500 Subject: [PATCH 0291/1256] Mackup 0.8.4 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f58f6191..5a12a0e43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.4 + - Added support for PyCharm 4 (via @fcvarela) - Added support for Popcorn Time (via @JacopKane) - Sublime Text syncs only Packages/User directory on Linux (via @jnv) diff --git a/mackup/constants.py b/mackup/constants.py index 8d1bdf5bf..127c2842b 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.3' +VERSION = '0.8.4' # Mode used to list supported applications LIST_MODE = 'list' From 371c4b78ce54166765b6114d0be84ff0ebe705eb Mon Sep 17 00:00:00 2001 From: ninjabong Date: Fri, 6 Mar 2015 17:46:36 -0500 Subject: [PATCH 0292/1256] Added support for Box as storage engine --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/config.py | 9 +++++++-- mackup/constants.py | 1 + mackup/utils.py | 15 +++++++++++++++ setup.py | 2 +- tests/config_tests.py | 18 ++++++++++++++++++ tests/fixtures/mackup-engine-box.cfg | 3 +++ tests/utils_test.py | 8 +++++++- 9 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 tests/fixtures/mackup-engine-box.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a12a0e43..2677f9dfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Added support for Box to store you files (via @ninjabong) + ## Mackup 0.8.4 - Added support for PyCharm 4 (via @fcvarela) diff --git a/README.md b/README.md index 571102dcc..2fe723414 100644 --- a/README.md +++ b/README.md @@ -122,6 +122,7 @@ folder and destroy the Mackup folder in Dropbox. - [Dropbox](https://www.dropbox.com/) - [Google Drive](https://drive.google.com/) - [Copy](https://www.copy.com/) + - [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. diff --git a/mackup/config.py b/mackup/config.py index 34317b197..b58f4f7cd 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -8,12 +8,14 @@ ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_COPY, + ENGINE_BOX, ENGINE_FS) from .utils import (error, get_dropbox_folder_location, get_copy_folder_location, - get_google_drive_folder_location) + get_google_drive_folder_location, + get_box_folder_location) try: import configparser except ImportError: @@ -60,7 +62,7 @@ def engine(self): """ The engine used by the storage. - ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_COPY or ENGINE_FS. + ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_COPY, ENGINE_BOX or ENGINE_FS. Returns: str @@ -180,6 +182,7 @@ def _parse_engine(self): if engine not in [ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_COPY, + ENGINE_BOX, ENGINE_FS]: raise ConfigError('Unknown storage engine: {}'.format(engine)) @@ -198,6 +201,8 @@ def _parse_path(self): path = get_google_drive_folder_location() elif self.engine == ENGINE_COPY: path = get_copy_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 127c2842b..6deead9d5 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -36,5 +36,6 @@ # Supported engines ENGINE_DROPBOX = 'dropbox' ENGINE_GDRIVE = 'google_drive' +ENGINE_BOX = 'box' ENGINE_COPY = 'copy' ENGINE_FS = 'file_system' diff --git a/mackup/utils.py b/mackup/utils.py index 591e5bb1b..2585f315e 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -276,6 +276,21 @@ 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_sync_path = os.path.join(os.environ['HOME'], 'Library/Application Support/Box/Box Sync/sync_root_folder.txt') + try: + with open(box_sync_path, 'r') as sync_path: + box_home = sync_path.read() + except IOError: + error('Unable to find your Box prefs at ' , sync_path , ' =(') + + return box_home def get_copy_folder_location(): """ diff --git a/setup.py b/setup.py index 1e2b644ea..87c99b76c 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ 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', + keywords='configuration config dotfiles sync backup dropbox gdrive box', license='GPLv3', packages=['mackup'], entry_points={ diff --git a/tests/config_tests.py b/tests/config_tests.py index 946ebb327..1edfbd629 100644 --- a/tests/config_tests.py +++ b/tests/config_tests.py @@ -148,6 +148,24 @@ def test_config_engine_copy(self): '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'/home/some_user/Box Sync' + + assert isinstance(cfg.directory, str) + assert cfg.directory == u'some_weirder_name' + + assert isinstance(cfg.fullpath, str) + assert cfg.fullpath == u'/home/some_user/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 new file mode 100644 index 000000000..c4b3aa5e6 --- /dev/null +++ b/tests/fixtures/mackup-engine-box.cfg @@ -0,0 +1,3 @@ +[storage] +engine = box +directory = some_weirder_name diff --git a/tests/utils_test.py b/tests/utils_test.py index 6377de893..e370c295d 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -306,7 +306,7 @@ def test_parse_cmdline_args(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, Google, Box and Copy """ # Hack to make our home folder some temporary folder temp_home = tempfile.mkdtemp() @@ -322,6 +322,12 @@ def test_failed_backup_location(self): "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")) + self.assertRaises(SystemExit, utils.get_box_folder_location) + # Check for the missing Copy Folder assert not os.path.exists(os.path.join( temp_home, From 80f688b16fa9955a306fe7b32c11cda48b14c1a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= Date: Sat, 7 Mar 2015 00:15:08 +0100 Subject: [PATCH 0293/1256] pokerstars.cfg: Added backup for EU version --- mackup/applications/pokerstars.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/pokerstars.cfg b/mackup/applications/pokerstars.cfg index 34a32ed9c..de0fb0c7d 100644 --- a/mackup/applications/pokerstars.cfg +++ b/mackup/applications/pokerstars.cfg @@ -4,3 +4,5 @@ name = PokerStars [configuration_files] Library/Preferences/com.pokerstars.user.ini Library/Preferences/com.pokerstars.PokerStars.plist +Library/Preferences/com.pokerstars.eu.user.ini +Library/Preferences/com.pokerstars.PokerStarsEU.plist From 675e81a11be5cb3e9b814cc8034601567ab945e8 Mon Sep 17 00:00:00 2001 From: ninjabong Date: Fri, 6 Mar 2015 22:02:50 -0500 Subject: [PATCH 0294/1256] Fixed missing path for box engine referencing wrong variable --- mackup/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/utils.py b/mackup/utils.py index 2585f315e..d4a6b4d78 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -288,7 +288,7 @@ def get_box_folder_location(): with open(box_sync_path, 'r') as sync_path: box_home = sync_path.read() except IOError: - error('Unable to find your Box prefs at ' , sync_path , ' =(') + error('Unable to find your Box prefs at ' , box_sync_path , ' =(') return box_home From 099e3be274fe20615bf1b0193ddcf4912488dc50 Mon Sep 17 00:00:00 2001 From: ninjabong Date: Fri, 6 Mar 2015 22:04:28 -0500 Subject: [PATCH 0295/1256] Just removed var from error message, and CI should pass --- mackup/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/utils.py b/mackup/utils.py index d4a6b4d78..d57ad5af9 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -288,7 +288,7 @@ def get_box_folder_location(): with open(box_sync_path, 'r') as sync_path: box_home = sync_path.read() except IOError: - error('Unable to find your Box prefs at ' , box_sync_path , ' =(') + error('Unable to find your Box prefs at =(') return box_home From 847914487851ebef5c980bd2b2d2aab390cf7c28 Mon Sep 17 00:00:00 2001 From: ninjabong Date: Fri, 6 Mar 2015 22:06:29 -0500 Subject: [PATCH 0296/1256] Moved get_box_for_location to double quotes --- mackup/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/utils.py b/mackup/utils.py index d57ad5af9..fa6d06ab2 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -288,7 +288,7 @@ def get_box_folder_location(): with open(box_sync_path, 'r') as sync_path: box_home = sync_path.read() except IOError: - error('Unable to find your Box prefs at =(') + error("Unable to find your Box prefs =(") return box_home From aeba4079b9b21a06b63f99ac81645d25c2393863 Mon Sep 17 00:00:00 2001 From: ninjabong Date: Fri, 6 Mar 2015 23:01:58 -0500 Subject: [PATCH 0297/1256] Should actually pass CI now. Probably. --- mackup/utils.py | 10 +++++++--- .../Box/Box Sync/sync_root_folder.txt | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 tests/fixtures/Library/Application Support/Box/Box Sync/sync_root_folder.txt diff --git a/mackup/utils.py b/mackup/utils.py index fa6d06ab2..a09e2fa1c 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -283,10 +283,14 @@ def get_box_folder_location(): Returns: (str) Full path to the current Box folder """ - box_sync_path = os.path.join(os.environ['HOME'], '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) try: - with open(box_sync_path, 'r') as sync_path: - box_home = sync_path.read() + with open(box_prefs, 'r') as sync_path: + data = sync_path.read() + box_home = data except IOError: error("Unable to find your Box prefs =(") diff --git a/tests/fixtures/Library/Application Support/Box/Box Sync/sync_root_folder.txt b/tests/fixtures/Library/Application Support/Box/Box Sync/sync_root_folder.txt new file mode 100644 index 000000000..c63260b3d --- /dev/null +++ b/tests/fixtures/Library/Application Support/Box/Box Sync/sync_root_folder.txt @@ -0,0 +1 @@ +/Users/whatever/Box Sync \ No newline at end of file From c93452f488a6b419dfc921e9882a7abb8ebafd24 Mon Sep 17 00:00:00 2001 From: ninjabong Date: Fri, 6 Mar 2015 23:03:29 -0500 Subject: [PATCH 0298/1256] CI fix --- tests/config_tests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/config_tests.py b/tests/config_tests.py index 1edfbd629..ddb287857 100644 --- a/tests/config_tests.py +++ b/tests/config_tests.py @@ -4,6 +4,7 @@ from mackup.constants import (ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_COPY, + ENGINE_BOX, ENGINE_FS) from mackup.config import Config, ConfigError From 4f4aeddf51510012dd9b37ff47807e114bc334da Mon Sep 17 00:00:00 2001 From: ninjabong Date: Fri, 6 Mar 2015 23:12:09 -0500 Subject: [PATCH 0299/1256] CI finally passes, finally --- tests/config_tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/config_tests.py b/tests/config_tests.py index ddb287857..c45b93401 100644 --- a/tests/config_tests.py +++ b/tests/config_tests.py @@ -156,13 +156,13 @@ def test_config_engine_box(self): assert cfg.engine == ENGINE_BOX assert isinstance(cfg.path, str) - assert cfg.path == u'/home/some_user/Box Sync' + 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'/home/some_user/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() From 32a12ab9e146c146914eccb34a8ba9446a2118be Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Sat, 7 Mar 2015 19:04:20 -0800 Subject: [PATCH 0300/1256] add support for mailmate --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/mailmate.cfg | 12 ++++++++++++ 3 files changed, 15 insertions(+) create mode 100644 mackup/applications/mailmate.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a12a0e43..28cf6f15e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Added support for Mailmate (via @cdransf) + ## Mackup 0.8.4 - Added support for PyCharm 4 (via @fcvarela) diff --git a/README.md b/README.md index 571102dcc..43c7f1c91 100644 --- a/README.md +++ b/README.md @@ -238,6 +238,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [MacVim](https://code.google.com/p/macvim/) - [Magic Launch](https://www.oneperiodic.com/products/magiclaunch/) - [MagicPrefs](http://magicprefs.com/) + - [Mailmate](http://freron.com/) - [Mailplane](http://mailplaneapp.com/) - [Maven](http://maven.apache.org) - [Max](http://sbooth.org/Max/) diff --git a/mackup/applications/mailmate.cfg b/mackup/applications/mailmate.cfg new file mode 100644 index 000000000..0e2c8b1c6 --- /dev/null +++ b/mackup/applications/mailmate.cfg @@ -0,0 +1,12 @@ +[application] +name = Mailmate + +[configuration_files] +Library/Preferences/com.freron.MailMate.plist +Library/Application Support/Mailmate/com.freron.MailMate.pid +Library/Application Support/Mailmate/Identities.plist +Library/Application Support/Mailmate/Mailboxes.plist +Library/Application Support/Mailmate/Signatures.plist +Library/Application Support/Mailmate/Sources.plist +Library/Application Support/Mailmate/Submission.plist +Library/Application Support/Mailmate/Tags.plist \ No newline at end of file From d5bf69d4be3e122476d4f40939305b4a0124deab Mon Sep 17 00:00:00 2001 From: Rene Koller Date: Sun, 8 Mar 2015 18:26:23 +0100 Subject: [PATCH 0301/1256] Add Support for Rubymine 7.x --- mackup/applications/rubymine.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/rubymine.cfg b/mackup/applications/rubymine.cfg index 2788194ca..64ae5c48c 100644 --- a/mackup/applications/rubymine.cfg +++ b/mackup/applications/rubymine.cfg @@ -8,3 +8,5 @@ Library/Application Support/RubyMine50 Library/Preferences/RubyMine50 Library/Application Support/RubyMine60 Library/Preferences/RubyMine60 +Library/Application Support/RubyMine70 +Library/Preferences/RubyMine70 From 1deae665aacfef1aa8d65eb559de3bf8988ba693 Mon Sep 17 00:00:00 2001 From: Joey Kaan Date: Mon, 9 Mar 2015 10:20:06 +0100 Subject: [PATCH 0302/1256] - Add support for Z: https://github.com/rupa/z --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/z.cfg | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/z.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a12a0e43..6f640eef7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Support for Z + ## Mackup 0.8.4 - Added support for PyCharm 4 (via @fcvarela) diff --git a/README.md b/README.md index 571102dcc..da5475ff5 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. - [XEmacs](http://www.xemacs.org/) - [XLD](http://tmkk.undo.jp/xld/) - [XtraFinder](http://www.trankynam.com/xtrafinder/) + - [Z](https://github.com/rupa/z) - [Zsh](http://zsh.sourceforge.net/) - iTunes Applescripts diff --git a/mackup/applications/z.cfg b/mackup/applications/z.cfg new file mode 100644 index 000000000..867c5237f --- /dev/null +++ b/mackup/applications/z.cfg @@ -0,0 +1,5 @@ +[application] +name = Z + +[configuration_files] +.z From 03eab45e180366c21e3d22a66ca6ea6ca12891cd Mon Sep 17 00:00:00 2001 From: bobwenx Date: Tue, 10 Mar 2015 23:16:43 +0800 Subject: [PATCH 0303/1256] add Arm(https://www.atagar.com/arm/) support. --- mackup/applications/arm.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/arm.cfg diff --git a/mackup/applications/arm.cfg b/mackup/applications/arm.cfg new file mode 100644 index 000000000..c2c5badee --- /dev/null +++ b/mackup/applications/arm.cfg @@ -0,0 +1,5 @@ +[application] +name = Arm + +[configuration_files] +.arm/armrc From 9f682a843bcf3878d2f57bc9cb88649f3b6dec67 Mon Sep 17 00:00:00 2001 From: bobwenx Date: Wed, 11 Mar 2015 10:15:34 +0800 Subject: [PATCH 0304/1256] add PR description. --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bfca745c..15e689c72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Added support for PyCharm 4 (via @fcvarela) +- Added support for Arm(via @bobwenx) ## Mackup 0.8.3 diff --git a/README.md b/README.md index 0ff45d538..a5d154d49 100644 --- a/README.md +++ b/README.md @@ -137,6 +137,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [aria2c](http://aria2.sourceforge.net/) - [Arara](http://cereda.github.io/arara/) - [Artistic Style](http://astyle.sourceforge.net) + - [Arm](https://www.atagar.com/arm/) - [asciinema](https://asciinema.org/) - [Aspell](http://aspell.net/) - [Atom](https://atom.io/) From 73ef48ac704155c22bb6e34c79560fa856b98c68 Mon Sep 17 00:00:00 2001 From: Stuart Powers Date: Wed, 11 Mar 2015 02:38:09 -0400 Subject: [PATCH 0305/1256] Minor typo fix --- mackup/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/utils.py b/mackup/utils.py index 591e5bb1b..56d22a53b 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -374,7 +374,7 @@ def can_file_be_synced_on_current_platform(path): """ Chec if the given path can be synced locally. - Check if it makes sens to sync the file at the given path on the current + Check if it makes sense to sync the file at the given path on the current platform. For now we don't sync any file in the ~/Library folder on GNU/Linux. There might be other exceptions in the future. From 9936a66c9ab29748abcb5294c2107d9eb94a5bf9 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 15 Mar 2015 14:49:24 -0400 Subject: [PATCH 0306/1256] More badges --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index da5475ff5..9964c76ab 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ Keep your application settings in sync. [![Circle CI](https://circleci.com/gh/lra/mackup.svg?style=shield)](https://circleci.com/gh/lra/mackup) [![Coverage Status](https://coveralls.io/repos/lra/mackup/badge.svg)](https://coveralls.io/r/lra/mackup) [![Code Health](https://landscape.io/github/lra/mackup/master/landscape.png)](https://landscape.io/github/lra/mackup/master) +[![Downloads](https://pypip.in/download/mackup/badge.svg?period=month)](https://pypi.python.org/pypi/mackup/) +[![Latest Version](https://pypip.in/version/mackup/badge.svg?text=version)](https://pypi.python.org/pypi/mackup/) ## Quickstart From cb36c2e3715990112501fa9955dea48cab1665d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= Date: Mon, 16 Mar 2015 00:36:59 +0100 Subject: [PATCH 0307/1256] pokerstars.cfg: added directories --- mackup/applications/pokerstars.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/pokerstars.cfg b/mackup/applications/pokerstars.cfg index de0fb0c7d..f1e72ee0b 100644 --- a/mackup/applications/pokerstars.cfg +++ b/mackup/applications/pokerstars.cfg @@ -2,7 +2,9 @@ name = PokerStars [configuration_files] +Library/Application Support/PokerStars Library/Preferences/com.pokerstars.user.ini Library/Preferences/com.pokerstars.PokerStars.plist +Library/Application Support/PokerStarsEU Library/Preferences/com.pokerstars.eu.user.ini Library/Preferences/com.pokerstars.PokerStarsEU.plist From 714368bd3359e2a6d78a3d3f04a0eb975b70e5ef Mon Sep 17 00:00:00 2001 From: Timidger Date: Mon, 16 Mar 2015 15:48:48 -0400 Subject: [PATCH 0308/1256] Added -v and --version flag to the command line interface for Mackup --- mackup/utils.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mackup/utils.py b/mackup/utils.py index 56d22a53b..c80ab3811 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -225,6 +225,9 @@ def parse_cmdline_args(): constants.UNINSTALL_MODE, constants.LIST_MODE], help=help_msg) + # Add the optional arg + parser.add_argument("-v", "--version", action="version", + version="Mackup {}".format(constants.VERSION)) # Parse the command line and return the parsed options return parser.parse_args() From 4ef7513f71f8269e99d419f8cf731310b53e00d0 Mon Sep 17 00:00:00 2001 From: Joey Kaan Date: Wed, 18 Mar 2015 20:08:25 +0100 Subject: [PATCH 0309/1256] - Add support for GMVault --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/gmvault.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/gmvault.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f640eef7..a2cbfba6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Support for Z +- Support for GMVault (via @jkaan) ## Mackup 0.8.4 diff --git a/README.md b/README.md index 9964c76ab..ed9ad6f30 100644 --- a/README.md +++ b/README.md @@ -200,6 +200,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Git](http://git-scm.com/) - [Gitbox](http://gitboxapp.com/) - [Gmail Notifr](http://ashchan.com/projects/gmail-notifr) + - [GMVault](http://gmvault.org/) - [Go2Shell](http://zipzapmac.com/Go2Shell) - [GnuPG](http://www.gnupg.org/) - [GrandTotal 3](http://www.mediaatelier.com/GrandTotal3/) diff --git a/mackup/applications/gmvault.cfg b/mackup/applications/gmvault.cfg new file mode 100644 index 000000000..afb0d7d72 --- /dev/null +++ b/mackup/applications/gmvault.cfg @@ -0,0 +1,5 @@ +[application] +name = GMVault + +[configuration_files] +.gmvault/gmvault_defaults.conf From d280abb424223f2768c5288a645d76dc8bfbc596 Mon Sep 17 00:00:00 2001 From: Daniel Suo Date: Sat, 21 Mar 2015 11:39:29 -0400 Subject: [PATCH 0310/1256] Create matlab.cfg --- mackup/applications/matlab.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/matlab.cfg diff --git a/mackup/applications/matlab.cfg b/mackup/applications/matlab.cfg new file mode 100644 index 000000000..878f15ecb --- /dev/null +++ b/mackup/applications/matlab.cfg @@ -0,0 +1,5 @@ +[application] +name = MATLAB + +[configuration_files] +.matlab From eb43b8dfbfb094deda9f9e3e02fcaa299e3311ff Mon Sep 17 00:00:00 2001 From: Daniel Suo Date: Sat, 21 Mar 2015 11:40:32 -0400 Subject: [PATCH 0311/1256] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ed9ad6f30..e1dcca976 100644 --- a/README.md +++ b/README.md @@ -242,6 +242,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Magic Launch](https://www.oneperiodic.com/products/magiclaunch/) - [MagicPrefs](http://magicprefs.com/) - [Mailplane](http://mailplaneapp.com/) + - [MATLAB](http://www.mathworks.com/products/matlab/) - [Maven](http://maven.apache.org) - [Max](http://sbooth.org/Max/) - [MenuMeters](http://www.ragingmenace.com/software/menumeters/) From 78a88d582ee48da00477dc3cd469fe68318ff5d0 Mon Sep 17 00:00:00 2001 From: Daniel Suo Date: Sat, 21 Mar 2015 11:41:26 -0400 Subject: [PATCH 0312/1256] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2cbfba6d..5635a6c00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Support for Z - Support for GMVault (via @jkaan) +- Support for MATLAB (via @danielsuo) ## Mackup 0.8.4 From 1bdcb52856fbb3248393cfa10ae9bf92cbd83a74 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 21 Mar 2015 15:35:01 -0400 Subject: [PATCH 0313/1256] Use docopt for the CLI to prepare for future features --- CHANGELOG.md | 4 +++- mackup/constants.py | 12 ---------- mackup/main.py | 58 +++++++++++++++++++++++---------------------- mackup/utils.py | 47 ------------------------------------ setup.py | 1 + tests/utils_test.py | 19 --------------- 6 files changed, 34 insertions(+), 107 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5635a6c00..05f7323d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,11 @@ ## WIP -- Support for Z +- Support for Z (via @jkaan) - Support for GMVault (via @jkaan) - Support for MATLAB (via @danielsuo) +- Add a --version parameter (via @Timidger) +- Use docopt for the CLI to prepare for future features ## Mackup 0.8.4 diff --git a/mackup/constants.py b/mackup/constants.py index 127c2842b..b095728e3 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -2,18 +2,6 @@ # Current version VERSION = '0.8.4' -# Mode used to list supported applications -LIST_MODE = 'list' - -# Mode used to backup files to Dropbox -BACKUP_MODE = 'backup' - -# Mode used to restore files from Dropbox -RESTORE_MODE = 'restore' - -# Mode used to remove Mackup and reset and config file -UNINSTALL_MODE = 'uninstall' - # Support platforms PLATFORM_DARWIN = 'Darwin' PLATFORM_LINUX = 'Linux' diff --git a/mackup/main.py b/mackup/main.py index c26c715af..1cb45afe6 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -1,29 +1,33 @@ -""" -Keep your application settings in sync. - -Copyright (C) 2013 Laurent Raufaste +"""Mackup. -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Keep your application settings in sync. +Copyright (C) 2013-2015 Laurent Raufaste + +Usage: + mackup list + mackup backup + mackup restore + mackup uninstall + mackup (-h | --help) + mackup --version + +Options: + -h --help Show this screen. + --version Show version. + +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. + 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. -You should have received a copy of the GNU General Public License -along with this program. If not, see . """ +from docopt import docopt from .appsdb import ApplicationsDatabase from .application import ApplicationProfile -from .constants import (BACKUP_MODE, - RESTORE_MODE, - UNINSTALL_MODE, - LIST_MODE, - VERSION, - MACKUP_APP_NAME) +from .constants import MACKUP_APP_NAME, VERSION from .mackup import Mackup from . import utils @@ -31,12 +35,12 @@ def main(): """Main function.""" # Get the command line arg - args = utils.parse_cmdline_args() + args = docopt(__doc__, version="Mackup {}".format(VERSION)) mckp = Mackup() app_db = ApplicationsDatabase() - if args.mode == BACKUP_MODE: + if args['backup']: # Check the env where the command is being run mckp.check_for_usable_backup_env() @@ -45,7 +49,7 @@ def main(): app = ApplicationProfile(mckp, app_db.get_files(app_name)) app.backup() - elif args.mode == RESTORE_MODE: + elif args['restore']: # Check the env where the command is being run mckp.check_for_usable_restore_env() @@ -69,7 +73,7 @@ def main(): app = ApplicationProfile(mckp, app_db.get_files(app_name)) app.restore() - elif args.mode == UNINSTALL_MODE: + elif args['uninstall']: # Check the env where the command is being run mckp.check_for_usable_restore_env() @@ -104,7 +108,7 @@ def main(): "\n" "Thanks for using Mackup !") - elif args.mode == LIST_MODE: + elif args['list']: # Display the list of supported applications mckp.check_for_usable_environment() output = "Supported applications:\n" @@ -114,8 +118,6 @@ def main(): output += ("{} applications supported in Mackup v{}" .format(len(app_db.get_app_names()), VERSION)) print(output) - else: - raise ValueError("Unsupported mode: {}".format(args.mode)) # Delete the tmp folder mckp.clean_temp_folder() diff --git a/mackup/utils.py b/mackup/utils.py index c80ab3811..25a2ea8f6 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -1,5 +1,4 @@ """System static utilities being used by the modules.""" -import argparse import base64 import os import platform @@ -187,52 +186,6 @@ def error(message): sys.exit(fail + "Error: {}".format(message) + end) -def parse_cmdline_args(): - """ - Setup the engine that's gonna parse the command line arguments. - - Returns: - (argparse.Namespace) - """ - # Format the description text - description = ("Mackup {}\n" - "Keep your application settings in sync.\n" - "Copyright (C) 2013-2014 Laurent Raufaste" - " \n" - .format(constants.VERSION)) - - # Format some epilog text - epilog = ("Mackup modes of action:\n" - " - backup: sync your conf files to your synced storage, use" - " this the 1st time you use Mackup.\n" - " - restore: link the conf files already in your synced storage" - " on your system, use it on any new system you use.\n" - " - uninstall: reset everything as it was before using Mackup.\n" - " - list: display a list of all supported applications.\n") - - help_msg = "Required action mode for Mackup, see below for details." - - # Setup the global parser - parser = argparse.ArgumentParser( - description=description, - epilog=epilog, - formatter_class=argparse.RawDescriptionHelpFormatter) - - # Add the required arg - parser.add_argument("mode", - choices=[constants.BACKUP_MODE, - constants.RESTORE_MODE, - constants.UNINSTALL_MODE, - constants.LIST_MODE], - help=help_msg) - # Add the optional arg - parser.add_argument("-v", "--version", action="version", - version="Mackup {}".format(constants.VERSION)) - - # Parse the command line and return the parsed options - return parser.parse_args() - - def get_dropbox_folder_location(): """ Try to locate the Dropbox folder. diff --git a/setup.py b/setup.py index 1e2b644ea..197746446 100644 --- a/setup.py +++ b/setup.py @@ -13,6 +13,7 @@ keywords='configuration config dotfiles sync backup dropbox gdrive', license='GPLv3', packages=['mackup'], + install_requires=['docopt'], entry_points={ 'console_scripts': [ 'mackup=mackup.main:main', diff --git a/tests/utils_test.py b/tests/utils_test.py index 6377de893..b899773fd 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -284,25 +284,6 @@ def test_error(self): test_string = "Hello World" self.assertRaises(SystemExit, utils.error, test_string) - def test_parse_cmdline_args(self): - # /dev/null to throwaway the error - dev_null = open(os.devnull, 'wb') - modes = [utils.constants.BACKUP_MODE, - utils.constants.RESTORE_MODE, - utils.constants.UNINSTALL_MODE, - utils.constants.LIST_MODE] - - for mode in modes: - # Change the command line arguments to contain the correct mode - utils.sys.argv = ["the_program", mode] - expected_str = "Namespace(mode='{}')".format(mode) - assert str(utils.parse_cmdline_args()) == expected_str - - # Change the command line arguments to have an incorrect mode - utils.sys.argv = ["the_program", "some wrong mode"] - utils.sys.stderr = dev_null - self.assertRaises(SystemExit, utils.parse_cmdline_args) - def test_failed_backup_location(self): """ Tests for the error that should occur if the backup folder cannot be From 04ebb2790e3e78c60180e680dd1db5afb006ef42 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 21 Mar 2015 15:42:10 -0400 Subject: [PATCH 0314/1256] Mackup 0.8.5 --- CHANGELOG.md | 2 ++ doc/release.md | 8 ++++++++ mackup/constants.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 doc/release.md diff --git a/CHANGELOG.md b/CHANGELOG.md index f3098c327..30654f8ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.5 + - Support for Z (via @jkaan) - Support for GMVault (via @jkaan) - Support for MATLAB (via @danielsuo) diff --git a/doc/release.md b/doc/release.md new file mode 100644 index 000000000..14e05a18e --- /dev/null +++ b/doc/release.md @@ -0,0 +1,8 @@ +# 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. `make release` diff --git a/mackup/constants.py b/mackup/constants.py index b095728e3..852dfcc1a 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.4' +VERSION = '0.8.5' # Support platforms PLATFORM_DARWIN = 'Darwin' From 755fcd7ea0b77a99267c623444f4fd583afdcca4 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 21 Mar 2015 15:43:06 -0400 Subject: [PATCH 0315/1256] Forgot to push tags --- doc/release.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/release.md b/doc/release.md index 14e05a18e..ae6167c9a 100644 --- a/doc/release.md +++ b/doc/release.md @@ -5,4 +5,5 @@ 1. `git commit` with the message `Mackup X.Y.Z` 1. `git tag ` 1. `git push` + 1. `git push --tags` 1. `make release` From e90f9c04a59fe696133302cc641ac74754c0f33e Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 21 Mar 2015 15:45:06 -0400 Subject: [PATCH 0316/1256] changelog fix --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30654f8ab..5e1fd595c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ - Support for MATLAB (via @danielsuo) - Add a --version parameter (via @Timidger) - Use docopt for the CLI to prepare for future features -- Added support for Arm(via @bobwenx) +- Added support for Arm (via @bobwenx) ## Mackup 0.8.4 From 16b80fed4ecd6cafd61aceb2cb1cde751224af08 Mon Sep 17 00:00:00 2001 From: Jean-Christophe GAY Date: Sat, 28 Mar 2015 17:19:32 +0100 Subject: [PATCH 0317/1256] Backup Maven Toolchains configuration http://maven.apache.org/guides/mini/guide-using-toolchains.html --- CHANGELOG.md | 2 ++ mackup/applications/maven.cfg | 1 + 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e1fd595c..d6694b0d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Add toolchains.xml in Maven syncing (via @jcgay) + ## Mackup 0.8.5 - Support for Z (via @jkaan) diff --git a/mackup/applications/maven.cfg b/mackup/applications/maven.cfg index a557174d9..50e0dc4e3 100644 --- a/mackup/applications/maven.cfg +++ b/mackup/applications/maven.cfg @@ -3,3 +3,4 @@ name = Maven [configuration_files] .m2/settings.xml +.m2/toolchains.xml From 55dbdb23743022aaffae2d439d39bdbb19d9fc09 Mon Sep 17 00:00:00 2001 From: Wan Yi Date: Wed, 1 Apr 2015 09:37:05 +0800 Subject: [PATCH 0318/1256] WebStorm 10 support --- CHANGELOG.md | 1 + mackup/applications/webstorm-10.cfg | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 mackup/applications/webstorm-10.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index d6694b0d7..85ac0ab29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Add toolchains.xml in Maven syncing (via @jcgay) +- Added support of WebStorm 10 (via @morphinewan) ## Mackup 0.8.5 diff --git a/mackup/applications/webstorm-10.cfg b/mackup/applications/webstorm-10.cfg new file mode 100644 index 000000000..e6dae177a --- /dev/null +++ b/mackup/applications/webstorm-10.cfg @@ -0,0 +1,6 @@ +[application] +name = WebStorm 10 + +[configuration_files] +Library/Application Support/WebStorm10 +Library/Preferences/WebStorm10 From 1a620b916a1c261d37b7b03d11f2ee7d197faedc Mon Sep 17 00:00:00 2001 From: Esteban Date: Fri, 10 Apr 2015 14:10:51 -0300 Subject: [PATCH 0319/1256] KeePassX plist https://github.com/lra/mackup/pull/450 --- mackup/applications/keepassx.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/keepassx.cfg b/mackup/applications/keepassx.cfg index 413da10a6..aec5733bc 100644 --- a/mackup/applications/keepassx.cfg +++ b/mackup/applications/keepassx.cfg @@ -3,3 +3,4 @@ name = KeePassX [configuration_files] .keepassx +Library/Preferences/org.keepassx.keepassx.plist From aea87ef9eacbb6668e827ed0562590367a3c0ebd Mon Sep 17 00:00:00 2001 From: Yuvaraj Date: Sat, 11 Apr 2015 14:50:10 +0530 Subject: [PATCH 0320/1256] Added support for Gnome SSH Tunnel Manager --- mackup/applications/gstm.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/gstm.cfg diff --git a/mackup/applications/gstm.cfg b/mackup/applications/gstm.cfg new file mode 100644 index 000000000..daf733ba7 --- /dev/null +++ b/mackup/applications/gstm.cfg @@ -0,0 +1,5 @@ +[application] +name = Gnome SSH Tunnel Manager + +[configuration_files] +.gSTM \ No newline at end of file From c3c0315480b6012a4ea4a94bace163cffc3337f4 Mon Sep 17 00:00:00 2001 From: Yuvaraj Date: Sat, 11 Apr 2015 14:53:41 +0530 Subject: [PATCH 0321/1256] Updated CHANGELOG and README to reflect Gnome SSH Tunnel Manager Support --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85ac0ab29..68d721027 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Add toolchains.xml in Maven syncing (via @jcgay) - Added support of WebStorm 10 (via @morphinewan) +- Added support of Gnome SSH Tunnel Manager (via @skyrocknroll) ## Mackup 0.8.5 diff --git a/README.md b/README.md index 1977ae395..c89120d0e 100644 --- a/README.md +++ b/README.md @@ -205,6 +205,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Go2Shell](http://zipzapmac.com/Go2Shell) - [GnuPG](http://www.gnupg.org/) - [GrandTotal 3](http://www.mediaatelier.com/GrandTotal3/) + - [Gnome SSH Tunnel Manager](http://sourceforge.net/projects/gstm/) - [Hands Off!](http://www.oneperiodic.com/products/handsoff/) - [Hazel](http://www.noodlesoft.com/hazel.php) - [Heroku](https://www.heroku.com/) From 9c462436f87adf6912ae40182ffaaf4202f1c70b Mon Sep 17 00:00:00 2001 From: Yuvaraj Date: Sat, 11 Apr 2015 22:17:22 +0530 Subject: [PATCH 0322/1256] Added WhiteSpace --- mackup/applications/gstm.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/gstm.cfg b/mackup/applications/gstm.cfg index daf733ba7..4b17caf44 100644 --- a/mackup/applications/gstm.cfg +++ b/mackup/applications/gstm.cfg @@ -2,4 +2,4 @@ name = Gnome SSH Tunnel Manager [configuration_files] -.gSTM \ No newline at end of file +.gSTM From eae0424e440ac5b59a6a5c6b855c4fb95da91efc Mon Sep 17 00:00:00 2001 From: Joey Kaan Date: Sun, 12 Apr 2015 11:32:13 +0200 Subject: [PATCH 0323/1256] - Add support for Hammerspoon --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/hammerspoon.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/hammerspoon.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 68d721027..81f4b28ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Add toolchains.xml in Maven syncing (via @jcgay) - Added support of WebStorm 10 (via @morphinewan) - Added support of Gnome SSH Tunnel Manager (via @skyrocknroll) +- Added support for Hammerspoon (via @jkaan) ## Mackup 0.8.5 diff --git a/README.md b/README.md index c89120d0e..ac8476b45 100644 --- a/README.md +++ b/README.md @@ -206,6 +206,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [GnuPG](http://www.gnupg.org/) - [GrandTotal 3](http://www.mediaatelier.com/GrandTotal3/) - [Gnome SSH Tunnel Manager](http://sourceforge.net/projects/gstm/) + - [Hammerspoon](http://www.hammerspoon.org/) - [Hands Off!](http://www.oneperiodic.com/products/handsoff/) - [Hazel](http://www.noodlesoft.com/hazel.php) - [Heroku](https://www.heroku.com/) diff --git a/mackup/applications/hammerspoon.cfg b/mackup/applications/hammerspoon.cfg new file mode 100644 index 000000000..4ef7fe14a --- /dev/null +++ b/mackup/applications/hammerspoon.cfg @@ -0,0 +1,5 @@ +[application] +name = Hammerspoon + +[configuration_files] +.hammerspoon From 079ee4f4b15934f6103aeebcf331467d022ef040 Mon Sep 17 00:00:00 2001 From: Joseph Anthony Pasquale Holsten Date: Mon, 13 Apr 2015 14:28:03 -0700 Subject: [PATCH 0324/1256] x11: add Xmodmap & xinitrc --- mackup/applications/x11.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/x11.cfg b/mackup/applications/x11.cfg index 87a000725..e89fcd676 100644 --- a/mackup/applications/x11.cfg +++ b/mackup/applications/x11.cfg @@ -2,5 +2,7 @@ name = X11 [configuration_files] +.Xmodmap .Xresources .fonts +.xinitrc From ce693d5f692ea7e54e257db4e48a2fb9c09f42a5 Mon Sep 17 00:00:00 2001 From: Carlos Sanchez Date: Thu, 16 Apr 2015 17:28:29 +0200 Subject: [PATCH 0325/1256] Add support for Docker --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/docker.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/docker.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 81f4b28ad..692719217 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Added support for Docker (via @carlossg) - Add toolchains.xml in Maven syncing (via @jcgay) - Added support of WebStorm 10 (via @morphinewan) - Added support of Gnome SSH Tunnel Manager (via @skyrocknroll) diff --git a/README.md b/README.md index ac8476b45..e7738f523 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. - [Default Folder X](http://www.stclairsoft.com/DefaultFolderX/) - [dig](http://en.wikipedia.org/wiki/Dig_(command)) - [Divvy](http://mizage.com/divvy/) + - [Docker](https://www.docker.com/) - [Dolphin](https://dolphin-emu.org/) - [Droplr](https://droplr.com/hello) - [Emacs](http://www.gnu.org/software/emacs/) diff --git a/mackup/applications/docker.cfg b/mackup/applications/docker.cfg new file mode 100644 index 000000000..f27502df6 --- /dev/null +++ b/mackup/applications/docker.cfg @@ -0,0 +1,5 @@ +[application] +name = Docker + +[configuration_files] +.dockercfg From ad70cb90e46abce48a59b3e2b83f93610e0d2401 Mon Sep 17 00:00:00 2001 From: Troy Wilson Date: Fri, 17 Apr 2015 10:56:49 -0500 Subject: [PATCH 0326/1256] Add support for Bitchx --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/bitchx.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/bitchx.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 692719217..05244f1b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,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_) ## Mackup 0.8.5 diff --git a/README.md b/README.md index e7738f523..1b47a108f 100644 --- a/README.md +++ b/README.md @@ -154,6 +154,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [BetterTouchTool](http://blog.boastr.net/) - [BibDesk](http://bibdesk.sourceforge.net/) - [Billings Pro Server Admin](https://www.marketcircle.com/billingspro/download/billingspro-server/) + - [Bitchx](https://github.com/TroyWilson1/) - [Boto](https://github.com/boto/boto) - [Brackets](http://brackets.io/) - [Bundler](http://bundler.io) diff --git a/mackup/applications/bitchx.cfg b/mackup/applications/bitchx.cfg new file mode 100644 index 000000000..3078d7a21 --- /dev/null +++ b/mackup/applications/bitchx.cfg @@ -0,0 +1,6 @@ +[application] +name = Bitchx + +[configuration_files] +.bitchxrc +.ircservers From 4ca8b68a1a147a13159ac19b61ed6ac34aa8074f Mon Sep 17 00:00:00 2001 From: Troy Wilson Date: Fri, 17 Apr 2015 11:07:05 -0500 Subject: [PATCH 0327/1256] Add support for LSColors --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/LSColors.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/LSColors.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 05244f1b5..5a03eb29c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Added support of Gnome SSH Tunnel Manager (via @skyrocknroll) - Added support for Hammerspoon (via @jkaan) - Added support for Bitchx (via @troywilson_) +- Added support for LSColors (via @troywilson_) ## Mackup 0.8.5 diff --git a/README.md b/README.md index 1b47a108f..a2d1c9748 100644 --- a/README.md +++ b/README.md @@ -242,6 +242,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [LimeChat](http://limechat.net/mac/) - [LittleSnitch](http://www.obdev.at/products/littlesnitch/) - [Livestreamer](http://livestreamer.tanuki.se/) + - [LSColors](https://github.com/TroyWilson1) - [MacOSX](http://www.apple.com/osx/) - [MacVim](https://code.google.com/p/macvim/) - [Magic Launch](https://www.oneperiodic.com/products/magiclaunch/) diff --git a/mackup/applications/LSColors.cfg b/mackup/applications/LSColors.cfg new file mode 100644 index 000000000..cc3f2e15d --- /dev/null +++ b/mackup/applications/LSColors.cfg @@ -0,0 +1,5 @@ +[application] +name = LSColors + +[configuration_files] +.dir_colors From 6d2c1ee1115a6676f561db4473a8f77854bf9380 Mon Sep 17 00:00:00 2001 From: Alberth Matos Date: Fri, 17 Apr 2015 13:57:33 -0400 Subject: [PATCH 0328/1256] Typo corrections --- CONTRIBUTING.md | 2 +- INSTALL.md | 2 +- README.md | 2 +- TODO.md | 2 +- doc/.mackup.cfg | 2 +- mackup/appsdb.py | 6 +++--- mackup/utils.py | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9f0d34a9e..5215a7fef 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,6 +7,6 @@ To speed up Pull Request (PR) approval and merger into Mackup, please follow the - Sync configurations should follow the follow principles: - Syncing should not break the application, and PRs should be tested - Syncing should not break any syncing functionality internal to the application - - The configuation should sync the minimal set of data, so that syncing happens quickly. Leave large app data out of the sync configuration. + - The configuration should sync the minimal set of data, so that syncing happens quickly. Leave large app data out of the sync configuration. Thank you for your contribution! diff --git a/INSTALL.md b/INSTALL.md index 8de3edb2a..84cf8d33b 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,4 +1,4 @@ -# Detailled install instructions for Mackup +# Detailed install instructions for Mackup There are 3 ways to run mackup diff --git a/README.md b/README.md index e7738f523..79b5e8bb0 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ mackup restore Done ! -You can find more detailled instructions in [INSTALL.md](INSTALL.md) +You can find more detailed instructions in [INSTALL.md](INSTALL.md) ## Usage diff --git a/TODO.md b/TODO.md index 9399e1721..a0050128d 100644 --- a/TODO.md +++ b/TODO.md @@ -11,7 +11,7 @@ Feel free to implement any of those ;) - Rollback any file that's not maintained by mackup anymore https://github.com/lra/mackup/issues/190 - Ability to encrypt specific files, asked in #134 and #109 -- Setup some webpage +- Setup some web page - Ability to enable/disable an app (will update the cfg file) - Progress bar on syncing - Invite the user to generate the conf file at launch if Mackup has no conf diff --git a/doc/.mackup.cfg b/doc/.mackup.cfg index 4e77ded0b..e100c03b7 100644 --- a/doc/.mackup.cfg +++ b/doc/.mackup.cfg @@ -23,7 +23,7 @@ engine = dropbox # If you want to specify another directory, you can use the "file_system" # engine and Mackup won't try to detect any path for you: it will store your -# files where you explicitely told him to, using the "path" setting. +# files where you explicitly told him to, using the "path" setting. # The "path" can be absolute (from the / of your drive) or relative to your # home directory. # The "path" setting is mandatory when using the "file_system" engine. diff --git a/mackup/appsdb.py b/mackup/appsdb.py index 86f7bb91b..4585c1f03 100644 --- a/mackup/appsdb.py +++ b/mackup/appsdb.py @@ -56,10 +56,10 @@ def __init__(self): @staticmethod def get_config_files(): """ - Return the application configuraion files. + Return the application configuration files. Return a list of configuration files describing the apps supported by - Mackup. The files return are absolute fullpath to those files. + Mackup. The files return 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 @@ -76,7 +76,7 @@ def get_config_files(): # List of stock application config files config_files = set() - # Temp list of user added app config filenames + # Temp list of user added app config file names custom_files = set() # Get the list of custom application config files first diff --git a/mackup/utils.py b/mackup/utils.py index 25a2ea8f6..cd23860fe 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -328,7 +328,7 @@ def remove_immutable_attribute(path): def can_file_be_synced_on_current_platform(path): """ - Chec if the given path can be synced locally. + Check if the given path can be synced locally. Check if it makes sense to sync the file at the given path on the current platform. From fc123f03f59143c1b436281c9a34c096671d09a6 Mon Sep 17 00:00:00 2001 From: Troy Wilson Date: Fri, 17 Apr 2015 13:50:14 -0500 Subject: [PATCH 0329/1256] Changed BitchX URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a2d1c9748..273b025b4 100644 --- a/README.md +++ b/README.md @@ -154,7 +154,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [BetterTouchTool](http://blog.boastr.net/) - [BibDesk](http://bibdesk.sourceforge.net/) - [Billings Pro Server Admin](https://www.marketcircle.com/billingspro/download/billingspro-server/) - - [Bitchx](https://github.com/TroyWilson1/) + - [Bitchx](https://github.com/BitchX/) - [Boto](https://github.com/boto/boto) - [Brackets](http://brackets.io/) - [Bundler](http://bundler.io) From 8a7edcff96f15883b59340ea8d454b04db741f38 Mon Sep 17 00:00:00 2001 From: Troy Wilson Date: Fri, 17 Apr 2015 13:52:02 -0500 Subject: [PATCH 0330/1256] Changed LSColors URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 273b025b4..53bfd76bc 100644 --- a/README.md +++ b/README.md @@ -242,7 +242,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [LimeChat](http://limechat.net/mac/) - [LittleSnitch](http://www.obdev.at/products/littlesnitch/) - [Livestreamer](http://livestreamer.tanuki.se/) - - [LSColors](https://github.com/TroyWilson1) + - [LSColors](https://github.com/trapd00r/LS_COLORS) - [MacOSX](http://www.apple.com/osx/) - [MacVim](https://code.google.com/p/macvim/) - [Magic Launch](https://www.oneperiodic.com/products/magiclaunch/) From c2fffbbe2d76d8e11a8a335314b91abd9e1d863e Mon Sep 17 00:00:00 2001 From: Troy Wilson Date: Fri, 17 Apr 2015 17:44:19 -0500 Subject: [PATCH 0331/1256] Removed LSColors & Updated Bitchx URL --- CHANGELOG.md | 1 - README.md | 3 +-- mackup/applications/LSColors.cfg | 5 ----- 3 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 mackup/applications/LSColors.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a03eb29c..05244f1b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,6 @@ - Added support of Gnome SSH Tunnel Manager (via @skyrocknroll) - Added support for Hammerspoon (via @jkaan) - Added support for Bitchx (via @troywilson_) -- Added support for LSColors (via @troywilson_) ## Mackup 0.8.5 diff --git a/README.md b/README.md index 53bfd76bc..495ccd27b 100644 --- a/README.md +++ b/README.md @@ -154,7 +154,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [BetterTouchTool](http://blog.boastr.net/) - [BibDesk](http://bibdesk.sourceforge.net/) - [Billings Pro Server Admin](https://www.marketcircle.com/billingspro/download/billingspro-server/) - - [Bitchx](https://github.com/BitchX/) + - [Bitchx](http://www.bitchx.org/) - [Boto](https://github.com/boto/boto) - [Brackets](http://brackets.io/) - [Bundler](http://bundler.io) @@ -242,7 +242,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [LimeChat](http://limechat.net/mac/) - [LittleSnitch](http://www.obdev.at/products/littlesnitch/) - [Livestreamer](http://livestreamer.tanuki.se/) - - [LSColors](https://github.com/trapd00r/LS_COLORS) - [MacOSX](http://www.apple.com/osx/) - [MacVim](https://code.google.com/p/macvim/) - [Magic Launch](https://www.oneperiodic.com/products/magiclaunch/) diff --git a/mackup/applications/LSColors.cfg b/mackup/applications/LSColors.cfg deleted file mode 100644 index cc3f2e15d..000000000 --- a/mackup/applications/LSColors.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[application] -name = LSColors - -[configuration_files] -.dir_colors From 616c9bbbfb929d39b4a613b175657b3bffa87dce Mon Sep 17 00:00:00 2001 From: chadluo Date: Sat, 18 Apr 2015 12:56:47 +1000 Subject: [PATCH 0332/1256] Added support for EditorConfig --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/editorconfig.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/editorconfig.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 05244f1b5..5c69607f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Added support of Gnome SSH Tunnel Manager (via @skyrocknroll) - Added support for Hammerspoon (via @jkaan) - Added support for Bitchx (via @troywilson_) +- Added support for EditorConfig (via @chadluo) ## Mackup 0.8.5 diff --git a/README.md b/README.md index ac27b14aa..b59c76924 100644 --- a/README.md +++ b/README.md @@ -186,6 +186,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Docker](https://www.docker.com/) - [Dolphin](https://dolphin-emu.org/) - [Droplr](https://droplr.com/hello) + - [EditorConfig](http://editorconfig.org/) - [Emacs](http://www.gnu.org/software/emacs/) - [Enjoyable](http://yukkurigames.com/enjoyable/) - [Exercism](http://exercism.io/) diff --git a/mackup/applications/editorconfig.cfg b/mackup/applications/editorconfig.cfg new file mode 100644 index 000000000..4ecaca784 --- /dev/null +++ b/mackup/applications/editorconfig.cfg @@ -0,0 +1,5 @@ +[application] +name = EditorConfig + +[configuration_files] +.editorconfig From 1c498df3907129259457bf41a0eae896912cfc16 Mon Sep 17 00:00:00 2001 From: Alberth Matos Date: Sun, 19 Apr 2015 22:00:23 -0400 Subject: [PATCH 0333/1256] Updated 1password-4.cfg Added Library/Preferences/com.agilebits.onepassword4.plist --- CHANGELOG.md | 1 + mackup/applications/1password-4.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c69607f5..86b5a121e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Added support for Hammerspoon (via @jkaan) - Added support for Bitchx (via @troywilson_) - Added support for EditorConfig (via @chadluo) +- Add com.agilebits.onepassword4.plist in 1Password (via @amatos) ## Mackup 0.8.5 diff --git a/mackup/applications/1password-4.cfg b/mackup/applications/1password-4.cfg index a826f137d..f6980587d 100644 --- a/mackup/applications/1password-4.cfg +++ b/mackup/applications/1password-4.cfg @@ -2,4 +2,5 @@ name = 1Password 4 [configuration_files] +Library/Preferences/com.agilebits.onepassword4.plist Library/Preferences/ws.agile.1Password.plist From 14a0a77dc5c3577a1f3ca9e5843c3b07f562abd1 Mon Sep 17 00:00:00 2001 From: Alberth Matos Date: Mon, 20 Apr 2015 10:52:59 -0400 Subject: [PATCH 0334/1256] Add support for versions created mackup/applications/versions.cfg, added versions entry to changelog.md --- CHANGELOG.md | 1 + mackup/applications/versions.cfg | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 mackup/applications/versions.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 86b5a121e..2c690d313 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - 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) ## Mackup 0.8.5 diff --git a/mackup/applications/versions.cfg b/mackup/applications/versions.cfg new file mode 100644 index 000000000..14a4e461e --- /dev/null +++ b/mackup/applications/versions.cfg @@ -0,0 +1,6 @@ +[application] +name = Versions + +[configuration_files] +Library/Application Support/Versions/License +Library/Preferences/com.blackpixel.versions.plist \ No newline at end of file From bd0f01c3e3ceae4c84c575138656574b86f6f56c Mon Sep 17 00:00:00 2001 From: Alberth Matos Date: Mon, 20 Apr 2015 10:52:59 -0400 Subject: [PATCH 0335/1256] Add support for versions created mackup/applications/versions.cfg, added versions entry to changelog.md, updated readme.md. --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/versions.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/versions.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 86b5a121e..2c690d313 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - 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) ## Mackup 0.8.5 diff --git a/README.md b/README.md index b59c76924..6ececf3cb 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. - [Übersicht](http://tracesof.net/uebersicht/) - [uTorrent](http://www.utorrent.com/) - [Ventrilo](http://www.ventrilo.com/) + - [Versions](http://www.versionsapp.com) - [Vim](http://www.vim.org/) - [Vimperator](http://www.vimperator.org/vimperator) - [Viscosity](http://www.sparklabs.com/viscosity/) diff --git a/mackup/applications/versions.cfg b/mackup/applications/versions.cfg new file mode 100644 index 000000000..14a4e461e --- /dev/null +++ b/mackup/applications/versions.cfg @@ -0,0 +1,6 @@ +[application] +name = Versions + +[configuration_files] +Library/Application Support/Versions/License +Library/Preferences/com.blackpixel.versions.plist \ No newline at end of file From fcbbdc45c63994a27819c8699a762fbad923432c Mon Sep 17 00:00:00 2001 From: Naidis Date: Tue, 21 Apr 2015 07:25:14 +0900 Subject: [PATCH 0336/1256] Added support for Gas Mask --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/gasmask.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/gasmask.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c690d313..cc52a12e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Added support for EditorConfig (via @chadluo) - Add com.agilebits.onepassword4.plist in 1Password (via @amatos) - Added support for Versions (via @amatos) +- Added support for Gas Mask (via @zanderzhng) ## Mackup 0.8.5 diff --git a/README.md b/README.md index 6ececf3cb..c56508a33 100644 --- a/README.md +++ b/README.md @@ -198,6 +198,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Flux](http://stereopsis.com/flux/) - [FontExplorer X](http://www.fontexplorerx.com/) - [ForkLift 2](http://www.binarynights.com/forklift/) + - [Gas Mask](https://github.com/2ndalpha/gasmask/) - [GeekTool](http://projects.tynsoe.org/en/geektool/) - [GHCi](http://www.haskell.org/haskellwiki/GHC/GHCi) - [Git Hooks](https://github.com/icefox/git-hooks) diff --git a/mackup/applications/gasmask.cfg b/mackup/applications/gasmask.cfg new file mode 100644 index 000000000..c62607bfc --- /dev/null +++ b/mackup/applications/gasmask.cfg @@ -0,0 +1,5 @@ +[application] +name = Gas Mask + +[configuration_files] +Library/Gas Mask From d376188a7b0b239152baaf9d0792423db30af7aa Mon Sep 17 00:00:00 2001 From: Naidis Date: Tue, 21 Apr 2015 17:44:27 +0900 Subject: [PATCH 0337/1256] Added configuration file of Gas Mask. --- mackup/applications/gasmask.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/gasmask.cfg b/mackup/applications/gasmask.cfg index c62607bfc..43332701a 100644 --- a/mackup/applications/gasmask.cfg +++ b/mackup/applications/gasmask.cfg @@ -3,3 +3,4 @@ name = Gas Mask [configuration_files] Library/Gas Mask +Library/Preferences/ee.clockwise.gmask.plist From c5dd7ea0056117c6961391276c7bb40da3de3925 Mon Sep 17 00:00:00 2001 From: Naidis Date: Tue, 21 Apr 2015 17:48:48 +0900 Subject: [PATCH 0338/1256] Added configs of mpv. --- mackup/applications/mpv.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mackup/applications/mpv.cfg b/mackup/applications/mpv.cfg index 64ddbaf87..f74f37f55 100644 --- a/mackup/applications/mpv.cfg +++ b/mackup/applications/mpv.cfg @@ -2,6 +2,10 @@ name = MPV [configuration_files] +.config/mpv/mpv.conf +.config/mpv/scripts +.config/mpv/input.conf +.config/mpv/watch_later .mpv/channels.conf .mpv/config .mpv/input.conf From dcca54d127a9bcd71abecbfe21fdff0f0c9112b3 Mon Sep 17 00:00:00 2001 From: Naidis Date: Tue, 21 Apr 2015 17:54:37 +0900 Subject: [PATCH 0339/1256] Update changelog. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc52a12e4..b6b4ba3da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ - Add com.agilebits.onepassword4.plist in 1Password (via @amatos) - Added support for Versions (via @amatos) - Added support for Gas Mask (via @zanderzhng) +- Add ee.clockwise.gmask.plist in Gas Mask (via @zanderzhng) +- Add configs for mpv (via @zanderzhng) ## Mackup 0.8.5 From 930c84b95d3897c71b24ba5ad99aa6cda2a7683e Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 21 Apr 2015 13:53:53 -0400 Subject: [PATCH 0340/1256] Removed broken support for Stickies and Z thx @zanderzhng --- CHANGELOG.md | 1 + README.md | 2 -- mackup/applications/stickies.cfg | 5 ----- mackup/applications/z.cfg | 5 ----- 4 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 mackup/applications/stickies.cfg delete mode 100644 mackup/applications/z.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index cc52a12e4..375363e00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Add com.agilebits.onepassword4.plist in 1Password (via @amatos) - Added support for Versions (via @amatos) - Added support for Gas Mask (via @zanderzhng) +- Removed broken support for Stickies and Z ## Mackup 0.8.5 diff --git a/README.md b/README.md index c56508a33..c3f1b6aa7 100644 --- a/README.md +++ b/README.md @@ -332,7 +332,6 @@ 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/) - - [Stickies](https://en.wikipedia.org/wiki/Stickies_%28software%29) - [Sublime Text](http://www.sublimetext.com/) - [Subversion](http://subversion.apache.org/) - [SuperDuper!](http://www.shirt-pocket.com/SuperDuper/SuperDuperDescription.html) @@ -367,7 +366,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [XEmacs](http://www.xemacs.org/) - [XLD](http://tmkk.undo.jp/xld/) - [XtraFinder](http://www.trankynam.com/xtrafinder/) - - [Z](https://github.com/rupa/z) - [Zsh](http://zsh.sourceforge.net/) - iTunes Applescripts diff --git a/mackup/applications/stickies.cfg b/mackup/applications/stickies.cfg deleted file mode 100644 index c4b02c066..000000000 --- a/mackup/applications/stickies.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[application] -name = Stickies - -[configuration_files] -Library/StickiesDatabase diff --git a/mackup/applications/z.cfg b/mackup/applications/z.cfg deleted file mode 100644 index 867c5237f..000000000 --- a/mackup/applications/z.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[application] -name = Z - -[configuration_files] -.z From cfc2764cd7fe38a4b8dbc3ff75b7990a13624dd8 Mon Sep 17 00:00:00 2001 From: Alberth Matos Date: Tue, 21 Apr 2015 16:39:37 -0400 Subject: [PATCH 0341/1256] Added support for Shimo added mackup/applications/shimo.cfg, updated changelog.md and readme.md --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/shimo.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/shimo.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bdbb778f..a0e664f55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Removed broken support for Stickies and Z - Add ee.clockwise.gmask.plist in Gas Mask (via @zanderzhng) - Add configs for mpv (via @zanderzhng) +- Added support for Shimo (via @amatos) ## Mackup 0.8.5 diff --git a/README.md b/README.md index c3f1b6aa7..66bb568fc 100644 --- a/README.md +++ b/README.md @@ -317,6 +317,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Seil](https://pqrs.org/macosx/keyremap4macbook/seil.html.en) - [Sequel Pro](http://www.sequelpro.com/) - [SHSH Blobs](http://en.wikipedia.org/wiki/SHSH_blob) + - [Shimo](http://www.chungwasoft.com/shimo/) - [Shuttle](http://fitztrev.github.io/shuttle/) - [SizeUp](http://www.irradiatedsoftware.com/sizeup/) - [Skim](http://skim-app.sourceforge.net/) diff --git a/mackup/applications/shimo.cfg b/mackup/applications/shimo.cfg new file mode 100644 index 000000000..8f8ffcef6 --- /dev/null +++ b/mackup/applications/shimo.cfg @@ -0,0 +1,6 @@ +[application] +name = Shimo + +[configuration_files] +Library/Application Support/Shimo/ShimoProfiles.xml +Library/Preferences/com.chungwasoft.Shimo.plist From 624061fdd8a22f58a1c2e46781feacd506ca5c5a Mon Sep 17 00:00:00 2001 From: Ronnie Moore Date: Tue, 21 Apr 2015 20:47:32 -0500 Subject: [PATCH 0342/1256] Added support for tvnamer --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/tvnamer.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/tvnamer.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bdbb778f..f8e0c21f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Removed broken support for Stickies and Z - Add ee.clockwise.gmask.plist in Gas Mask (via @zanderzhng) - Add configs for mpv (via @zanderzhng) +- Added support for tvnamer (via @ronniemoore) ## Mackup 0.8.5 diff --git a/README.md b/README.md index c3f1b6aa7..bccdf91c5 100644 --- a/README.md +++ b/README.md @@ -349,6 +349,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/) - [Twitterrific](http://twitterrific.com/) + - [tvnamer](https://github.com/dbr/tvnamer) - [Übersicht](http://tracesof.net/uebersicht/) - [uTorrent](http://www.utorrent.com/) - [Ventrilo](http://www.ventrilo.com/) diff --git a/mackup/applications/tvnamer.cfg b/mackup/applications/tvnamer.cfg new file mode 100644 index 000000000..f140dc1cb --- /dev/null +++ b/mackup/applications/tvnamer.cfg @@ -0,0 +1,5 @@ +[application] +name = tvnamer + +[configuration_files] +.tvnamer.json From 0f6b8164d5a37c4bc9b6b14ffa82738429fc13dd Mon Sep 17 00:00:00 2001 From: Alberth Matos Date: Wed, 22 Apr 2015 13:47:34 -0400 Subject: [PATCH 0343/1256] Added support for Royal TSX Added mackup/applications/royaltsx.cfg, updated changelog.md and readme.md --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/royaltsx.cfg | 7 +++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/royaltsx.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 0749bfc2b..aa2d59cbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Add configs for mpv (via @zanderzhng) - Added support for Shimo (via @amatos) - Added support for tvnamer (via @ronniemoore) +- Added support for Royal TSX (via @amatos) ## Mackup 0.8.5 diff --git a/README.md b/README.md index 923f31ac1..9298ed402 100644 --- a/README.md +++ b/README.md @@ -300,6 +300,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Rails](http://rubyonrails.org/) - [rTorrent](http://libtorrent.rakshasa.no/) - [R](http://www.r-project.org/) + - [Royal TSX](http://www.royaltsx.com/ts/osx/features) - [Rubocop](https://github.com/bbatsov/rubocop) - [Ruby Version](https://gist.github.com/fnichol/1912050) - [Ruby](http://ruby-lang.org/) diff --git a/mackup/applications/royaltsx.cfg b/mackup/applications/royaltsx.cfg new file mode 100644 index 000000000..cd49413b7 --- /dev/null +++ b/mackup/applications/royaltsx.cfg @@ -0,0 +1,7 @@ +[application] +name = Royal TSX + +[configuration_files] +Library/Application Support/Royal TSX/License.xml +Library/Application Support/Royal TSX/UserPreferences.config +Library/Preferences/com.lemonmojo.RoyalTSX.App.plist From 8813f9309ea1065f069a1292fd41ce1d5240f90c Mon Sep 17 00:00:00 2001 From: Daniel Suo Date: Wed, 22 Apr 2015 14:47:31 -0400 Subject: [PATCH 0344/1256] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 923f31ac1..f8f8e015b 100644 --- a/README.md +++ b/README.md @@ -144,6 +144,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Aspell](http://aspell.net/) - [Atom](https://atom.io/) - [AusKey](https://abr.gov.au/AUSkey/) + - [Autokey](https://code.google.com/p/autokey) - [Awareness](http://iamfutureproof.com/tools/awareness/) - [AWS Command Line Interface](https://aws.amazon.com/cli/) - [Microsoft Azure CLI](https://github.com/Azure/azure-xplat-cli) From f7b3b897301d199d398d8d588269295d299e1b93 Mon Sep 17 00:00:00 2001 From: Daniel Suo Date: Wed, 22 Apr 2015 14:47:56 -0400 Subject: [PATCH 0345/1256] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0749bfc2b..889428391 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Added support for Autokey (via @danielsuo) - Added support for Docker (via @carlossg) - Add toolchains.xml in Maven syncing (via @jcgay) - Added support of WebStorm 10 (via @morphinewan) From d70427aa7cc826402eb80c7b7bf7a71fbf8ead53 Mon Sep 17 00:00:00 2001 From: Daniel Suo Date: Wed, 22 Apr 2015 14:48:58 -0400 Subject: [PATCH 0346/1256] Create autokey.cfg --- mackup/applications/autokey.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/autokey.cfg diff --git a/mackup/applications/autokey.cfg b/mackup/applications/autokey.cfg new file mode 100644 index 000000000..3a9fc61f6 --- /dev/null +++ b/mackup/applications/autokey.cfg @@ -0,0 +1,5 @@ +[application] +name = Autokey + +[configuration_files] +.config/autokey From a175f83acad8ce86b0a937d3d018eee1df8aa55e Mon Sep 17 00:00:00 2001 From: USAMI Kosuke Date: Sat, 11 Apr 2015 13:12:41 +0900 Subject: [PATCH 0347/1256] Added support for CotEditor --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/coteditor.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/coteditor.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 17cde2bbb..80b586bab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Added support for Shimo (via @amatos) - Added support for tvnamer (via @ronniemoore) - Added support for Royal TSX (via @amatos) +- Added support for CotEditor (via @usami-k) ## Mackup 0.8.5 diff --git a/README.md b/README.md index 08f39b3b2..270e18c1f 100644 --- a/README.md +++ b/README.md @@ -178,6 +178,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Consular](https://github.com/achiu/consular) - [ControlPlane](http://www.controlplaneapp.com/) - [CoRD](http://cord.sourceforge.net/) + - [CotEditor](http://coteditor.com/) - [Cyberduck](http://cyberduck.ch/) - [Dash](http://kapeli.com/dash) - [Deal Alert](http://dealalertapp.com/) diff --git a/mackup/applications/coteditor.cfg b/mackup/applications/coteditor.cfg new file mode 100644 index 000000000..386391cc5 --- /dev/null +++ b/mackup/applications/coteditor.cfg @@ -0,0 +1,6 @@ +[application] +name = CotEditor + +[configuration_files] +Library/Application Support/CotEditor +Library/Preferences/com.coteditor.CotEditor.plist From 09ef27c471fac19d99ef380b196bc4fc17484c96 Mon Sep 17 00:00:00 2001 From: Kirill Korolyov Date: Sat, 25 Apr 2015 12:26:08 +0100 Subject: [PATCH 0348/1256] Add Lightroom 6 support --- mackup/applications/adobe-lightroom.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/adobe-lightroom.cfg b/mackup/applications/adobe-lightroom.cfg index 2b8df5920..40b9a84d9 100644 --- a/mackup/applications/adobe-lightroom.cfg +++ b/mackup/applications/adobe-lightroom.cfg @@ -7,3 +7,4 @@ Library/Preferences/com.adobe.Lightroom2.plist Library/Preferences/com.adobe.Lightroom3.plist Library/Preferences/com.adobe.Lightroom4.plist Library/Preferences/com.adobe.Lightroom5.plist +Library/Preferences/com.adobe.Lightroom6.plist From 06bccd8c504bd2d47620114b794cd999d080bb1f Mon Sep 17 00:00:00 2001 From: Scott Ames Date: Sun, 26 Apr 2015 20:50:58 -0700 Subject: [PATCH 0349/1256] Added support for xbindkeys --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/xbindkeys.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/xbindkeys.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 80b586bab..03a8906a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ - Added support for tvnamer (via @ronniemoore) - Added support for Royal TSX (via @amatos) - Added support for CotEditor (via @usami-k) +- Added support for xbindkeys (via @scottames) ## Mackup 0.8.5 diff --git a/README.md b/README.md index 270e18c1f..299e08c1e 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. - [Wget](https://www.gnu.org/software/wget/) - [Witch](http://manytricks.com/witch/) - [X11](http://www.x.org/) + - [XBindKeys](http://www.nongnu.org/xbindkeys/) - [Xchat](http://www.xchat.org/) - [XCode](https://developer.apple.com/xcode/) - [XEmacs](http://www.xemacs.org/) diff --git a/mackup/applications/xbindkeys.cfg b/mackup/applications/xbindkeys.cfg new file mode 100644 index 000000000..e64f2beb6 --- /dev/null +++ b/mackup/applications/xbindkeys.cfg @@ -0,0 +1,5 @@ +[application] +name = xbindkeys + +[configuration_files] +.xbindkeysrc \ No newline at end of file From 3167c23108a7b81c3eb6aaeb6d6f086128e51709 Mon Sep 17 00:00:00 2001 From: Scott Ames Date: Mon, 27 Apr 2015 10:55:03 -0700 Subject: [PATCH 0350/1256] Update xbindkeys.cfg New line at end of file --- mackup/applications/xbindkeys.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/xbindkeys.cfg b/mackup/applications/xbindkeys.cfg index e64f2beb6..64dd649ca 100644 --- a/mackup/applications/xbindkeys.cfg +++ b/mackup/applications/xbindkeys.cfg @@ -2,4 +2,4 @@ name = xbindkeys [configuration_files] -.xbindkeysrc \ No newline at end of file +.xbindkeysrc From 3fcfc3ea4010de9f9d54e8f99e7cda70c8f15339 Mon Sep 17 00:00:00 2001 From: Xiang Ji Date: Tue, 28 Apr 2015 18:51:13 +0800 Subject: [PATCH 0351/1256] Added support for Spacemacs --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/spacemacs.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/spacemacs.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 03a8906a5..42d2bbcf6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - Added support for Royal TSX (via @amatos) - Added support for CotEditor (via @usami-k) - Added support for xbindkeys (via @scottames) +- Added support for Spacemacs (via @x-ji) ## Mackup 0.8.5 diff --git a/README.md b/README.md index 299e08c1e..8d8bc4a96 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. - [Slogger](http://brettterpstra.com/projects/slogger/) - [Soulver](http://www.acqualia.com/soulver/) - [SourceTree](http://sourcetreeapp.com) + - [Spacemacs](https://github.com/syl20bnr/spacemacs) - [Spark](http://www.shadowlab.org/softwares/spark.php) - [Spectrwm](https://opensource.conformal.com/wiki/spectrwm) - [Spectacle](http://spectacleapp.com/) diff --git a/mackup/applications/spacemacs.cfg b/mackup/applications/spacemacs.cfg new file mode 100644 index 000000000..321df45c5 --- /dev/null +++ b/mackup/applications/spacemacs.cfg @@ -0,0 +1,5 @@ +[application] +name = Spacemacs + +[configuration_files] +.spacemacs From 04fd5d9f68f69edd2800c1613a2e75205ea800d7 Mon Sep 17 00:00:00 2001 From: Luis DeManuel Date: Wed, 29 Apr 2015 23:37:36 +0200 Subject: [PATCH 0352/1256] Add Visual Studio Code support --- mackup/applications/vscode.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/vscode.cfg diff --git a/mackup/applications/vscode.cfg b/mackup/applications/vscode.cfg new file mode 100644 index 000000000..498180f53 --- /dev/null +++ b/mackup/applications/vscode.cfg @@ -0,0 +1,5 @@ +[application] +name = vscode + +[configuration_files] +Library/Application Support/Code/User From ac0a9d5ca0752f6e8748c9daa3c6450674ff2cbb Mon Sep 17 00:00:00 2001 From: Luis DeManuel Date: Thu, 30 Apr 2015 00:20:36 +0200 Subject: [PATCH 0353/1256] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8d8bc4a96..ea2aeddd2 100644 --- a/README.md +++ b/README.md @@ -363,6 +363,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Vimperator](http://www.vimperator.org/vimperator) - [Viscosity](http://www.sparklabs.com/viscosity/) - [VLC](http://www.videolan.org/) + - [Visual Studio Code](https://code.visualstudio.com) - [WebStorm](https://www.jetbrains.com/webstorm/) - [Wget](https://www.gnu.org/software/wget/) - [Witch](http://manytricks.com/witch/) From ea6c989b597d8eb30d26dfea32cd8068720dcf8a Mon Sep 17 00:00:00 2001 From: Luis DeManuel Date: Thu, 30 Apr 2015 00:29:52 +0200 Subject: [PATCH 0354/1256] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42d2bbcf6..8f4b70da1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ - Added support for CotEditor (via @usami-k) - Added support for xbindkeys (via @scottames) - Added support for Spacemacs (via @x-ji) +- Added support for Visual Studio Code (via @luisdemanuel) ## Mackup 0.8.5 From 6123090d837299f558c73f1394b5f9e50a45660d Mon Sep 17 00:00:00 2001 From: Luis DeManuel Date: Thu, 30 Apr 2015 00:36:54 +0200 Subject: [PATCH 0355/1256] Show the full real name --- mackup/applications/vscode.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/vscode.cfg b/mackup/applications/vscode.cfg index 498180f53..d2ffcc4e2 100644 --- a/mackup/applications/vscode.cfg +++ b/mackup/applications/vscode.cfg @@ -1,5 +1,5 @@ [application] -name = vscode +name = Visual Studio Code [configuration_files] Library/Application Support/Code/User From 01b11390d03aeecf472d7a3b9b90a75a1d0d9253 Mon Sep 17 00:00:00 2001 From: Jean-Christophe GAY Date: Mon, 11 May 2015 21:49:06 +0200 Subject: [PATCH 0356/1256] Add support for Gradle http://gradle.org User specific configuration is described in the following sections: - http://gradle.org/docs/current/userguide/init_scripts.html - https://gradle.org/docs/current/userguide/build_environment.html --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/gradle.cfg | 7 +++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/gradle.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f4b70da1..7fabc3c84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ - Added support for xbindkeys (via @scottames) - Added support for Spacemacs (via @x-ji) - Added support for Visual Studio Code (via @luisdemanuel) +- Added support for Gradle (via @jcgay) ## Mackup 0.8.5 diff --git a/README.md b/README.md index ea2aeddd2..2a1b84377 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. - [Go2Shell](http://zipzapmac.com/Go2Shell) - [GnuPG](http://www.gnupg.org/) - [GrandTotal 3](http://www.mediaatelier.com/GrandTotal3/) + - [Gradle](http://gradle.org) - [Gnome SSH Tunnel Manager](http://sourceforge.net/projects/gstm/) - [Hammerspoon](http://www.hammerspoon.org/) - [Hands Off!](http://www.oneperiodic.com/products/handsoff/) diff --git a/mackup/applications/gradle.cfg b/mackup/applications/gradle.cfg new file mode 100644 index 000000000..8cc0167e2 --- /dev/null +++ b/mackup/applications/gradle.cfg @@ -0,0 +1,7 @@ +[application] +name = Gradle + +[configuration_files] +.gradle/gradle.properties +.gradle/init.gradle +.gradle/init.d From 9f7168ac723a1d74603cd3eaa34aa306c228c949 Mon Sep 17 00:00:00 2001 From: mabeltron Date: Tue, 12 May 2015 23:53:17 +0100 Subject: [PATCH 0357/1256] Copy returns incorrect error "Unable to find your Google Drive install =(" replaced with "Unable to find your Copy install =(" although it won't work with Linux anyway. --- mackup/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/utils.py b/mackup/utils.py index cd23860fe..59dac7a6e 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -258,7 +258,7 @@ def get_copy_folder_location(): cur.close() if not copy_home: - error("Unable to find your Google Drive install =(") + error("Unable to find your Copy install =(") return copy_home From 043f2a9d25b278b2425087e546222bc7eeb0b406 Mon Sep 17 00:00:00 2001 From: Frederick Wagner Date: Sat, 16 May 2015 22:02:17 -0400 Subject: [PATCH 0358/1256] Add warnings to README and --help about syncing private keys. This should really become non-default behavior, per #109 and #512, but in the meantime let's at least warn users who might not like it. --- README.md | 4 ++-- mackup/main.py | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2a1b84377..98c8e94e9 100644 --- a/README.md +++ b/README.md @@ -209,7 +209,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/) - [Go2Shell](http://zipzapmac.com/Go2Shell) - - [GnuPG](http://www.gnupg.org/) + - [GnuPG](http://www.gnupg.org/) (NOTE: includes private keys) - [GrandTotal 3](http://www.mediaatelier.com/GrandTotal3/) - [Gradle](http://gradle.org) - [Gnome SSH Tunnel Manager](http://sourceforge.net/projects/gstm/) @@ -276,7 +276,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Oh My Zsh](https://github.com/robbyrussell/oh-my-zsh) - [OmniFocus](http://www.omnigroup.com/products/omnifocus/) - [OmniGraffle](http://www.omnigroup.com/omnigraffle/) - - [OpenSSH](http://www.openssh.org/) + - [OpenSSH](http://www.openssh.org/) (NOTE: includes private keys) - [Pass](http://www.passwordstore.org/) - [Pastebot](http://tapbots.com/software/pastebot/) - [Path Finder](http://www.cocoatech.com/pathfinder/) diff --git a/mackup/main.py b/mackup/main.py index 1cb45afe6..0a5708259 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -18,11 +18,18 @@ 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. + you use Mackup. (Note that by default this will sync private keys used by + OpenSSH and GnuPG.) 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 (including private keys!) via +Dropbox, but may be configured to exclude applications or use a different +backend with a .mackup.cfg file. + +See https://github.com/lra/mackup/tree/master/doc for more information. + """ from docopt import docopt from .appsdb import ApplicationsDatabase From e17da89f42382fe5782932dfdad4bf51e5c0faf4 Mon Sep 17 00:00:00 2001 From: TrigonaMinima Date: Wed, 20 May 2015 00:24:40 +0530 Subject: [PATCH 0359/1256] Python strings In python3 conversion of byte strings to strings happens with decode("utf-8"). Added a check for python 3 and added the conversion part. --- mackup/config.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mackup/config.py b/mackup/config.py index 34317b197..04670fdd1 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -2,6 +2,7 @@ import os import os.path +import sys from .constants import (MACKUP_BACKUP_PATH, MACKUP_CONFIG_FILE, @@ -206,7 +207,11 @@ def _parse_path(self): raise ConfigError("The required 'path' can't be found while" " the 'file_system' engine is used.") - return str(path) + # Python 2 and python 3 byte strings are different. + if sys.version_info[0] < 3: + return str(path) + else: + return path.decode("utf-8") def _parse_directory(self): """ From eba62c6168e2bc148cfb917512a82d33aab3bc15 Mon Sep 17 00:00:00 2001 From: TrigonaMinima Date: Wed, 20 May 2015 00:28:43 +0530 Subject: [PATCH 0360/1256] Python3 input The python3 hack was not working in my case. So, the check for the python version was added and the respective input function was used. --- mackup/utils.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mackup/utils.py b/mackup/utils.py index 59dac7a6e..44f1cbff2 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -22,13 +22,12 @@ def confirm(question): (boolean): Confirmed or not """ while True: - # Python 3 hack - try: - input = raw_input - except NameError: - pass + # Python 3 check + if sys.version_info[0] < 3: + answer = raw_input(question + ' ').lower() + else: + answer = input(question + ' ').lower() - answer = input(question + ' ').lower() if answer == 'yes' or answer == 'y': confirmed = True break From 949f8e6089f380da0387328503bc1645742b0c8a Mon Sep 17 00:00:00 2001 From: TrigonaMinima Date: Wed, 20 May 2015 14:08:39 +0530 Subject: [PATCH 0361/1256] Single return --- mackup/config.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mackup/config.py b/mackup/config.py index 04670fdd1..984a3c92e 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -209,9 +209,11 @@ def _parse_path(self): # Python 2 and python 3 byte strings are different. if sys.version_info[0] < 3: - return str(path) + path = str(path) else: - return path.decode("utf-8") + path = path.decode("utf-8") + + return path def _parse_directory(self): """ From 91d8a1dd8ae4c0a38db1dd98b5bb1ee852aa47cf Mon Sep 17 00:00:00 2001 From: Brandon Harper Date: Wed, 27 May 2015 22:45:29 -0600 Subject: [PATCH 0362/1256] Adding support for Capture One, a professional photography processing tool --- mackup/applications/capture-one.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/capture-one.cfg diff --git a/mackup/applications/capture-one.cfg b/mackup/applications/capture-one.cfg new file mode 100644 index 000000000..1080a6398 --- /dev/null +++ b/mackup/applications/capture-one.cfg @@ -0,0 +1,5 @@ +[application] +name = Capture One + +[configuration_files] +Library/Application Support/Capture One From f18f927e7f9bf61e842910aa818e8985fad7cbca Mon Sep 17 00:00:00 2001 From: Brandon Harper Date: Wed, 27 May 2015 22:53:20 -0600 Subject: [PATCH 0363/1256] Adding changes for the addition of Capture One --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fabc3c84..41a1199ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ - Added support for Spacemacs (via @x-ji) - Added support for Visual Studio Code (via @luisdemanuel) - Added support for Gradle (via @jcgay) +- Added support for Capture One (via @devnulled) ## Mackup 0.8.5 diff --git a/README.md b/README.md index 98c8e94e9..46e8ec66a 100644 --- a/README.md +++ b/README.md @@ -161,6 +161,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/) + - [Capture One](http://www.phaseone.com/Imaging-Software/Capture-One.aspx) - [Cartographica](http://www.macgis.com) - [Charles](http://www.charlesproxy.com) - [Chef](http://www.opscode.com/chef/) From 562aa55ef52ac6c2b43c36db1afc1861cd231907 Mon Sep 17 00:00:00 2001 From: Roderik van der Veer Date: Sat, 30 May 2015 13:19:58 +0200 Subject: [PATCH 0364/1256] The current version of Mailplane has a "3" in the filename plist --- mackup/applications/mailplane.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/mailplane.cfg b/mackup/applications/mailplane.cfg index 074a3f31a..045563c20 100644 --- a/mackup/applications/mailplane.cfg +++ b/mackup/applications/mailplane.cfg @@ -2,4 +2,4 @@ name = Mailplane [configuration_files] -Library/Preferences/com.mailplaneapp.Mailplane.plist +Library/Preferences/com.mailplaneapp.Mailplane3.plist From b2c19b80ca60df48b70737e5895d73eac12df565 Mon Sep 17 00:00:00 2001 From: Roderik van der Veer Date: Sat, 30 May 2015 21:20:20 +0200 Subject: [PATCH 0365/1256] Support both version 2 and 3 --- mackup/applications/mailplane.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/mailplane.cfg b/mackup/applications/mailplane.cfg index 045563c20..4374f663b 100644 --- a/mackup/applications/mailplane.cfg +++ b/mackup/applications/mailplane.cfg @@ -2,4 +2,5 @@ name = Mailplane [configuration_files] +Library/Preferences/com.mailplaneapp.Mailplane.plist Library/Preferences/com.mailplaneapp.Mailplane3.plist From 2840c3b1bfde1c15f06400d30870c274e7f601c4 Mon Sep 17 00:00:00 2001 From: Roderik van der Veer Date: Sat, 30 May 2015 21:21:40 +0200 Subject: [PATCH 0366/1256] Add the Mailplane v3 support to the changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41a1199ef..8ca16378b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - Added support for Visual Studio Code (via @luisdemanuel) - Added support for Gradle (via @jcgay) - Added support for Capture One (via @devnulled) +- Addes support for version 3 of Mailplane (via @roderik) ## Mackup 0.8.5 From 35dd07f91b5aadbca1e2d1dcd60fa19bcb9382f9 Mon Sep 17 00:00:00 2001 From: TrigonaMinima Date: Tue, 2 Jun 2015 19:26:17 +0530 Subject: [PATCH 0367/1256] Improved the current transmission support. Now, working in Linux where configurations are saved in ```.config/transmission``` --- CHANGELOG.md | 3 ++- mackup/applications/transmission.cfg | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ca16378b..059fd7393 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,8 @@ - Added support for Visual Studio Code (via @luisdemanuel) - Added support for Gradle (via @jcgay) - Added support for Capture One (via @devnulled) -- Addes support for version 3 of Mailplane (via @roderik) +- Added support for version 3 of Mailplane (via @roderik) +- Improved Transmission support (via @TrigonaMinima) ## Mackup 0.8.5 diff --git a/mackup/applications/transmission.cfg b/mackup/applications/transmission.cfg index c4daa5687..20f503b21 100644 --- a/mackup/applications/transmission.cfg +++ b/mackup/applications/transmission.cfg @@ -4,3 +4,8 @@ name = Transmission [configuration_files] Library/Preferences/org.m0k.transmission.plist Library/Application Support/Transmission/blocklists +.config/transmission/blocklists +.config/transmission/resume +.config/transmission/torrents +.config/transmission/settings.json +.config/transmission/stats.json From 02eb8ac576377bda711aa076898712bded67671c Mon Sep 17 00:00:00 2001 From: TrigonaMinima Date: Tue, 2 Jun 2015 23:16:04 +0530 Subject: [PATCH 0368/1256] Removed folders which contained binary files. --- mackup/applications/transmission.cfg | 2 -- 1 file changed, 2 deletions(-) diff --git a/mackup/applications/transmission.cfg b/mackup/applications/transmission.cfg index 20f503b21..ff882713c 100644 --- a/mackup/applications/transmission.cfg +++ b/mackup/applications/transmission.cfg @@ -5,7 +5,5 @@ name = Transmission Library/Preferences/org.m0k.transmission.plist Library/Application Support/Transmission/blocklists .config/transmission/blocklists -.config/transmission/resume -.config/transmission/torrents .config/transmission/settings.json .config/transmission/stats.json From 2080c4a5fc155d6105f5eaec82afb79e3d19bdac Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 2 Jun 2015 18:24:16 -0400 Subject: [PATCH 0369/1256] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 46e8ec66a..db88f7347 100644 --- a/README.md +++ b/README.md @@ -59,8 +59,7 @@ Restore your application settings on a newly installed workstation. `mackup uninstall` -Revert any synced config file to its original state, and delete the Mackup -folder in Dropbox. This will revert your system at pre-Mackup state. +Copy back any synced config file to its original place. `mackup list` From b9d8944b970272c6011e2f94740430ef516ce5e6 Mon Sep 17 00:00:00 2001 From: TrigonaMinima Date: Tue, 2 Jun 2015 19:46:32 +0530 Subject: [PATCH 0370/1256] Added support for Nomacs https://github.com/nomacs/nomacs --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/nomacs.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/nomacs.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 059fd7393..04e46b219 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Added support for Capture One (via @devnulled) - Added support for version 3 of Mailplane (via @roderik) - Improved Transmission support (via @TrigonaMinima) +- Added support for Nomacs (via @TrigonaMinima) ## Mackup 0.8.5 diff --git a/README.md b/README.md index db88f7347..d303675c5 100644 --- a/README.md +++ b/README.md @@ -269,6 +269,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [ncmpcpp](http://ncmpcpp.rybczak.net) - [newsbeuter](http://newsbeuter.org/) - [ngrok](https://ngrok.com/) + - [Nomacs](https://github.com/nomacs/nomacs) - [npm](https://www.npmjs.com/) - [nvALT](http://brettterpstra.com/projects/nvalt/) - [nvpy](https://github.com/cpbotha/nvpy) diff --git a/mackup/applications/nomacs.cfg b/mackup/applications/nomacs.cfg new file mode 100644 index 000000000..9ac8ed40a --- /dev/null +++ b/mackup/applications/nomacs.cfg @@ -0,0 +1,5 @@ +[application] +name = Nomacs + +[configuration_files] +.config/nomacs From fbc3750268b51760e23bba5c10204df19e82c42e Mon Sep 17 00:00:00 2001 From: TrigonaMinima Date: Tue, 2 Jun 2015 21:54:07 +0530 Subject: [PATCH 0371/1256] Linked to homepage --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d303675c5..9da453683 100644 --- a/README.md +++ b/README.md @@ -269,7 +269,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [ncmpcpp](http://ncmpcpp.rybczak.net) - [newsbeuter](http://newsbeuter.org/) - [ngrok](https://ngrok.com/) - - [Nomacs](https://github.com/nomacs/nomacs) + - [Nomacs](http://nomacs.org/) - [npm](https://www.npmjs.com/) - [nvALT](http://brettterpstra.com/projects/nvalt/) - [nvpy](https://github.com/cpbotha/nvpy) From 8889eb04a41949cfcec7d634f47d43e62e755d34 Mon Sep 17 00:00:00 2001 From: Ian Soper Date: Wed, 3 Jun 2015 15:32:48 -0400 Subject: [PATCH 0372/1256] Added Dropzone 3 support --- mackup/applications/dropzone.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/dropzone.cfg diff --git a/mackup/applications/dropzone.cfg b/mackup/applications/dropzone.cfg new file mode 100644 index 000000000..e22c8a4fc --- /dev/null +++ b/mackup/applications/dropzone.cfg @@ -0,0 +1,6 @@ +[application] +name = Dropzone 3 + +[configuration_files] +Library/Application Support/Dropzone 3 +Library/Preferences/com.aptonic.Dropzone3.plist From c192ae33b1fe8f323894412765b39ee66a94ba7e Mon Sep 17 00:00:00 2001 From: Ian Soper Date: Wed, 3 Jun 2015 23:19:15 -0400 Subject: [PATCH 0373/1256] Updated changelog and readme docs --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 059fd7393..63a3af1ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Added support for Dropzone 3 (via @iansoper) - Added support for Autokey (via @danielsuo) - Added support for Docker (via @carlossg) - Add toolchains.xml in Maven syncing (via @jcgay) diff --git a/README.md b/README.md index db88f7347..9527b89e1 100644 --- a/README.md +++ b/README.md @@ -188,6 +188,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Docker](https://www.docker.com/) - [Dolphin](https://dolphin-emu.org/) - [Droplr](https://droplr.com/hello) + - [Dropzone 3](https://aptonic.com/dropzone3/) - [EditorConfig](http://editorconfig.org/) - [Emacs](http://www.gnu.org/software/emacs/) - [Enjoyable](http://yukkurigames.com/enjoyable/) From 81156a809a3cc7d466558b11b009e79b296293b5 Mon Sep 17 00:00:00 2001 From: joaoponceleao Date: Thu, 4 Jun 2015 12:25:58 +0100 Subject: [PATCH 0374/1256] Added support for PyRadio --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/pyradio.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/pyradio.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 190fa8d30..cd3d0a05b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Added support for PyRadio (via @joaoponceleao) - Added support for Dropzone 3 (via @iansoper) - Added support for Autokey (via @danielsuo) - Added support for Docker (via @carlossg) diff --git a/README.md b/README.md index edbeb7eb8..2ed33b1ec 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. - [Punto Switcher](http://punto.yandex.ru/) - [PyCharm 4](https://www.jetbrains.com/pycharm/) - [PyPI](https://pypi.python.org/pypi) + - [PyRadio](https://github.com/coderholic/pyradio) - [Quicksilver](http://qsapp.com/) - [Rails](http://rubyonrails.org/) - [rTorrent](http://libtorrent.rakshasa.no/) diff --git a/mackup/applications/pyradio.cfg b/mackup/applications/pyradio.cfg new file mode 100644 index 000000000..029342dec --- /dev/null +++ b/mackup/applications/pyradio.cfg @@ -0,0 +1,5 @@ +[application] +name = PyRadio + +[configuration_files] +.pyradio/stations.csv From caa0252f839843177aa88b32166e3f07d1af8403 Mon Sep 17 00:00:00 2001 From: joaoponceleao Date: Thu, 4 Jun 2015 22:50:23 +0100 Subject: [PATCH 0375/1256] Changed homepage --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2ed33b1ec..d8fbf3dfc 100644 --- a/README.md +++ b/README.md @@ -301,7 +301,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Punto Switcher](http://punto.yandex.ru/) - [PyCharm 4](https://www.jetbrains.com/pycharm/) - [PyPI](https://pypi.python.org/pypi) - - [PyRadio](https://github.com/coderholic/pyradio) + - [PyRadio](http://www.coderholic.com/pyradio/) - [Quicksilver](http://qsapp.com/) - [Rails](http://rubyonrails.org/) - [rTorrent](http://libtorrent.rakshasa.no/) From 373f45275a885ad7988d9ea77fcc16f335a5fd9b Mon Sep 17 00:00:00 2001 From: Troy Murray Date: Thu, 4 Jun 2015 22:18:29 -0400 Subject: [PATCH 0376/1256] Add Microsoft Remote Desktop version 8 support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/microsoft-remote-desktop.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/microsoft-remote-desktop.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index cd3d0a05b..6df54fb51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ - Added support for version 3 of Mailplane (via @roderik) - Improved Transmission support (via @TrigonaMinima) - Added support for Nomacs (via @TrigonaMinima) +- Added support for version 8 of Microsoft Remote Desktop (via @tdm00) ## Mackup 0.8.5 diff --git a/README.md b/README.md index d8fbf3dfc..5625200ff 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. - [Mercurial](http://mercurial.selenic.com/) - [MercuryMover](http://www.heliumfoot.com/mercurymover/) - [Messages](http://www.apple.com/osx/apps/#messages) + - [Microsoft Remote Desktop](https://itunes.apple.com/us/app/microsoft-remote-desktop/id715768417?mt=12&ls=1) - [MySQL](http://www.mysql.com/) - [Moom](http://manytricks.com/moom/) - [Mou](http://mouapp.com/) diff --git a/mackup/applications/microsoft-remote-desktop.cfg b/mackup/applications/microsoft-remote-desktop.cfg new file mode 100644 index 000000000..2cef80ba3 --- /dev/null +++ b/mackup/applications/microsoft-remote-desktop.cfg @@ -0,0 +1,5 @@ +[application] +name = Microsoft Remote Desktop + +[configuration_files] +Library/Containers/com.microsoft.rdc.mac/Data/Library/Preferences/com.microsoft.rdc.mac.plist \ No newline at end of file From 6dcfad4e2f6b5daa0562901a1b6fa51bbfe62b89 Mon Sep 17 00:00:00 2001 From: Troy Murray Date: Fri, 5 Jun 2015 07:35:05 -0400 Subject: [PATCH 0377/1256] Finish all the lines with a new line --- mackup/applications/microsoft-remote-desktop.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/microsoft-remote-desktop.cfg b/mackup/applications/microsoft-remote-desktop.cfg index 2cef80ba3..f68255870 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 \ No newline at end of file +Library/Containers/com.microsoft.rdc.mac/Data/Library/Preferences/com.microsoft.rdc.mac.plist From b6e415dd55e3135dd1cbcc5f59bf5de025351387 Mon Sep 17 00:00:00 2001 From: Ronnie Moore Date: Sat, 6 Jun 2015 13:15:22 -0500 Subject: [PATCH 0378/1256] Added DbVisualizer support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/dbvisualizer.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/dbvisualizer.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index cd3d0a05b..ba82e5143 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ - Added support for version 3 of Mailplane (via @roderik) - Improved Transmission support (via @TrigonaMinima) - Added support for Nomacs (via @TrigonaMinima) +- Added support for DbVisualizer (via @ronniemoore) ## Mackup 0.8.5 diff --git a/README.md b/README.md index d8fbf3dfc..e4aad0966 100644 --- a/README.md +++ b/README.md @@ -181,6 +181,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [CotEditor](http://coteditor.com/) - [Cyberduck](http://cyberduck.ch/) - [Dash](http://kapeli.com/dash) + - [DbVisualizer](https://www.dbvis.com/) - [Deal Alert](http://dealalertapp.com/) - [Default Folder X](http://www.stclairsoft.com/DefaultFolderX/) - [dig](http://en.wikipedia.org/wiki/Dig_(command)) diff --git a/mackup/applications/dbvisualizer.cfg b/mackup/applications/dbvisualizer.cfg new file mode 100644 index 000000000..375093a91 --- /dev/null +++ b/mackup/applications/dbvisualizer.cfg @@ -0,0 +1,5 @@ +[application] +name = DbVisualizer + +[configuration_files] +.dbvis From 432d310d1d0b449cbe18057e047470039e30098c Mon Sep 17 00:00:00 2001 From: TrigonaMinima Date: Mon, 8 Jun 2015 23:46:21 +0530 Subject: [PATCH 0379/1256] MusicBrainz support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/musicbrainz-picard.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/musicbrainz-picard.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ba82e5143..b3f35fbfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ - Improved Transmission support (via @TrigonaMinima) - Added support for Nomacs (via @TrigonaMinima) - Added support for DbVisualizer (via @ronniemoore) +- Added support for MusicBrainz Picard (via @TrigonaMinima) ## Mackup 0.8.5 diff --git a/README.md b/README.md index e4aad0966..39580a434 100644 --- a/README.md +++ b/README.md @@ -261,6 +261,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Mercurial](http://mercurial.selenic.com/) - [MercuryMover](http://www.heliumfoot.com/mercurymover/) - [Messages](http://www.apple.com/osx/apps/#messages) + - [MusicBrainz Picard](https://picard.musicbrainz.org/) - [MySQL](http://www.mysql.com/) - [Moom](http://manytricks.com/moom/) - [Mou](http://mouapp.com/) diff --git a/mackup/applications/musicbrainz-picard.cfg b/mackup/applications/musicbrainz-picard.cfg new file mode 100644 index 000000000..01fb730df --- /dev/null +++ b/mackup/applications/musicbrainz-picard.cfg @@ -0,0 +1,5 @@ +[application] +name = MusicBrainz Picard + +[configuration_files] +.config/MusicBrainz From 8913880d4fd819fcd7993c444579bcb71ab906bd Mon Sep 17 00:00:00 2001 From: Esteban Date: Tue, 9 Jun 2015 17:26:11 -0400 Subject: [PATCH 0380/1256] KeePassX v2 --- CHANGELOG.md | 1 + mackup/applications/keepassx.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3f35fbfc..bfcb00ff3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ - Added support for Nomacs (via @TrigonaMinima) - Added support for DbVisualizer (via @ronniemoore) - Added support for MusicBrainz Picard (via @TrigonaMinima) +- Extended KeePassX support for v2 (via @TCattd) ## Mackup 0.8.5 diff --git a/mackup/applications/keepassx.cfg b/mackup/applications/keepassx.cfg index aec5733bc..d475b80ce 100644 --- a/mackup/applications/keepassx.cfg +++ b/mackup/applications/keepassx.cfg @@ -4,3 +4,4 @@ name = KeePassX [configuration_files] .keepassx Library/Preferences/org.keepassx.keepassx.plist +Library/Application Support/keepassxkeepassx2.ini From d1f4381b11b4d6f4dee2519959b6b4af02857e43 Mon Sep 17 00:00:00 2001 From: Esteban Date: Tue, 9 Jun 2015 17:29:20 -0400 Subject: [PATCH 0381/1256] MailPlane 3 improved support --- CHANGELOG.md | 1 + mackup/applications/mailplane.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3f35fbfc..0996cfd7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ - Added support for Nomacs (via @TrigonaMinima) - Added support for DbVisualizer (via @ronniemoore) - Added support for MusicBrainz Picard (via @TrigonaMinima) +- Improved Mailplane 3 support (via @TCattd) ## Mackup 0.8.5 diff --git a/mackup/applications/mailplane.cfg b/mackup/applications/mailplane.cfg index 4374f663b..b7be52099 100644 --- a/mackup/applications/mailplane.cfg +++ b/mackup/applications/mailplane.cfg @@ -4,3 +4,4 @@ name = Mailplane [configuration_files] Library/Preferences/com.mailplaneapp.Mailplane.plist Library/Preferences/com.mailplaneapp.Mailplane3.plist +Library/Application Support/Mailplane 3 From 3cd682dc4d7960dfbb0988f2cd8bd9b5f9711569 Mon Sep 17 00:00:00 2001 From: Esteban Date: Wed, 10 Jun 2015 13:25:09 -0400 Subject: [PATCH 0382/1256] Just Accounts.xml --- mackup/applications/mailplane.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/mailplane.cfg b/mackup/applications/mailplane.cfg index b7be52099..be9240df7 100644 --- a/mackup/applications/mailplane.cfg +++ b/mackup/applications/mailplane.cfg @@ -4,4 +4,4 @@ name = Mailplane [configuration_files] Library/Preferences/com.mailplaneapp.Mailplane.plist Library/Preferences/com.mailplaneapp.Mailplane3.plist -Library/Application Support/Mailplane 3 +Library/Application Support/Mailplane 3/Accounts.xml From 7e097d6ab3ce7e718a66d116b4e7a1aeb9d4e47c Mon Sep 17 00:00:00 2001 From: Esteban Date: Wed, 10 Jun 2015 13:29:18 -0400 Subject: [PATCH 0383/1256] Merge branch 'master' into MailPlane-3 Conflicts: CHANGELOG.md --- CHANGELOG.md | 1 + mackup/applications/keepassx.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0996cfd7c..f00a27177 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ - Added support for Nomacs (via @TrigonaMinima) - Added support for DbVisualizer (via @ronniemoore) - Added support for MusicBrainz Picard (via @TrigonaMinima) +- Extended KeePassX support for v2 (via @TCattd) - Improved Mailplane 3 support (via @TCattd) ## Mackup 0.8.5 diff --git a/mackup/applications/keepassx.cfg b/mackup/applications/keepassx.cfg index aec5733bc..d475b80ce 100644 --- a/mackup/applications/keepassx.cfg +++ b/mackup/applications/keepassx.cfg @@ -4,3 +4,4 @@ name = KeePassX [configuration_files] .keepassx Library/Preferences/org.keepassx.keepassx.plist +Library/Application Support/keepassxkeepassx2.ini From 8fdf9f7e8784267699b83621f9ec207adab92daf Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 18 Jun 2015 11:42:36 -0400 Subject: [PATCH 0384/1256] Mackup 0.8.6 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f00a27177..7ec621543 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.6 + - Added support for PyRadio (via @joaoponceleao) - Added support for Dropzone 3 (via @iansoper) - Added support for Autokey (via @danielsuo) diff --git a/mackup/constants.py b/mackup/constants.py index 852dfcc1a..5a49ed452 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.5' +VERSION = '0.8.6' # Support platforms PLATFORM_DARWIN = 'Darwin' From e11599dd78431cfeaa3918bf7d38564600df6453 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 18 Jun 2015 12:21:07 -0400 Subject: [PATCH 0385/1256] Update TODO.md --- TODO.md | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO.md b/TODO.md index a0050128d..25acc366a 100644 --- a/TODO.md +++ b/TODO.md @@ -21,3 +21,4 @@ Feel free to implement any of those ;) in `homebrew` - Do not crash on non existing file during uninstall #240 - Simplify the parameter handling with https://github.com/mitsuhiko/click +- Dedicated repository for the applcations dabatase, like homebrew, so that we don't need a new mackup release to support new apps From e1f7199dd705b32ba0799028bc1eabaa991218e1 Mon Sep 17 00:00:00 2001 From: Sean Freiburg Date: Mon, 22 Jun 2015 21:23:28 -0700 Subject: [PATCH 0386/1256] add in support for yosemite for google drive --- mackup/utils.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mackup/utils.py b/mackup/utils.py index 44f1cbff2..67fcef9e4 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -211,6 +211,11 @@ def get_google_drive_folder_location(): (unicode) 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) + 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) From 7827b93b709f7141cbc0f51f47d4b99ac6cf12ef Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 23 Jun 2015 11:46:54 -0400 Subject: [PATCH 0387/1256] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ec621543..be91efc69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Add in support for yosemite for google drive (via @seanfreiburg) + ## Mackup 0.8.6 - Added support for PyRadio (via @joaoponceleao) From 4b8e80a323328045e4820c75f563228ec6b74f20 Mon Sep 17 00:00:00 2001 From: Joost Bremmer Date: Thu, 25 Jun 2015 16:13:07 +0200 Subject: [PATCH 0388/1256] Add Taskwarrior support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/taskwarrior.cfg | 13 +++++++++++++ 3 files changed, 15 insertions(+) create mode 100644 mackup/applications/taskwarrior.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index be91efc69..1088e1ea8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Add in support for yosemite for google drive (via @seanfreiburg) +- Added support for taskwarrior (via @ToostInc) ## Mackup 0.8.6 diff --git a/README.md b/README.md index 39580a434..d1586021e 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. - [Subversion](http://subversion.apache.org/) - [SuperDuper!](http://www.shirt-pocket.com/SuperDuper/SuperDuperDescription.html) - [TaskPaper](http://www.hogbaysoftware.com/products/taskpaper) + - [Taskwarrior](http://www.taskwarrior.org/) - [Teamocil](http://remiprev.github.io/teamocil/) - [Terminator](https://launchpad.net/terminator/) - [TextMate](http://macromates.com/) diff --git a/mackup/applications/taskwarrior.cfg b/mackup/applications/taskwarrior.cfg new file mode 100644 index 000000000..b912eaa8b --- /dev/null +++ b/mackup/applications/taskwarrior.cfg @@ -0,0 +1,13 @@ +[application] +name = Taskwarrior + +[configuration_files] +.taskrc + +## Note: taskwarrior has it's own sync feature for actual tasks: +## http://taskwarrior.org/docs/taskserver/setup.html +## +## If you'd rather want to sync using mackup, uncomment the following lines. + +# .task/backlog.data + From 43d4604da9edeecc021f7e64282c9e7faebefeda Mon Sep 17 00:00:00 2001 From: Joost Bremmer Date: Thu, 25 Jun 2015 16:17:51 +0200 Subject: [PATCH 0389/1256] Typo/grammar Signed-off-by: Joost Bremmer --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5215a7fef..52a0ca65d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ To speed up Pull Request (PR) approval and merger into Mackup, please follow the - Keep one application supported per PR - Add the application to the list of supported applications in README.md - Add your change to the WIP section of CHANGELOG.md -- Sync configurations should follow the follow principles: +- 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 application - The configuration should sync the minimal set of data, so that syncing happens quickly. Leave large app data out of the sync configuration. From 640aad47be24348cdf71d96afcfe36651f8dcb8c Mon Sep 17 00:00:00 2001 From: Joost Bremmer Date: Thu, 25 Jun 2015 16:20:45 +0200 Subject: [PATCH 0390/1256] Add Taskwarrior support Signed-off-by: Joost Bremmer --- mackup/applications/taskwarrior.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/taskwarrior.cfg b/mackup/applications/taskwarrior.cfg index b912eaa8b..dbe1a755a 100644 --- a/mackup/applications/taskwarrior.cfg +++ b/mackup/applications/taskwarrior.cfg @@ -9,5 +9,5 @@ name = Taskwarrior ## ## If you'd rather want to sync using mackup, uncomment the following lines. -# .task/backlog.data +# .task/ From ff4d3bc1ace80a2c8fad1f4b86ce5c8bfd2cd10a Mon Sep 17 00:00:00 2001 From: Esteban Date: Fri, 26 Jun 2015 11:39:17 -0400 Subject: [PATCH 0391/1256] Add support for Gear Player Gear Player http://www.gearmusicplayer.com --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/gearplayer.cfg | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 mackup/applications/gearplayer.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 1088e1ea8..bfb150f51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Add in support for yosemite for google drive (via @seanfreiburg) - Added support for taskwarrior (via @ToostInc) +- Added support for Gear Music Player (via @TCattd) ## Mackup 0.8.6 diff --git a/README.md b/README.md index d1586021e..d59f74e5c 100644 --- a/README.md +++ b/README.md @@ -203,6 +203,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [FontExplorer X](http://www.fontexplorerx.com/) - [ForkLift 2](http://www.binarynights.com/forklift/) - [Gas Mask](https://github.com/2ndalpha/gasmask/) + - [Gear Player](http://www.gearmusicplayer.com/) - [GeekTool](http://projects.tynsoe.org/en/geektool/) - [GHCi](http://www.haskell.org/haskellwiki/GHC/GHCi) - [Git Hooks](https://github.com/icefox/git-hooks) diff --git a/mackup/applications/gearplayer.cfg b/mackup/applications/gearplayer.cfg new file mode 100644 index 000000000..9aa0ecb61 --- /dev/null +++ b/mackup/applications/gearplayer.cfg @@ -0,0 +1,8 @@ +[application] +name = Gear Player + +[configuration_files] +Library/Preferences/com.treasurebox.gear.plist +Library/Preferences/com.treasurebox.magickeys.plist +Library/Application Support/Gear Player/paddata.padl +Library/Application Support/Gear Player/queue.pak From 22428f5ca3715ddc753bb96dc12639e77dadf6b3 Mon Sep 17 00:00:00 2001 From: Bogdan Popescu Date: Thu, 9 Jul 2015 20:19:58 +0300 Subject: [PATCH 0392/1256] Add support for Dash 3 --- mackup/applications/dash.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/dash.cfg b/mackup/applications/dash.cfg index a03c003cf..4e7020ffe 100644 --- a/mackup/applications/dash.cfg +++ b/mackup/applications/dash.cfg @@ -5,3 +5,4 @@ name = Dash Library/Application Support/Dash/library.dash Library/Application Support/Dash/License/license.dash-license Library/Preferences/com.kapeli.dash.plist +Library/Preferences/com.kapeli.dashdoc.plist From 3040f87579fae9d6e9874dee50a41573f56b3648 Mon Sep 17 00:00:00 2001 From: Bogdan Popescu Date: Thu, 9 Jul 2015 23:50:05 +0300 Subject: [PATCH 0393/1256] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfb150f51..1da33196d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Add in support for yosemite for google drive (via @seanfreiburg) - Added support for taskwarrior (via @ToostInc) - Added support for Gear Music Player (via @TCattd) +- Added support for Dash 3 (via @Kapeli) ## Mackup 0.8.6 From 0e2ade071ee77991844905bba3056de1d9b2125c Mon Sep 17 00:00:00 2001 From: Esteban Date: Fri, 17 Jul 2015 15:47:11 -0300 Subject: [PATCH 0394/1256] Yummy FTP --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/yummyftp.cfg | 7 +++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/yummyftp.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 1da33196d..35fde0e50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Added support for taskwarrior (via @ToostInc) - Added support for Gear Music Player (via @TCattd) - Added support for Dash 3 (via @Kapeli) +- Added support for Yummy FTP (via @TCattd) ## Mackup 0.8.6 diff --git a/README.md b/README.md index d59f74e5c..ad3003f87 100644 --- a/README.md +++ b/README.md @@ -382,6 +382,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [XEmacs](http://www.xemacs.org/) - [XLD](http://tmkk.undo.jp/xld/) - [XtraFinder](http://www.trankynam.com/xtrafinder/) + - [Yummy FTP](http://www.yummysoftware.com/) - [Zsh](http://zsh.sourceforge.net/) - iTunes Applescripts diff --git a/mackup/applications/yummyftp.cfg b/mackup/applications/yummyftp.cfg new file mode 100644 index 000000000..4b862b02e --- /dev/null +++ b/mackup/applications/yummyftp.cfg @@ -0,0 +1,7 @@ +[application] +name = Yummy FTP + +[configuration_files] +Library/Preferences/com.yummysoftware.yummy-ftp.plist +Library/Application Support/Yummy FTP/DefaultBookmark.bkmk +Library/Application Support/Yummy FTP/Bookmarks From dc9d8c744fe4af19d8717ccef246cf5f9248a491 Mon Sep 17 00:00:00 2001 From: Su Yan Date: Thu, 16 Jul 2015 12:05:50 +0800 Subject: [PATCH 0395/1256] Add support for PHPStorm 9 --- mackup/applications/phpstorm-9.cfg | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 mackup/applications/phpstorm-9.cfg diff --git a/mackup/applications/phpstorm-9.cfg b/mackup/applications/phpstorm-9.cfg new file mode 100644 index 000000000..b3292ac94 --- /dev/null +++ b/mackup/applications/phpstorm-9.cfg @@ -0,0 +1,7 @@ +[application] +name = PhpStorm 9 + +[configuration_files] +Library/Application Support/WebIde90 +Library/Preferences/WebIde90 +Library/Preferences/com.jetbrains.PhpStorm.plist From 741e20273d32846c7f75be5a34e6f35fb1c6ecc3 Mon Sep 17 00:00:00 2001 From: Su Yan Date: Thu, 16 Jul 2015 13:54:07 +0800 Subject: [PATCH 0396/1256] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35fde0e50..a00ade7dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Added support for Gear Music Player (via @TCattd) - Added support for Dash 3 (via @Kapeli) - Added support for Yummy FTP (via @TCattd) +- Added support for PHPStorm 9 (via @suyan) ## Mackup 0.8.6 From e3202a03fac15741897e4fd18d31a8558391a953 Mon Sep 17 00:00:00 2001 From: William Huba Date: Fri, 24 Jul 2015 14:33:54 -0400 Subject: [PATCH 0397/1256] Add support for ShiftIt --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/shiftit.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/shiftit.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index a00ade7dc..c5b774b72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Added support for Dash 3 (via @Kapeli) - Added support for Yummy FTP (via @TCattd) - Added support for PHPStorm 9 (via @suyan) +- Added support for ShiftIt (via @hexedpackets) ## Mackup 0.8.6 diff --git a/README.md b/README.md index ad3003f87..c3e950d39 100644 --- a/README.md +++ b/README.md @@ -327,6 +327,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Seil](https://pqrs.org/macosx/keyremap4macbook/seil.html.en) - [Sequel Pro](http://www.sequelpro.com/) - [SHSH Blobs](http://en.wikipedia.org/wiki/SHSH_blob) + - [ShiftIt](https://github.com/fikovnik/ShiftIt) - [Shimo](http://www.chungwasoft.com/shimo/) - [Shuttle](http://fitztrev.github.io/shuttle/) - [SizeUp](http://www.irradiatedsoftware.com/sizeup/) diff --git a/mackup/applications/shiftit.cfg b/mackup/applications/shiftit.cfg new file mode 100644 index 000000000..8e55becd4 --- /dev/null +++ b/mackup/applications/shiftit.cfg @@ -0,0 +1,5 @@ +[application] +name = ShiftIt + +[configuration_files] +Library/Preferences/org.shiftitapp.ShiftIt.plist From 52e568d08fdc81e6662bd80cec000129c59fd751 Mon Sep 17 00:00:00 2001 From: USAMI Kosuke Date: Fri, 31 Jul 2015 21:05:32 +0900 Subject: [PATCH 0398/1256] Add support for Android Studio 1.3 --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/androidstudio-13.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/androidstudio-13.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index c5b774b72..d11a8255a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Added support for Yummy FTP (via @TCattd) - Added support for PHPStorm 9 (via @suyan) - Added support for ShiftIt (via @hexedpackets) +- Added support for Android Studio 1.3 (via @usami-k) ## Mackup 0.8.6 diff --git a/README.md b/README.md index c3e950d39..cfaf7ff96 100644 --- a/README.md +++ b/README.md @@ -134,6 +134,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adium](http://adium.im/) - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - [Adobe Lightroom](http://www.adobe.com/products/photoshop-lightroom.html) + - [Android Studio](https://developer.android.com/sdk/) - [AppCode](http://www.jetbrains.com/objc/) - [aria2c](http://aria2.sourceforge.net/) - [Arara](http://cereda.github.io/arara/) diff --git a/mackup/applications/androidstudio-13.cfg b/mackup/applications/androidstudio-13.cfg new file mode 100644 index 000000000..c306eda64 --- /dev/null +++ b/mackup/applications/androidstudio-13.cfg @@ -0,0 +1,6 @@ +[application] +name = Android Studio 1.3 + +[configuration_files] +Library/Application Support/AndroidStudio1.3 +Library/Preferences/AndroidStudio1.3 From 1d23ea988ab3dd2b1da3965fe5b3003e0eb0408e Mon Sep 17 00:00:00 2001 From: USAMI Kosuke Date: Fri, 31 Jul 2015 21:12:02 +0900 Subject: [PATCH 0399/1256] Add support for Clipy --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/clipy.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/clipy.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index c5b774b72..c8b1004d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Added support for Yummy FTP (via @TCattd) - Added support for PHPStorm 9 (via @suyan) - Added support for ShiftIt (via @hexedpackets) +- Added support for Clipy (via @usami-k) ## Mackup 0.8.6 diff --git a/README.md b/README.md index c3e950d39..36cf545d5 100644 --- a/README.md +++ b/README.md @@ -167,6 +167,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Chicken](http://sourceforge.net/projects/chicken/) - [Clementine](http://www.clementine-player.org/) - [ClipMenu](http://www.clipmenu.com/) + - [Clipy](http://clipy-app.com) - [CloudApp](http://getcloudapp.com/) - [Coda 2](http://panic.com/coda/) - [Colloquy](http://colloquy.info/) diff --git a/mackup/applications/clipy.cfg b/mackup/applications/clipy.cfg new file mode 100644 index 000000000..4ab6db013 --- /dev/null +++ b/mackup/applications/clipy.cfg @@ -0,0 +1,6 @@ +[application] +name = Clipy + +[configuration_files] +Library/Application Support/Clipy +Library/Preferences/com.clipy-app.Clipy.plist From 58865a348e4d1670478d85f8b7db07c10fde6710 Mon Sep 17 00:00:00 2001 From: USAMI Kosuke Date: Fri, 31 Jul 2015 21:17:12 +0900 Subject: [PATCH 0400/1256] Add support for HyperSwitch --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/hyperswitch.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/hyperswitch.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index c5b774b72..6a0812f57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Added support for Yummy FTP (via @TCattd) - Added support for PHPStorm 9 (via @suyan) - Added support for ShiftIt (via @hexedpackets) +- Added support for HyperSwitch (via @usami-k) ## Mackup 0.8.6 diff --git a/README.md b/README.md index c3e950d39..fb148cd98 100644 --- a/README.md +++ b/README.md @@ -224,6 +224,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Hexels](http://hexraystudios.com/hexels/) - [Houdini](http://uglyapps.co.uk/houdini/) - [Htop](http://htop.sourceforge.net/) + - [HyperSwitch](https://bahoom.com/hyperswitch) - [i2cssh](https://github.com/wouterdebie/i2cssh) - [i3wm](http://i3wm.org/) - [IntelliJIDEA](http://www.jetbrains.com/idea/) diff --git a/mackup/applications/hyperswitch.cfg b/mackup/applications/hyperswitch.cfg new file mode 100644 index 000000000..4764d8a0a --- /dev/null +++ b/mackup/applications/hyperswitch.cfg @@ -0,0 +1,5 @@ +[application] +name = HyperSwitch + +[configuration_files] +Library/Preferences/com.bahoom.HyperSwitch.plist From ebc0fa8bbeabe29604aac358c875da268d713215 Mon Sep 17 00:00:00 2001 From: USAMI Kosuke Date: Fri, 31 Jul 2015 21:21:46 +0900 Subject: [PATCH 0401/1256] Add support for Xamarin Studio 5 --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/xamarinstudio-5.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/xamarinstudio-5.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index c5b774b72..ae2fcfb51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Added support for Yummy FTP (via @TCattd) - Added support for PHPStorm 9 (via @suyan) - Added support for ShiftIt (via @hexedpackets) +- Added support for Xamarin Studio 5 (via @usami-k) ## Mackup 0.8.6 diff --git a/README.md b/README.md index c3e950d39..c8eed56a9 100644 --- a/README.md +++ b/README.md @@ -377,6 +377,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Wget](https://www.gnu.org/software/wget/) - [Witch](http://manytricks.com/witch/) - [X11](http://www.x.org/) + - [Xamarin Studio](https://xamarin.com/studio) - [XBindKeys](http://www.nongnu.org/xbindkeys/) - [Xchat](http://www.xchat.org/) - [XCode](https://developer.apple.com/xcode/) diff --git a/mackup/applications/xamarinstudio-5.cfg b/mackup/applications/xamarinstudio-5.cfg new file mode 100644 index 000000000..40c0f2acd --- /dev/null +++ b/mackup/applications/xamarinstudio-5.cfg @@ -0,0 +1,5 @@ +[application] +name = Xamarin Studio 5 + +[configuration_files] +Library/Preferences/XamarinStudio-5.0 From bfdb9867a67b9a592444138ef4c399fc041b91ee Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Mon, 3 Aug 2015 14:10:08 -0400 Subject: [PATCH 0402/1256] Create rstudio.cfg --- mackup/applications/rstudio.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/rstudio.cfg diff --git a/mackup/applications/rstudio.cfg b/mackup/applications/rstudio.cfg new file mode 100644 index 000000000..4f9102fc6 --- /dev/null +++ b/mackup/applications/rstudio.cfg @@ -0,0 +1,6 @@ +[application] +name = RStudio + +[configuration_files] +.rstudio-desktop +Library/Preferences/org.rstudio.RStudio.plist From 52fbd6e970b4b935a23bacb2cbc9ce721dc71aa1 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Mon, 3 Aug 2015 14:19:20 -0400 Subject: [PATCH 0403/1256] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4df1bd9ba..60f453b5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Added support for Clipy (via @usami-k) - Added support for HyperSwitch (via @usami-k) - Added support for Xamarin Studio 5 (via @usami-k) +- Added support for RStudio (via @kfinlay) ## Mackup 0.8.6 From 203473200fb626f90affe08e144d0665afe7528c Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Mon, 3 Aug 2015 14:20:20 -0400 Subject: [PATCH 0404/1256] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b3b167409..566a787a7 100644 --- a/README.md +++ b/README.md @@ -313,6 +313,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [rTorrent](http://libtorrent.rakshasa.no/) - [R](http://www.r-project.org/) - [Royal TSX](http://www.royaltsx.com/ts/osx/features) + - [RStudio](http://rstudio.com) - [Rubocop](https://github.com/bbatsov/rubocop) - [Ruby Version](https://gist.github.com/fnichol/1912050) - [Ruby](http://ruby-lang.org/) From 4f1b464af72475485b03e73d6c75b0c12d20445b Mon Sep 17 00:00:00 2001 From: Iulian Onofrei Date: Tue, 4 Aug 2015 12:11:01 +0300 Subject: [PATCH 0405/1256] Add Xcode custom data formatters and breakpoints --- mackup/applications/xcode.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/xcode.cfg b/mackup/applications/xcode.cfg index f09178d65..52a769366 100644 --- a/mackup/applications/xcode.cfg +++ b/mackup/applications/xcode.cfg @@ -5,5 +5,7 @@ name = Xcode Library/Developer/Xcode/UserData/CodeSnippets Library/Developer/Xcode/UserData/FontAndColorThemes Library/Developer/Xcode/UserData/KeyBindings +Library/Developer/Xcode/UserData/Debugger +Library/Developer/Xcode/UserData/xcdebugger Library/Developer/Xcode/UserData/SearchScopes.xcsclist Library/Developer/Xcode/Templates From 96f845a96016b5a0272ca5a3bbbec401293ab374 Mon Sep 17 00:00:00 2001 From: Jeremiah Lowin Date: Tue, 4 Aug 2015 12:10:57 -0400 Subject: [PATCH 0406/1256] Add iCloud references --- mackup/config.py | 9 +++++++-- mackup/constants.py | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mackup/config.py b/mackup/config.py index 984a3c92e..b41f5eefe 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -9,12 +9,14 @@ ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_COPY, + ENGINE_ICLOUD, ENGINE_FS) from .utils import (error, get_dropbox_folder_location, get_copy_folder_location, - get_google_drive_folder_location) + get_google_drive_folder_location, + get_icloud_folder_location) try: import configparser except ImportError: @@ -61,7 +63,7 @@ def engine(self): """ The engine used by the storage. - ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_COPY or ENGINE_FS. + ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_COPY, ENGINE_ICLOUD or ENGINE_FS. Returns: str @@ -181,6 +183,7 @@ def _parse_engine(self): if engine not in [ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_COPY, + ENGINE_ICLOUD, ENGINE_FS]: raise ConfigError('Unknown storage engine: {}'.format(engine)) @@ -199,6 +202,8 @@ def _parse_path(self): 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: 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 5a49ed452..efe6ea5ad 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -25,4 +25,5 @@ ENGINE_DROPBOX = 'dropbox' ENGINE_GDRIVE = 'google_drive' ENGINE_COPY = 'copy' +ENGINE_ICLOUD = 'icloud' ENGINE_FS = 'file_system' From cd46be501eba959d85b0d95856d1179ea158c285 Mon Sep 17 00:00:00 2001 From: Jeremiah Lowin Date: Tue, 4 Aug 2015 12:11:11 -0400 Subject: [PATCH 0407/1256] get iCloud location --- mackup/utils.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/mackup/utils.py b/mackup/utils.py index 67fcef9e4..b6ece92a6 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -267,6 +267,23 @@ def get_copy_folder_location(): return copy_home +def get_icloud_folder_location(): + """ + Try to locate the iCloud Drive folder. + + Returns: + (str) Full path to the iCloud Drive folder. + """ + 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 =(') + + return unicode(icloud_home) + + def is_process_running(process_name): """ Check if a process with the given name is running. From 1c73177a3e4d83a2a95ec671e2d9b779249c9e88 Mon Sep 17 00:00:00 2001 From: Jeremiah Lowin Date: Tue, 4 Aug 2015 12:12:58 -0400 Subject: [PATCH 0408/1256] tests --- tests/config_tests.py | 22 +++++++++++++++++++ .../com~apple~CloudDocs/_blank_.md | 1 + tests/fixtures/mackup-engine-icloud.cfg | 12 ++++++++++ 3 files changed, 35 insertions(+) create mode 100644 tests/fixtures/Library/Mobile Documents/com~apple~CloudDocs/_blank_.md create mode 100644 tests/fixtures/mackup-engine-icloud.cfg diff --git a/tests/config_tests.py b/tests/config_tests.py index 946ebb327..e0b77b1e3 100644 --- a/tests/config_tests.py +++ b/tests/config_tests.py @@ -4,6 +4,7 @@ from mackup.constants import (ENGINE_DROPBOX, ENGINE_GDRIVE, ENGINE_COPY, + ENGINE_ICLOUD, ENGINE_FS) from mackup.config import Config, ConfigError @@ -148,6 +149,27 @@ def test_config_engine_copy(self): 'sabnzbd']) assert cfg.apps_to_sync == set(['sublime-text-3', 'x11', 'sabnzbd']) + def test_config_engine_icloud(self): + 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/') + + assert isinstance(cfg.directory, str) + assert cfg.directory == u'Mackup' + + assert isinstance(cfg.fullpath, str) + 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']) + 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/Library/Mobile Documents/com~apple~CloudDocs/_blank_.md b/tests/fixtures/Library/Mobile Documents/com~apple~CloudDocs/_blank_.md new file mode 100644 index 000000000..6a23f9455 --- /dev/null +++ b/tests/fixtures/Library/Mobile Documents/com~apple~CloudDocs/_blank_.md @@ -0,0 +1 @@ +Blank file for git sync \ No newline at end of file diff --git a/tests/fixtures/mackup-engine-icloud.cfg b/tests/fixtures/mackup-engine-icloud.cfg new file mode 100644 index 000000000..2055279bb --- /dev/null +++ b/tests/fixtures/mackup-engine-icloud.cfg @@ -0,0 +1,12 @@ +[storage] +engine = icloud + +[applications_to_ignore] +subversion +sequel-pro +sabnzbd + +[applications_to_sync] +sabnzbd +sublime-text-3 +x11 From 36b9f64df255a6ef8b3a07df7831306e1694bc77 Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 4 Aug 2015 13:39:11 -0300 Subject: [PATCH 0409/1256] Added Library/Application Support/LightTable/User (user.keymap, etc) Most importantly, this folder holds user.behaviors user.keymap --- mackup/applications/light-table.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/light-table.cfg b/mackup/applications/light-table.cfg index 5f52f8aac..234cad496 100644 --- a/mackup/applications/light-table.cfg +++ b/mackup/applications/light-table.cfg @@ -4,4 +4,5 @@ name = Light Table [configuration_files] Library/Application Support/LightTable/plugins Library/Application Support/LightTable/settings +Library/Application Support/LightTable/User Library/Preferences/com.kodowa.LightTable.plist From 4f8bcbff0618b4e2f3e9d8c100d1a99727bb3c7c Mon Sep 17 00:00:00 2001 From: Iulian Onofrei Date: Wed, 5 Aug 2015 17:33:48 +0300 Subject: [PATCH 0410/1256] Add support for MacOSX keyboard shortcuts Fixes #482 --- mackup/applications/macosx.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/macosx.cfg b/mackup/applications/macosx.cfg index 06b2826e8..551573e96 100644 --- a/mackup/applications/macosx.cfg +++ b/mackup/applications/macosx.cfg @@ -4,3 +4,4 @@ name = MacOSX [configuration_files] .MacOSX Library/KeyBindings/DefaultKeyBinding.dict +Library/Preferences/com.apple.symbolichotkeys.plist From 576dce0741cc8e0286632f13aa1f71ae885cb7b2 Mon Sep 17 00:00:00 2001 From: william Date: Sat, 8 Aug 2015 14:41:55 -0600 Subject: [PATCH 0411/1256] make parent dirs when creating mackup home This allows you to specify something like: [storage] engine = icloud directory = .config/mackup --- mackup/mackup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/mackup.py b/mackup/mackup.py index 46e84c002..a91a1e135 100644 --- a/mackup/mackup.py +++ b/mackup/mackup.py @@ -71,7 +71,7 @@ def create_mackup_home(self): " configuration files\n" "Do you want to create it now ? <{}>" .format(self.mackup_folder)): - os.mkdir(self.mackup_folder) + os.makedirs(self.mackup_folder) else: utils.error("Mackup can't do anything without a home =(") From 019e55343d81326240fb1cbdca6d3e17c061b90c Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 8 Aug 2015 22:56:41 -0400 Subject: [PATCH 0412/1256] changelog update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60f453b5e..be8688f80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ - Added support for HyperSwitch (via @usami-k) - Added support for Xamarin Studio 5 (via @usami-k) - Added support for RStudio (via @kfinlay) +- Added support for iCloud as a new storage (via @jlowin) +- Allow the mackup home to be a subfolder (via @mkwmms) ## Mackup 0.8.6 From 91effb26b4819d1b092677b3c2cc2f35dc61cdea Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 8 Aug 2015 23:00:34 -0400 Subject: [PATCH 0413/1256] doc update --- README.md | 1 + doc/README.md | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/README.md b/README.md index 566a787a7..393fad307 100644 --- a/README.md +++ b/README.md @@ -123,6 +123,7 @@ folder and destroy the Mackup folder in Dropbox. - [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/)) See the [README](doc/README.md) file in the doc directory for more info. diff --git a/doc/README.md b/doc/README.md index 96442ddd4..4374ed51e 100644 --- a/doc/README.md +++ b/doc/README.md @@ -33,6 +33,12 @@ where your Google Drive is and store your configuration files in it. engine = google_drive ``` +### iCloud + +```ini +[storage] +engine = icloud +``` ### Copy @@ -82,6 +88,14 @@ directory = backup This will store your files in the `~/dotfiles/backup` directory in your home. +You can also select a subfolder: + +```ini +[storage] +engine = icloud +directory = .config/mackup +``` + ## Applications ### Only sync one or two application From 7ec38be208d5045f72b8465d7f880d77180356b5 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 8 Aug 2015 23:01:58 -0400 Subject: [PATCH 0414/1256] Mackup 0.8.7 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index be8688f80..47c64bb32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.7 + - Add in support for yosemite for google drive (via @seanfreiburg) - Added support for taskwarrior (via @ToostInc) - Added support for Gear Music Player (via @TCattd) diff --git a/mackup/constants.py b/mackup/constants.py index efe6ea5ad..fe09515ec 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.6' +VERSION = '0.8.7' # Support platforms PLATFORM_DARWIN = 'Darwin' From bf1c32559a4ad91d9902f64c9bdc1cf7faf6153d Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 8 Aug 2015 23:04:05 -0400 Subject: [PATCH 0415/1256] Remove broken badges --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 393fad307..d9c847ec6 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,6 @@ Keep your application settings in sync. [![Circle CI](https://circleci.com/gh/lra/mackup.svg?style=shield)](https://circleci.com/gh/lra/mackup) [![Coverage Status](https://coveralls.io/repos/lra/mackup/badge.svg)](https://coveralls.io/r/lra/mackup) [![Code Health](https://landscape.io/github/lra/mackup/master/landscape.png)](https://landscape.io/github/lra/mackup/master) -[![Downloads](https://pypip.in/download/mackup/badge.svg?period=month)](https://pypi.python.org/pypi/mackup/) -[![Latest Version](https://pypip.in/version/mackup/badge.svg?text=version)](https://pypi.python.org/pypi/mackup/) ## Quickstart From b028ddb8c70e9f601d062d5ba0a4c26868717b53 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 9 Aug 2015 17:58:39 -0400 Subject: [PATCH 0416/1256] Update CONTRIBUTING.md --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 52a0ca65d..ad6fb605f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,5 +8,6 @@ To speed up Pull Request (PR) approval and merger into Mackup, please follow the - Syncing should not break the application, and PRs should be tested - Syncing should not break any syncing functionality internal to the application - The configuration should sync the minimal set of data, so that syncing happens quickly. Leave large app data out of the sync configuration. + - Do not sync any file or folder that represents some state, like session data, cache, any file specific to the local workstation. Thank you for your contribution! From 825c2d1b88e74dfa716f058327a1695648dc09b5 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 9 Aug 2015 18:28:33 -0400 Subject: [PATCH 0417/1256] Better doc --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eea720778..3aab9602e 100644 --- a/README.md +++ b/README.md @@ -394,8 +394,9 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Zsh](http://zsh.sourceforge.net/) - iTunes Applescripts -You can add your favorite application by forking it and doing a -[Pull Request](https://help.github.com/articles/using-pull-requests). +## Can you support application X? + +We can [with your help](https://github.com/lra/mackup/tree/master/doc#get-official-support-for-an-application) ;) ## Why did you do this ?! From 5b1148eb6d06bda7ce4b88cce31c195ba49f8d55 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 9 Aug 2015 19:09:52 -0400 Subject: [PATCH 0418/1256] Removed the TODO now in https://github.com/lra/mackup/labels/TODO --- TODO.md | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 TODO.md diff --git a/TODO.md b/TODO.md deleted file mode 100644 index 25acc366a..000000000 --- a/TODO.md +++ /dev/null @@ -1,24 +0,0 @@ -# TODO - -Feel free to implement any of those ;) - -- `mackup status` to display any synced app, and any app that could be synced - by launching `mackup backup` -- A GUI, we could definitely use an OS X gui that would display the status: - synced apps, unsynced apps, using wxPython ? -- Try with hard links to support the Fonts pb -- 100% test coverage -- Rollback any file that's not maintained by mackup anymore - https://github.com/lra/mackup/issues/190 -- Ability to encrypt specific files, asked in #134 and #109 -- Setup some web page -- Ability to enable/disable an app (will update the cfg file) -- Progress bar on syncing -- Invite the user to generate the conf file at launch if Mackup has no conf - file -- Merge all the config code in Config() -- Ability to `mackup list` without any storage, and use `mackup list` as a test - in `homebrew` -- Do not crash on non existing file during uninstall #240 -- Simplify the parameter handling with https://github.com/mitsuhiko/click -- Dedicated repository for the applcations dabatase, like homebrew, so that we don't need a new mackup release to support new apps From 7dee92d20cd9fff6538fcd11543f2bd488684409 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 9 Aug 2015 19:19:00 -0400 Subject: [PATCH 0419/1256] Removed problematic Lightroom support --- CHANGELOG.md | 1 + README.md | 1 - mackup/applications/adobe-lightroom.cfg | 10 ---------- 3 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 mackup/applications/adobe-lightroom.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index c94c9c282..e7866b30d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Added support for syncing over Box (via @ninjabong) - Added support for Photoshop CC (via @ponychicken) +- Removed problematic Lightroom support ## Mackup 0.8.7 diff --git a/README.md b/README.md index 3aab9602e..7c03b4250 100644 --- a/README.md +++ b/README.md @@ -133,7 +133,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Ack](http://beyondgrep.com/) - [Adium](http://adium.im/) - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - - [Adobe Lightroom](http://www.adobe.com/products/photoshop-lightroom.html) - [Adobe Photoshop CC](http://www.adobe.com/products/photoshop.html) - [Android Studio](https://developer.android.com/sdk/) - [AppCode](http://www.jetbrains.com/objc/) diff --git a/mackup/applications/adobe-lightroom.cfg b/mackup/applications/adobe-lightroom.cfg deleted file mode 100644 index 40b9a84d9..000000000 --- a/mackup/applications/adobe-lightroom.cfg +++ /dev/null @@ -1,10 +0,0 @@ -[application] -name = Adobe Lightroom - -[configuration_files] -Library/Application Support/Adobe/Lightroom -Library/Preferences/com.adobe.Lightroom2.plist -Library/Preferences/com.adobe.Lightroom3.plist -Library/Preferences/com.adobe.Lightroom4.plist -Library/Preferences/com.adobe.Lightroom5.plist -Library/Preferences/com.adobe.Lightroom6.plist From 303111b54288a68f0ccefeda030ab0b33943b460 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 9 Aug 2015 20:52:06 -0400 Subject: [PATCH 0420/1256] Document how to contribute to the code --- CONTRIBUTING.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ad6fb605f..d6346ae24 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,12 @@ # How to contribute +You can: + +- Add or improve the support of an application (Check the [TODO](https://github.com/lra/mackup/labels/TODO) tasks and pick one) +- Improve the Mackup codebase + To speed up Pull Request (PR) approval and merger into Mackup, please follow these guidelines: + - Keep one application supported per PR - Add the application to the list of supported applications in README.md - Add your change to the WIP section of CHANGELOG.md From 3406a206cb18ed99797cc0fa8e386337a5265203 Mon Sep 17 00:00:00 2001 From: Timidger Date: Sun, 9 Aug 2015 17:55:18 -0500 Subject: [PATCH 0421/1256] Updated to docopt and removed ugly input hack --- mackup/main.py | 4 ++++ mackup/utils.py | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/mackup/main.py b/mackup/main.py index 0a5708259..ffe6c8c22 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -47,6 +47,10 @@ def main(): mckp = Mackup() app_db = ApplicationsDatabase() + # If we want to answer mackup with "yes" for each question + if args['force']: + utils.FORCE_YES = True + if args['backup']: # Check the env where the command is being run mckp.check_for_usable_backup_env() diff --git a/mackup/utils.py b/mackup/utils.py index 6d2ac2294..1a20065c9 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -11,6 +11,11 @@ from . import constants +# Flag that controls how user confirmation works. +# If True, the user wants to say "yes" to everything. +FORCE_YES = False + + def confirm(question): """ Ask the user if he really want something to happen. @@ -21,6 +26,9 @@ def confirm(question): Returns: (boolean): Confirmed or not """ + if FORCE_YES: + return True + while True: # Python 3 check if sys.version_info[0] < 3: From 661ab9349345d83cacf92231d8130dbd08185393 Mon Sep 17 00:00:00 2001 From: Timidger Date: Sun, 9 Aug 2015 20:26:24 -0500 Subject: [PATCH 0422/1256] Added force description to docopt --- mackup/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/main.py b/mackup/main.py index ffe6c8c22..bfa0ffdd0 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -13,6 +13,7 @@ Options: -h --help Show this screen. + -f --force Force every question asked to be answered with "Yes" --version Show version. Modes of action: From 0d0672388c3da0aaf016f2089bad6c4e53083548 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 9 Aug 2015 21:43:59 -0400 Subject: [PATCH 0423/1256] Added changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c275085b..e8e1e02e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Added support for Photoshop CC (via @ponychicken) - Removed problematic Lightroom support - Improved support for ssh, excluding the credential keys (via @nkcfan) +- Added an option to not have to confirm every action (via @Timidger) ## Mackup 0.8.7 From 34b727be360f5c17396d5630ddeef12c55cb43e1 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 9 Aug 2015 23:03:02 -0400 Subject: [PATCH 0424/1256] Remove TextMate problematic folder Fixes #449 #249 #100 --- mackup/applications/textmate.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/mackup/applications/textmate.cfg b/mackup/applications/textmate.cfg index 2e6c1a9ef..5176b0d63 100644 --- a/mackup/applications/textmate.cfg +++ b/mackup/applications/textmate.cfg @@ -2,6 +2,5 @@ name = TextMate [configuration_files] -Library/Application Support/TextMate Library/Preferences/com.macromates.textmate.plist Library/Preferences/com.macromates.textmate.latex_config.plist From f058b29d02995362a410ee38dcdf9e1e130ab751 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 9 Aug 2015 23:04:19 -0400 Subject: [PATCH 0425/1256] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8e1e02e3..02175991f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Removed problematic Lightroom support - Improved support for ssh, excluding the credential keys (via @nkcfan) - Added an option to not have to confirm every action (via @Timidger) +- Fixed TextMate syncing ## Mackup 0.8.7 From e1745ed9f2a3b70809ba035166b521ba2e74ed86 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 9 Aug 2015 23:12:24 -0400 Subject: [PATCH 0426/1256] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d6346ae24..95b4a0242 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ You can: -- Add or improve the support of an application (Check the [TODO](https://github.com/lra/mackup/labels/TODO) tasks and pick one) +- Add or improve the support of an application (Check the [TODO](https://github.com/lra/mackup/labels/TODO) and [TOFIX](https://github.com/lra/mackup/labels/TOFIX) tasks and pick one) - Improve the Mackup codebase To speed up Pull Request (PR) approval and merger into Mackup, please follow these guidelines: From f82bbd438e7c698bc49b274039c8ab93c278bfa4 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 9 Aug 2015 23:13:23 -0400 Subject: [PATCH 0427/1256] Mackup 0.8.8 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02175991f..505e5ce0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.8 + - Added support for syncing over Box (via @ninjabong) - Added support for Photoshop CC (via @ponychicken) - Removed problematic Lightroom support diff --git a/mackup/constants.py b/mackup/constants.py index 49583ab3d..9c9d9d81b 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.7' +VERSION = '0.8.8' # Support platforms PLATFORM_DARWIN = 'Darwin' From f44149e55beb983af1bf4e341ba5d2905545ff91 Mon Sep 17 00:00:00 2001 From: Hariharan Iyer Date: Mon, 10 Aug 2015 22:45:37 +0530 Subject: [PATCH 0428/1256] fix force option --- mackup/main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mackup/main.py b/mackup/main.py index bfa0ffdd0..7889ccc65 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -5,9 +5,9 @@ Usage: mackup list - mackup backup - mackup restore - mackup uninstall + mackup [ -f | --force ] backup + mackup [ -f | --force ] restore + mackup [ -f | --force ] uninstall mackup (-h | --help) mackup --version @@ -49,7 +49,7 @@ def main(): app_db = ApplicationsDatabase() # If we want to answer mackup with "yes" for each question - if args['force']: + if args['--force']: utils.FORCE_YES = True if args['backup']: From f4594ec9c161373823f4b0be8e81bec5d2322f62 Mon Sep 17 00:00:00 2001 From: Hariharan Iyer Date: Mon, 10 Aug 2015 22:53:13 +0530 Subject: [PATCH 0429/1256] add changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 505e5ce0c..df07ba1e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Fixed the 'force' option (via @hiyer) + ## Mackup 0.8.8 - Added support for syncing over Box (via @ninjabong) From de3d31b3b500425f0c933c1fc1e64cd79887b657 Mon Sep 17 00:00:00 2001 From: Hariharan Iyer Date: Mon, 10 Aug 2015 22:56:15 +0530 Subject: [PATCH 0430/1256] move options to end --- mackup/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mackup/main.py b/mackup/main.py index 7889ccc65..ae8a12baf 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -5,9 +5,9 @@ Usage: mackup list - mackup [ -f | --force ] backup - mackup [ -f | --force ] restore - mackup [ -f | --force ] uninstall + mackup backup [ -f | --force ] + mackup restore [ -f | --force ] + mackup uninstall [ -f | --force ] mackup (-h | --help) mackup --version From 1f66b09876a81a74ed0f52713414eeb47395efa6 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 10 Aug 2015 18:56:37 -0400 Subject: [PATCH 0431/1256] Mackup 0.8.9 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df07ba1e4..4effc026f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.9 + - Fixed the 'force' option (via @hiyer) ## Mackup 0.8.8 diff --git a/mackup/constants.py b/mackup/constants.py index 9c9d9d81b..d1d0709b1 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.8' +VERSION = '0.8.9' # Support platforms PLATFORM_DARWIN = 'Darwin' From d459c8f5360a4a63021347872c9511123c652d7b Mon Sep 17 00:00:00 2001 From: micate Date: Tue, 11 Aug 2015 13:52:04 +0800 Subject: [PATCH 0432/1256] Add support for SecureCRT --- README.md | 1 + mackup/applications/securecrt.cfg | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 mackup/applications/securecrt.cfg diff --git a/README.md b/README.md index 7c03b4250..6c222315d 100644 --- a/README.md +++ b/README.md @@ -328,6 +328,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/) + - [SecureCRT](https://www.vandyke.com/products/securecrt/) - [SelfControl](http://selfcontrolapp.com/) - [Seil](https://pqrs.org/macosx/keyremap4macbook/seil.html.en) - [Sequel Pro](http://www.sequelpro.com/) diff --git a/mackup/applications/securecrt.cfg b/mackup/applications/securecrt.cfg new file mode 100644 index 000000000..90fa657f9 --- /dev/null +++ b/mackup/applications/securecrt.cfg @@ -0,0 +1,6 @@ +[application] +name = SecureCRT + +[configuration_files] +Library/Application Support/VanDyke/SecureCRT/Config +Library/Preferences/com.vandyke.SecureCRT.plist \ No newline at end of file From 610adf92a8c4f066e862ae3c86f1de8bb7c2fa08 Mon Sep 17 00:00:00 2001 From: micate Date: Tue, 11 Aug 2015 13:53:09 +0800 Subject: [PATCH 0433/1256] Add support for SecureCRT --- mackup/applications/securecrt.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mackup/applications/securecrt.cfg b/mackup/applications/securecrt.cfg index 90fa657f9..c226f1f18 100644 --- a/mackup/applications/securecrt.cfg +++ b/mackup/applications/securecrt.cfg @@ -3,4 +3,5 @@ name = SecureCRT [configuration_files] Library/Application Support/VanDyke/SecureCRT/Config -Library/Preferences/com.vandyke.SecureCRT.plist \ No newline at end of file +Library/Preferences/com.vandyke.SecureCRT.plist + From d1e55c2ff2dad978ccf9ddd73c4fd52e23569e8c Mon Sep 17 00:00:00 2001 From: micate Date: Tue, 11 Aug 2015 14:04:17 +0800 Subject: [PATCH 0434/1256] update WIP section --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4effc026f..03d9f46b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Added support for SecureCRT (via @micate) + ## Mackup 0.8.9 - Fixed the 'force' option (via @hiyer) From d2a49b986321dd8f8adfabda177d311545295cfb Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 11 Aug 2015 11:45:41 -0400 Subject: [PATCH 0435/1256] Useless newline --- mackup/applications/securecrt.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/mackup/applications/securecrt.cfg b/mackup/applications/securecrt.cfg index c226f1f18..b799a3cbf 100644 --- a/mackup/applications/securecrt.cfg +++ b/mackup/applications/securecrt.cfg @@ -4,4 +4,3 @@ name = SecureCRT [configuration_files] Library/Application Support/VanDyke/SecureCRT/Config Library/Preferences/com.vandyke.SecureCRT.plist - From 9d92ad0413bb61ad8b52f57a051be3439acb023f Mon Sep 17 00:00:00 2001 From: Dave Rostron Date: Sat, 31 May 2014 20:37:50 -0700 Subject: [PATCH 0436/1256] adding dry-run and verbose options --- CHANGELOG.md | 1 + mackup/application.py | 84 ++++++++++++++++++++++++++++++------------- mackup/main.py | 34 ++++++++++++++++-- 3 files changed, 93 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03d9f46b6..ddb7e6fc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Added support for SecureCRT (via @micate) +- Added dry-run and verbose options (via @yastero) ## Mackup 0.8.9 diff --git a/mackup/application.py b/mackup/application.py index e6c9cd504..ce75310c0 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -12,9 +12,7 @@ class ApplicationProfile(object): - """Instantiate this class with application specific data.""" - - def __init__(self, mackup, files): + def __init__(self, mackup, files, dry_run, verbose): """ Create an ApplicationProfile instance. @@ -27,6 +25,22 @@ def __init__(self, mackup, files): self.mackup = mackup self.files = list(files) + self.dry_run = dry_run + self.verbose = verbose + + + def getFilepaths(self, filename): + """ + Get home and mackup filepaths for given file + + Args: + filepath (str) + + Returns: + home_filepath, mackup_filepath (str, str) + """ + return (os.path.join(os.environ['HOME'], filename), + os.path.join(self.mackup.mackup_folder, filename)) def backup(self): """ @@ -47,18 +61,21 @@ def backup(self): """ # For each file used by the application for filename in self.files: - # Get the full path of each file - filepath = os.path.join(os.environ['HOME'], filename) - mackup_filepath = os.path.join(self.mackup.mackup_folder, filename) + (home_filepath, mackup_filepath) = self.getFilepaths(filename) # If the file exists and is not already a link pointing to Mackup - if ((os.path.isfile(filepath) or os.path.isdir(filepath)) - and not (os.path.islink(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(filepath, mackup_filepath))): + and os.path.samefile(home_filepath, mackup_filepath))): - print("Backing up {} ...".format(filepath)) + print("Backing up {} ...".format("" if self.verbose else filename)) + if self.verbose: + print(" {}\n to\n {}".format(home_filepath, mackup_filepath)) + + if self.dry_run: + continue # Check if we already have a backup if os.path.exists(mackup_filepath): @@ -82,18 +99,23 @@ def backup(self): # Delete the file in Mackup utils.delete(mackup_filepath) # Copy the file - utils.copy(filepath, mackup_filepath) + utils.copy(home_filepath, mackup_filepath) # Delete the file in the home - utils.delete(filepath) + utils.delete(home_filepath) # Link the backuped file to its original place - utils.link(mackup_filepath, filepath) + utils.link(mackup_filepath, home_filepath) else: # Copy the file - utils.copy(filepath, mackup_filepath) + utils.copy(home_filepath, mackup_filepath) # Delete the file in the home - utils.delete(filepath) + utils.delete(home_filepath) # Link the backuped file to its original place - utils.link(mackup_filepath, filepath) + utils.link(mackup_filepath, home_filepath) + elif self.verbose: + print("Doing nothing\n {}\n {}".format( + home_filepath, + "is already backed up to\n " + mackup_filepath + if os.path.exists(home_filepath) else "does not exist")) def restore(self): """ @@ -111,9 +133,7 @@ def restore(self): """ # For each file used by the application for filename in self.files: - # Get the full path of each file - mackup_filepath = os.path.join(self.mackup.mackup_folder, filename) - home_filepath = os.path.join(os.environ['HOME'], filename) + (home_filepath, mackup_filepath) = self.getFilepaths(filename) # 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 @@ -126,7 +146,12 @@ def restore(self): supported = utils.can_file_be_synced_on_current_platform(filename) if file_or_dir_exists and not pointing_to_mackup and supported: - print("Restoring {} ...".format(home_filepath)) + print("Restoring {} ...".format("" if self.verbose else filename)) + if self.verbose: + print(" linking {}\n to {}".format(home_filepath, mackup_filepath)) + + if self.dry_run: + continue # Check if there is already a file in the home folder if os.path.exists(home_filepath): @@ -149,6 +174,11 @@ def restore(self): utils.link(mackup_filepath, home_filepath) else: utils.link(mackup_filepath, home_filepath) + elif self.verbose: + print("Doing nothing\n {}\n {}".format( + mackup_filepath, + "already linked by\n " + home_filepath + if os.path.exists(home_filepath) else "does not exist")) def uninstall(self): """ @@ -167,19 +197,25 @@ def uninstall(self): """ # For each file used by the application for filename in self.files: - # Get the full path of each file - mackup_filepath = os.path.join(self.mackup.mackup_folder, filename) - home_filepath = os.path.join(os.environ['HOME'], filename) + (home_filepath, mackup_filepath) = self.getFilepaths(filename) # If the mackup file exists 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): - print("Reverting {} ...".format(home_filepath)) + print("Reverting {} ...".format(mackup_filepath if self.verbose else filename)) + if self.verbose: + print(" at {}".format(home_filepath)) + + if self.dry_run: + continue + # If there is, delete it as we are gonna copy the Dropbox # one there utils.delete(home_filepath) # 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)) diff --git a/mackup/main.py b/mackup/main.py index ae8a12baf..3522288f8 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -39,6 +39,16 @@ from .mackup import Mackup from . import utils +class ColorFormatCodes: + BLUE = '\033[34m' + BOLD = '\033[1m' + NORMAL = '\033[0m' + +def header(str): + return ColorFormatCodes.BLUE + str + ColorFormatCodes.NORMAL + +def bold(str): + return ColorFormatCodes.BOLD + str + ColorFormatCodes.NORMAL def main(): """Main function.""" @@ -48,6 +58,12 @@ def main(): mckp = Mackup() app_db = ApplicationsDatabase() + def foreachApp(apps, f): + for app_name in apps: + if args.verbose: print(("{0} {1} {0}").format(header("---"), bold(app_name))) + f(app_name) + if args.verbose: print + # If we want to answer mackup with "yes" for each question if args['--force']: utils.FORCE_YES = True @@ -56,6 +72,9 @@ def main(): # Check the env where the command is being run mckp.check_for_usable_backup_env() + def backupApplication(app_name): + ApplicationProfile(mckp, app_db.get_files(app_name), args.dry_run, args.verbose).backup() + # Backup each application for app_name in mckp.get_apps_to_backup(): app = ApplicationProfile(mckp, app_db.get_files(app_name)) @@ -85,11 +104,17 @@ def main(): app = ApplicationProfile(mckp, app_db.get_files(app_name)) app.restore() - elif args['uninstall']: + def restoreApplication(app_name): + ApplicationProfile(mckp, app_db.get_files(app_name), args.dry_run, args.verbose).restore() + + foreachApp(mckp.get_apps_to_backup(), restoreApplication) + + elif args.mode == UNINSTALL_MODE: # Check the env where the command is being run mckp.check_for_usable_restore_env() - if utils.confirm("You are going to uninstall Mackup.\n" + if args.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" @@ -109,6 +134,11 @@ def main(): app_db.get_files(MACKUP_APP_NAME)) mackup_app.uninstall() + def uninstallApp(app_name): + ApplicationProfile(mckp, app_db.get_files(app_name), args.dry_run, args.verbose).uninstall() + + foreachApp(mckp.get_apps_to_backup(), uninstallApp) + # Delete the Mackup folder in Dropbox # Don't delete this as there might be other Macs that aren't # uninstalled yet From e4009138e67006d4f3294a2baf4958ce85d33ea3 Mon Sep 17 00:00:00 2001 From: Dave Rostron Date: Tue, 11 Aug 2015 14:43:24 -0700 Subject: [PATCH 0437/1256] adding dry-run and verbose options; address review comments --- mackup/application.py | 41 +++++++++++++++++++----------- mackup/main.py | 59 +++++++++++++++++++++---------------------- 2 files changed, 55 insertions(+), 45 deletions(-) diff --git a/mackup/application.py b/mackup/application.py index ce75310c0..64a2a1f66 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -12,6 +12,8 @@ class ApplicationProfile(object): + """Instantiate this class with application specific data.""" + def __init__(self, mackup, files, dry_run, verbose): """ Create an ApplicationProfile instance. @@ -28,7 +30,6 @@ def __init__(self, mackup, files, dry_run, verbose): self.dry_run = dry_run self.verbose = verbose - def getFilepaths(self, filename): """ Get home and mackup filepaths for given file @@ -70,9 +71,11 @@ def backup(self): or os.path.isdir(mackup_filepath)) and os.path.samefile(home_filepath, mackup_filepath))): - print("Backing up {} ...".format("" if self.verbose else filename)) if self.verbose: - print(" {}\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)) if self.dry_run: continue @@ -112,10 +115,12 @@ def backup(self): # Link the backuped file to its original place utils.link(mackup_filepath, home_filepath) elif self.verbose: - print("Doing nothing\n {}\n {}".format( - home_filepath, - "is already backed up to\n " + mackup_filepath - if os.path.exists(home_filepath) else "does not exist")) + if os.path.exists(home_filepath): + print("Doing nothing\n {}\n is already backed up to\n {}" + .format(home_filepath, mackup_filepath)) + else: + print("Doing nothing\n {}\n does not exist" + .format(home_filepath)) def restore(self): """ @@ -146,9 +151,11 @@ def restore(self): supported = utils.can_file_be_synced_on_current_platform(filename) if file_or_dir_exists and not pointing_to_mackup and supported: - print("Restoring {} ...".format("" if self.verbose else filename)) if self.verbose: - print(" linking {}\n to {}".format(home_filepath, mackup_filepath)) + print("Restoring\n linking {}\n to {} ..." + .format(home_filepath, mackup_filepath)) + else: + print("Restoring {} ...".format(filename)) if self.dry_run: continue @@ -175,10 +182,12 @@ def restore(self): else: utils.link(mackup_filepath, home_filepath) elif self.verbose: - print("Doing nothing\n {}\n {}".format( - mackup_filepath, - "already linked by\n " + home_filepath - if os.path.exists(home_filepath) else "does not exist")) + if os.path.exists(home_filepath): + print("Doing nothing\n {}\n already linked by\n {}" + .format(mackup_filepath, home_filepath)) + else: + print("Doing nothing\n {}\n does not exist" + .format(mackup_filepath)) def uninstall(self): """ @@ -204,9 +213,11 @@ def uninstall(self): or os.path.isdir(mackup_filepath)): # Check if there is a corresponding file in the home folder if os.path.exists(home_filepath): - print("Reverting {} ...".format(mackup_filepath if self.verbose else filename)) if self.verbose: - print(" at {}".format(home_filepath)) + print("Reverting {}\n at {} ..." + .format(mackup_filepath, home_filepath)) + else: + print("Reverting {} ...".format(filename)) if self.dry_run: continue diff --git a/mackup/main.py b/mackup/main.py index 3522288f8..422e4df3e 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -5,15 +5,17 @@ Usage: mackup list - mackup backup [ -f | --force ] - mackup restore [ -f | --force ] - mackup uninstall [ -f | --force ] + mackup backup [ -f | --force ] [ -d | --dry-run] [ -v | --verbose] + mackup restore [ -f | --force ] [ -d | --dry-run] [ -v | --verbose] + mackup uninstall [ -f | --force ] [ -d | --dry-run] [ -v | --verbose] mackup (-h | --help) mackup --version Options: -h --help Show this screen. - -f --force Force every question asked to be answered with "Yes" + -f --force Force every question asked to be answered with "Yes". + -d --dry-run Show steps without executing. + -v --verbose Show additional details. --version Show version. Modes of action: @@ -58,26 +60,25 @@ def main(): mckp = Mackup() app_db = ApplicationsDatabase() - def foreachApp(apps, f): - for app_name in apps: - if args.verbose: print(("{0} {1} {0}").format(header("---"), bold(app_name))) - f(app_name) - if args.verbose: print + def printAppHeader(app_name): + if verbose: print(("\n{0} {1} {0}").format(header("---"), bold(app_name))) # If we want to answer mackup with "yes" for each question if args['--force']: utils.FORCE_YES = True + dry_run = args['--dry-run'] + + verbose = args['--verbose'] + if args['backup']: # Check the env where the command is being run mckp.check_for_usable_backup_env() - def backupApplication(app_name): - ApplicationProfile(mckp, app_db.get_files(app_name), args.dry_run, args.verbose).backup() - # Backup each application for app_name in mckp.get_apps_to_backup(): - app = ApplicationProfile(mckp, app_db.get_files(app_name)) + app = ApplicationProfile(mckp, app_db.get_files(app_name), dry_run, verbose) + printAppHeader(app_name) app.backup() elif args['restore']: @@ -87,7 +88,10 @@ def backupApplication(app_name): # 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)) + app_db.get_files(MACKUP_APP_NAME), + dry_run, + verbose) + printAppHeader(MACKUP_APP_NAME) mackup_app.restore() # Initialize again the apps db, as the Mackup config might have changed @@ -101,44 +105,39 @@ def backupApplication(app_name): app_names.discard(MACKUP_APP_NAME) for app_name in app_names: - app = ApplicationProfile(mckp, app_db.get_files(app_name)) + app = ApplicationProfile(mckp, app_db.get_files(app_name), dry_run, verbose) + printAppHeader(app_name) app.restore() - def restoreApplication(app_name): - ApplicationProfile(mckp, app_db.get_files(app_name), args.dry_run, args.verbose).restore() - - foreachApp(mckp.get_apps_to_backup(), restoreApplication) - - elif args.mode == UNINSTALL_MODE: + elif args['uninstall']: # Check the env where the command is being run mckp.check_for_usable_restore_env() - if args.dry_run or \ + 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 ?"): + "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() app_names.discard(MACKUP_APP_NAME) + for app_name in mckp.get_apps_to_backup(): - app = ApplicationProfile(mckp, app_db.get_files(app_name)) + 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)) + app_db.get_files(MACKUP_APP_NAME), + dry_run, + verbose) mackup_app.uninstall() - def uninstallApp(app_name): - ApplicationProfile(mckp, app_db.get_files(app_name), args.dry_run, args.verbose).uninstall() - - foreachApp(mckp.get_apps_to_backup(), uninstallApp) - # Delete the Mackup folder in Dropbox # Don't delete this as there might be other Macs that aren't # uninstalled yet From 12b2d2faa61f3944b2102753cb53628267132a08 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 13 Aug 2015 22:02:08 -0400 Subject: [PATCH 0438/1256] Clean up the cli options --- mackup/main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mackup/main.py b/mackup/main.py index 422e4df3e..fd9b35cd9 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -5,16 +5,16 @@ Usage: mackup list - mackup backup [ -f | --force ] [ -d | --dry-run] [ -v | --verbose] - mackup restore [ -f | --force ] [ -d | --dry-run] [ -v | --verbose] - mackup uninstall [ -f | --force ] [ -d | --dry-run] [ -v | --verbose] + mackup [options] backup + mackup [options] restore + mackup [options] uninstall mackup (-h | --help) mackup --version Options: -h --help Show this screen. -f --force Force every question asked to be answered with "Yes". - -d --dry-run Show steps without executing. + -n --dry-run Show steps without executing. -v --verbose Show additional details. --version Show version. From 5ecd2f2c32730f8cc326eb082758ce224957dad3 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 13 Aug 2015 22:07:19 -0400 Subject: [PATCH 0439/1256] PEP8 compliance --- mackup/application.py | 23 +++++++++++++---------- mackup/main.py | 26 ++++++++++++++++++++------ mackup/utils.py | 11 ++++++++--- 3 files changed, 41 insertions(+), 19 deletions(-) diff --git a/mackup/application.py b/mackup/application.py index 64a2a1f66..19b63de40 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -69,11 +69,12 @@ def backup(self): 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))): + and os.path.samefile(home_filepath, + mackup_filepath))): if self.verbose: print("Backing up\n {}\n to\n {} ..." - .format(home_filepath, mackup_filepath)) + .format(home_filepath, mackup_filepath)) else: print("Backing up {} ...".format(filename)) @@ -116,11 +117,12 @@ 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)) else: print("Doing nothing\n {}\n does not exist" - .format(home_filepath)) + .format(home_filepath)) def restore(self): """ @@ -153,7 +155,7 @@ def restore(self): 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)) + .format(home_filepath, mackup_filepath)) else: print("Restoring {} ...".format(filename)) @@ -184,10 +186,10 @@ def restore(self): elif self.verbose: if os.path.exists(home_filepath): print("Doing nothing\n {}\n already linked by\n {}" - .format(mackup_filepath, home_filepath)) + .format(mackup_filepath, home_filepath)) else: print("Doing nothing\n {}\n does not exist" - .format(mackup_filepath)) + .format(mackup_filepath)) def uninstall(self): """ @@ -215,7 +217,7 @@ def uninstall(self): if os.path.exists(home_filepath): if self.verbose: print("Reverting {}\n at {} ..." - .format(mackup_filepath, home_filepath)) + .format(mackup_filepath, home_filepath)) else: print("Reverting {} ...".format(filename)) @@ -229,4 +231,5 @@ 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 fd9b35cd9..adca6c0ba 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -41,17 +41,21 @@ from .mackup import Mackup from . import utils + class ColorFormatCodes: - BLUE = '\033[34m' - BOLD = '\033[1m' + BLUE = '\033[34m' + BOLD = '\033[1m' NORMAL = '\033[0m' + def header(str): return ColorFormatCodes.BLUE + str + ColorFormatCodes.NORMAL + def bold(str): return ColorFormatCodes.BOLD + str + ColorFormatCodes.NORMAL + def main(): """Main function.""" # Get the command line arg @@ -61,7 +65,8 @@ def main(): app_db = ApplicationsDatabase() def printAppHeader(app_name): - if verbose: print(("\n{0} {1} {0}").format(header("---"), bold(app_name))) + if verbose: + print(("\n{0} {1} {0}").format(header("---"), bold(app_name))) # If we want to answer mackup with "yes" for each question if args['--force']: @@ -77,7 +82,10 @@ def printAppHeader(app_name): # Backup each application for app_name in 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() @@ -105,7 +113,10 @@ def printAppHeader(app_name): app_names.discard(MACKUP_APP_NAME) for app_name in 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() @@ -126,7 +137,10 @@ def printAppHeader(app_name): app_names.discard(MACKUP_APP_NAME) for app_name in 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.uninstall() diff --git a/mackup/utils.py b/mackup/utils.py index 1a20065c9..e20d33a72 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -219,8 +219,10 @@ def get_google_drive_folder_location(): (unicode) 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) + 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 @@ -244,6 +246,7 @@ def get_google_drive_folder_location(): return googledrive_home + def get_box_folder_location(): """ Try to locate the Box folder. @@ -251,7 +254,8 @@ 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) @@ -264,6 +268,7 @@ def get_box_folder_location(): return box_home + def get_copy_folder_location(): """ Try to locate the Copy folder. From d7bee99da793025bcbde23a372cf425b83a233ae Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 13 Aug 2015 22:08:40 -0400 Subject: [PATCH 0440/1256] Added flake8 --- circle.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/circle.yml b/circle.yml index 3c07ac124..d5c49baa8 100644 --- a/circle.yml +++ b/circle.yml @@ -1,4 +1,10 @@ +dependencies: + pre: + - pip install flake8 + test: + pre: + - flake8 override: - nosetests --with-coverage --cover-package=mackup post: From 762bd1c2361ca96f9b3bbf2298029647af1c61be Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 13 Aug 2015 22:11:57 -0400 Subject: [PATCH 0441/1256] Removing .config/git/ignore as github tries to overwrite it as a file --- mackup/applications/git.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/mackup/applications/git.cfg b/mackup/applications/git.cfg index e373d87b7..f69d51df9 100644 --- a/mackup/applications/git.cfg +++ b/mackup/applications/git.cfg @@ -3,4 +3,3 @@ name = Git [configuration_files] .gitconfig -.config/git/ignore From 0feb666649fbdb25f9823bbacfd6d6c33670a350 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 13 Aug 2015 22:18:14 -0400 Subject: [PATCH 0442/1256] Mackup 0.8.10 --- CHANGELOG.md | 1 + mackup/constants.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddb7e6fc8..2ec112925 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Added support for SecureCRT (via @micate) - Added dry-run and verbose options (via @yastero) +- Removed a git link which was overwritten by GitHub to a file ## Mackup 0.8.9 diff --git a/mackup/constants.py b/mackup/constants.py index d1d0709b1..28ce00184 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.9' +VERSION = '0.8.10' # Support platforms PLATFORM_DARWIN = 'Darwin' From 691eda504a4642a6f34fd15358cd2f93362d1595 Mon Sep 17 00:00:00 2001 From: William Myers Date: Fri, 14 Aug 2015 23:15:55 -0600 Subject: [PATCH 0443/1256] XDG support for app configs --- mackup/appsdb.py | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/mackup/appsdb.py b/mackup/appsdb.py index 4585c1f03..736f441d3 100644 --- a/mackup/appsdb.py +++ b/mackup/appsdb.py @@ -45,13 +45,29 @@ def __init__(self): 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'): + config_section = 'configuration_files' + if config.has_section(config_section): + self.apps[app_name][config_section] = set() + for path in config.options(config_section): if path.startswith('/'): raise ValueError('Unsupported absolute path: {}' .format(path)) - self.apps[app_name]['configuration_files'].add(path) + self.apps[app_name][config_section].add(path) + + # Add the XDG configuration files to sync + xdg_config_section = 'xdg_configuration_files' + xdg_config_home = os.environ.get('XDG_CONFIG_HOME', False) + if config.has_section(xdg_config_section): + self.apps[app_name][xdg_config_section] = set() + if xdg_config_home: + for path in config.options(xdg_config_section): + if path.startswith('/'): + raise ValueError( + 'Unsupported absolute path: {}' + .format(path)) + path = os.path.join(xdg_config_home, path) + path = path.replace(os.path.expanduser('~/'), '') + self.apps[app_name][config_section].add(path) @staticmethod def get_config_files(): From 3112f4ebd3b2db7b0e46d8624b27f1ffb55da060 Mon Sep 17 00:00:00 2001 From: nkgm Date: Mon, 17 Aug 2015 05:34:09 +0300 Subject: [PATCH 0444/1256] Sync entire Karabiner directory --- mackup/applications/karabiner.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/karabiner.cfg b/mackup/applications/karabiner.cfg index 7636fbe40..1ca7b29ee 100644 --- a/mackup/applications/karabiner.cfg +++ b/mackup/applications/karabiner.cfg @@ -5,4 +5,4 @@ name = Karabiner Library/Preferences/org.pqrs.Karabiner.plist Library/Preferences/org.pqrs.Karabiner-AXNotifier.plist Library/Preferences/org.pqrs.Karabiner.multitouchextension.plist -Library/Application Support/Karabiner/private.xml +Library/Application Support/Karabiner From 9d102fa15abac09d04cba4b577a8dabf154cd7ae Mon Sep 17 00:00:00 2001 From: William Myers Date: Mon, 17 Aug 2015 15:58:10 -0600 Subject: [PATCH 0445/1256] XDG support for app configs --- mackup/appsdb.py | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/mackup/appsdb.py b/mackup/appsdb.py index 736f441d3..1f7e6dc39 100644 --- a/mackup/appsdb.py +++ b/mackup/appsdb.py @@ -45,29 +45,35 @@ def __init__(self): self.apps[app_name]['name'] = app_pretty_name # Add the configuration files to sync - config_section = 'configuration_files' - if config.has_section(config_section): - self.apps[app_name][config_section] = set() - for path in config.options(config_section): + 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][config_section].add(path) + self.apps[app_name]['configuration_files'].add(path) # Add the XDG configuration files to sync - xdg_config_section = 'xdg_configuration_files' xdg_config_home = os.environ.get('XDG_CONFIG_HOME', False) - if config.has_section(xdg_config_section): - self.apps[app_name][xdg_config_section] = set() - if xdg_config_home: - for path in config.options(xdg_config_section): + if xdg_config_home: + if not os.path.exists(xdg_config_home): + raise ValueError('$XDG_CONFIG_HOME: {} does not exist' + .format(xdg_config_home)) + home = os.path.expanduser('~/') + if not xdg_config_home.startswith(home): + raise ValueError( + '$XDG_CONFIG_HOME: {0} must be somewhere ' + 'within your home directory: {1}' + .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(os.path.expanduser('~/'), '') - self.apps[app_name][config_section].add(path) + path = path.replace(home, '') + self.apps[app_name]['configuration_files'].add(path) @staticmethod def get_config_files(): From 4010efd2f56011c255ad264602016ff60d6d8686 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Tue, 18 Aug 2015 21:29:25 -0700 Subject: [PATCH 0446/1256] add newline --- mackup/applications/mailmate.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/mailmate.cfg b/mackup/applications/mailmate.cfg index 0e2c8b1c6..a49ed2c87 100644 --- a/mackup/applications/mailmate.cfg +++ b/mackup/applications/mailmate.cfg @@ -9,4 +9,4 @@ Library/Application Support/Mailmate/Mailboxes.plist Library/Application Support/Mailmate/Signatures.plist Library/Application Support/Mailmate/Sources.plist Library/Application Support/Mailmate/Submission.plist -Library/Application Support/Mailmate/Tags.plist \ No newline at end of file +Library/Application Support/Mailmate/Tags.plist From 23ba318a94f05a2762203dfaca2e01b7e8f8dd3b Mon Sep 17 00:00:00 2001 From: Bartosz Janda Date: Wed, 19 Aug 2015 18:58:43 +0200 Subject: [PATCH 0447/1256] Added support for Xcode plugins. --- CHANGELOG.md | 1 + mackup/applications/xcode.cfg | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53e5f3188..5513470ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Added dry-run and verbose options (via @yastero) - Removed a git link which was overwritten by GitHub to a file - Added support for Mailmate (via @cdransf) +- Added support for Xcode plugins (via @bartoszj) ## Mackup 0.8.9 diff --git a/mackup/applications/xcode.cfg b/mackup/applications/xcode.cfg index 52a769366..7c04ba812 100644 --- a/mackup/applications/xcode.cfg +++ b/mackup/applications/xcode.cfg @@ -2,6 +2,8 @@ name = Xcode [configuration_files] +Library/Preferences/com.apple.dt.Xcode.plist +Library/Application Support/Developer/Shared/Xcode/Plug-ins Library/Developer/Xcode/UserData/CodeSnippets Library/Developer/Xcode/UserData/FontAndColorThemes Library/Developer/Xcode/UserData/KeyBindings From 48df1db8a8644662a45322cf783b17d7dc574db9 Mon Sep 17 00:00:00 2001 From: William Myers Date: Fri, 21 Aug 2015 21:34:11 -0600 Subject: [PATCH 0448/1256] fixed line length issue --- mackup/appsdb.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mackup/appsdb.py b/mackup/appsdb.py index 1f7e6dc39..4a01e43fc 100644 --- a/mackup/appsdb.py +++ b/mackup/appsdb.py @@ -73,7 +73,8 @@ def __init__(self): .format(path)) path = os.path.join(xdg_config_home, path) path = path.replace(home, '') - self.apps[app_name]['configuration_files'].add(path) + self.apps[app_name]['configuration_files'] \ + .add(path) @staticmethod def get_config_files(): From cde05ddfc008a40bd341c21c62221d1401fed6d6 Mon Sep 17 00:00:00 2001 From: William Myers Date: Fri, 21 Aug 2015 21:36:02 -0600 Subject: [PATCH 0449/1256] fixed line length/identation issue --- mackup/appsdb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/appsdb.py b/mackup/appsdb.py index 4a01e43fc..ecd6ef387 100644 --- a/mackup/appsdb.py +++ b/mackup/appsdb.py @@ -74,7 +74,7 @@ def __init__(self): path = os.path.join(xdg_config_home, path) path = path.replace(home, '') self.apps[app_name]['configuration_files'] \ - .add(path) + .add(path) @staticmethod def get_config_files(): From b5fc8d9f562599bfe5f40378c81dfd1f8de6a476 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 22 Aug 2015 00:35:34 -0400 Subject: [PATCH 0450/1256] Cosmetic changes --- CHANGELOG.md | 1 + mackup/appsdb.py | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5513470ff..3d79725b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Removed a git link which was overwritten by GitHub to a file - Added support for Mailmate (via @cdransf) - Added support for Xcode plugins (via @bartoszj) +- XDG support for app configs (via @mkwmms) ## Mackup 0.8.9 diff --git a/mackup/appsdb.py b/mackup/appsdb.py index ecd6ef387..8c46e8013 100644 --- a/mackup/appsdb.py +++ b/mackup/appsdb.py @@ -54,27 +54,27 @@ def __init__(self): self.apps[app_name]['configuration_files'].add(path) # Add the XDG configuration files to sync - xdg_config_home = os.environ.get('XDG_CONFIG_HOME', False) + xdg_config_home = os.environ.get('XDG_CONFIG_HOME') if xdg_config_home: if not os.path.exists(xdg_config_home): raise ValueError('$XDG_CONFIG_HOME: {} does not exist' .format(xdg_config_home)) home = os.path.expanduser('~/') if not xdg_config_home.startswith(home): - raise ValueError( - '$XDG_CONFIG_HOME: {0} must be somewhere ' - 'within your home directory: {1}' - .format(xdg_config_home, 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('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) + (self.apps[app_name]['configuration_files'] + .add(path)) @staticmethod def get_config_files(): From f01bc8dc03b7ff0c6b7a6d5551ce077eae6b6872 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 22 Aug 2015 00:38:41 -0400 Subject: [PATCH 0451/1256] Add support for codecov --- README.md | 3 +-- circle.yml | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 35649297f..66d3dbefe 100644 --- a/README.md +++ b/README.md @@ -3,8 +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) -[![Coverage Status](https://coveralls.io/repos/lra/mackup/badge.svg)](https://coveralls.io/r/lra/mackup) -[![Code Health](https://landscape.io/github/lra/mackup/master/landscape.png)](https://landscape.io/github/lra/mackup/master) +[![codecov.io](http://codecov.io/github/lra/mackup/coverage.svg?branch=master)](http://codecov.io/github/lra/mackup?branch=master) ## Quickstart diff --git a/circle.yml b/circle.yml index d5c49baa8..d7336bdcb 100644 --- a/circle.yml +++ b/circle.yml @@ -1,11 +1,10 @@ dependencies: pre: - - pip install flake8 + - pip install flake8 codecov test: - pre: - - flake8 override: + - flake8 - nosetests --with-coverage --cover-package=mackup post: - - coveralls + - codecov From eefaac263f08a43183bda9432f2bb14c1c989620 Mon Sep 17 00:00:00 2001 From: william Date: Fri, 21 Aug 2015 23:12:29 -0600 Subject: [PATCH 0452/1256] Update git.cfg --- mackup/applications/git.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mackup/applications/git.cfg b/mackup/applications/git.cfg index f69d51df9..64bc6b488 100644 --- a/mackup/applications/git.cfg +++ b/mackup/applications/git.cfg @@ -3,3 +3,7 @@ name = Git [configuration_files] .gitconfig + +[xdg_configuration_files] +git/config +git/credentials From afcb0b371040c16012e5a7c2c410ff1e5a88f084 Mon Sep 17 00:00:00 2001 From: william Date: Sat, 22 Aug 2015 00:07:30 -0600 Subject: [PATCH 0453/1256] took out credentials --- mackup/applications/git.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/mackup/applications/git.cfg b/mackup/applications/git.cfg index 64bc6b488..fe1358578 100644 --- a/mackup/applications/git.cfg +++ b/mackup/applications/git.cfg @@ -6,4 +6,3 @@ name = Git [xdg_configuration_files] git/config -git/credentials From c1e41ff9abf1a2f9a9eb76a645ced73f0532b228 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 22 Aug 2015 12:28:53 -0400 Subject: [PATCH 0454/1256] Switched to codecov --- .coveralls.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .coveralls.yml diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index 18b57e14a..000000000 --- a/.coveralls.yml +++ /dev/null @@ -1 +0,0 @@ -repo_token: YJdQuTEbdh7ThzUSXKzsIbvsVl6Ksz8HX From 8927263f70cace857dcb46b5b76d1267b361df70 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 22 Aug 2015 19:36:28 -0400 Subject: [PATCH 0455/1256] Codebase cleanup --- .gitignore | 6 ++++++ .landscape.yaml | 3 --- Makefile | 3 ++- circle.yml | 7 +------ requirements.txt | 7 ++++--- setup.cfg | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 .landscape.yaml diff --git a/.gitignore b/.gitignore index bb5ee26d2..26bea1e0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,9 @@ +# Generated when running Mackup *.pyc + +# Generated by make release /mackup.egg-info/ /dist/ + +# Generated by make test +/.coverage diff --git a/.landscape.yaml b/.landscape.yaml deleted file mode 100644 index 4c476a3a4..000000000 --- a/.landscape.yaml +++ /dev/null @@ -1,3 +0,0 @@ -doc-warnings: true -test-warnings: true -strictness: veryhigh diff --git a/Makefile b/Makefile index d2a138fe6..f9c71683e 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,8 @@ undevelop: python setup.py develop --uninstall test: - nosetests + flake8 mackup + nosetests --with-coverage --cover-package=mackup clean: rm -rf dist/ diff --git a/circle.yml b/circle.yml index d7336bdcb..0066dc83b 100644 --- a/circle.yml +++ b/circle.yml @@ -1,10 +1,5 @@ -dependencies: - pre: - - pip install flake8 codecov - test: override: - - flake8 - - nosetests --with-coverage --cover-package=mackup + - make test post: - codecov diff --git a/requirements.txt b/requirements.txt index fc9f3e1ea..fbff3a188 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ # Needed to run the tests -# Run "pip install -r requirements.txt" then "nosetests" -nose==1.3.4 -coveralls==0.5 +# Run "pip install -r requirements.txt" then "make test" +nose +flake8 +codecov diff --git a/setup.cfg b/setup.cfg index 3c6e79cf3..2a9acf13d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,2 @@ [bdist_wheel] -universal=1 +universal = 1 From 185de6ddcb4e4c0e533e461b2085cd321a5bb085 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 22 Aug 2015 19:40:50 -0400 Subject: [PATCH 0456/1256] Update contributing doc --- CONTRIBUTING.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 95b4a0242..9e2df4251 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,12 +8,13 @@ You can: To speed up Pull Request (PR) approval and merger into Mackup, please follow these guidelines: - Keep one application supported per PR -- Add the application to the list of supported applications in README.md -- Add your change to the WIP section of CHANGELOG.md +- 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) - 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 application - The configuration should sync the minimal set of data, so that syncing happens quickly. Leave large app data out of the sync configuration. - Do not sync any file or folder that represents some state, like session data, cache, any file specific to the local workstation. + - Do not sync sensitive information, like clear passwords or private keys Thank you for your contribution! From 6817199c0dc5922c8ec9ba0aea0821df12b1b026 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 22 Aug 2015 19:50:11 -0400 Subject: [PATCH 0457/1256] Add markdown linter --- circle.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/circle.yml b/circle.yml index 0066dc83b..efdfbcf73 100644 --- a/circle.yml +++ b/circle.yml @@ -1,5 +1,12 @@ +dependencies: + pre: + - gem install mdl + test: override: - make test + - mdl: + files: + - "**/*.md" post: - codecov From 707b301f78ee203aa3f0d2f0f6e1f7e69b62f6b0 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 22 Aug 2015 19:54:18 -0400 Subject: [PATCH 0458/1256] md fixes --- README.md | 542 ++++++++++++++++++++++++------------------------ doc/README.md | 16 +- tests/README.md | 12 +- 3 files changed, 288 insertions(+), 282 deletions(-) diff --git a/README.md b/README.md index 66d3dbefe..1bda46206 100644 --- a/README.md +++ b/README.md @@ -117,282 +117,282 @@ folder and destroy the Mackup folder in Dropbox. ## Supported Storages - - [Dropbox](https://www.dropbox.com/) - - [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/)) +- [Dropbox](https://www.dropbox.com/) +- [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. ## Supported Applications - - [1Password 4](https://agilebits.com/onepassword) - - [Ack](http://beyondgrep.com/) - - [Adium](http://adium.im/) - - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - - [Adobe Photoshop CC](http://www.adobe.com/products/photoshop.html) - - [Android Studio](https://developer.android.com/sdk/) - - [AppCode](http://www.jetbrains.com/objc/) - - [aria2c](http://aria2.sourceforge.net/) - - [Arara](http://cereda.github.io/arara/) - - [Artistic Style](http://astyle.sourceforge.net) - - [Arm](https://www.atagar.com/arm/) - - [asciinema](https://asciinema.org/) - - [Aspell](http://aspell.net/) - - [Atom](https://atom.io/) - - [AusKey](https://abr.gov.au/AUSkey/) - - [Autokey](https://code.google.com/p/autokey) - - [Awareness](http://iamfutureproof.com/tools/awareness/) - - [AWS Command Line Interface](https://aws.amazon.com/cli/) - - [Microsoft Azure CLI](https://github.com/Azure/azure-xplat-cli) - - [Bartender](http://www.macbartender.com/) - - [Bash it](https://github.com/revans/bash-it/) - - [Bash](http://www.gnu.org/software/bash/) - - [BetterSnapTool](http://blog.boastr.net/) - - [BetterTouchTool](http://blog.boastr.net/) - - [BibDesk](http://bibdesk.sourceforge.net/) - - [Billings Pro Server Admin](https://www.marketcircle.com/billingspro/download/billingspro-server/) - - [Bitchx](http://www.bitchx.org/) - - [Boto](https://github.com/boto/boto) - - [Brackets](http://brackets.io/) - - [Bundler](http://bundler.io) - - [Byobu](http://byobu.co/) - - [Caffeine](http://lightheadsw.com/caffeine/) - - [Capture One](http://www.phaseone.com/Imaging-Software/Capture-One.aspx) - - [Cartographica](http://www.macgis.com) - - [Charles](http://www.charlesproxy.com) - - [Chef](http://www.opscode.com/chef/) - - [Chicken](http://sourceforge.net/projects/chicken/) - - [Clementine](http://www.clementine-player.org/) - - [ClipMenu](http://www.clipmenu.com/) - - [Clipy](http://clipy-app.com) - - [CloudApp](http://getcloudapp.com/) - - [Coda 2](http://panic.com/coda/) - - [Colloquy](http://colloquy.info/) - - [ColorSchemer Studio 2](http://www.colorschemer.com/osx_info.php) - - [ColorSync](http://en.wikipedia.org/wiki/ColorSync) - - [Composer](https://getcomposer.org/) - - [Concentrate](http://www.getconcentrating.com/) - - [Conky](http://conky.sourceforge.net/) - - [Consular](https://github.com/achiu/consular) - - [ControlPlane](http://www.controlplaneapp.com/) - - [CoRD](http://cord.sourceforge.net/) - - [CotEditor](http://coteditor.com/) - - [Cyberduck](http://cyberduck.ch/) - - [Dash](http://kapeli.com/dash) - - [DbVisualizer](https://www.dbvis.com/) - - [Deal Alert](http://dealalertapp.com/) - - [Default Folder X](http://www.stclairsoft.com/DefaultFolderX/) - - [dig](http://en.wikipedia.org/wiki/Dig_(command)) - - [Divvy](http://mizage.com/divvy/) - - [Docker](https://www.docker.com/) - - [Dolphin](https://dolphin-emu.org/) - - [Droplr](https://droplr.com/hello) - - [Dropzone 3](https://aptonic.com/dropzone3/) - - [EditorConfig](http://editorconfig.org/) - - [Emacs](http://www.gnu.org/software/emacs/) - - [Enjoyable](http://yukkurigames.com/enjoyable/) - - [Exercism](http://exercism.io/) - - [ExpanDrive](http://www.expandrive.com/) - - [Fantastical](http://flexibits.com/fantastical) - - [Feeds](http://www.feedsapp.com/) - - [Filezilla](https://filezilla-project.org/) - - [Fish](http://ridiculousfish.com/shell/) - - [Flux](http://stereopsis.com/flux/) - - [FontExplorer X](http://www.fontexplorerx.com/) - - [ForkLift 2](http://www.binarynights.com/forklift/) - - [Gas Mask](https://github.com/2ndalpha/gasmask/) - - [Gear Player](http://www.gearmusicplayer.com/) - - [GeekTool](http://projects.tynsoe.org/en/geektool/) - - [GHCi](http://www.haskell.org/haskellwiki/GHC/GHCi) - - [Git Hooks](https://github.com/icefox/git-hooks) - - [Git](http://git-scm.com/) - - [Gitbox](http://gitboxapp.com/) - - [Gmail Notifr](http://ashchan.com/projects/gmail-notifr) - - [GMVault](http://gmvault.org/) - - [Go2Shell](http://zipzapmac.com/Go2Shell) - - [GnuPG](http://www.gnupg.org/) (NOTE: includes private keys) - - [GrandTotal 3](http://www.mediaatelier.com/GrandTotal3/) - - [Gradle](http://gradle.org) - - [Gnome SSH Tunnel Manager](http://sourceforge.net/projects/gstm/) - - [Hammerspoon](http://www.hammerspoon.org/) - - [Hands Off!](http://www.oneperiodic.com/products/handsoff/) - - [Hazel](http://www.noodlesoft.com/hazel.php) - - [Heroku](https://www.heroku.com/) - - [HexChat](https://hexchat.github.io/) - - [Hexels](http://hexraystudios.com/hexels/) - - [Houdini](http://uglyapps.co.uk/houdini/) - - [Htop](http://htop.sourceforge.net/) - - [HyperSwitch](https://bahoom.com/hyperswitch) - - [i2cssh](https://github.com/wouterdebie/i2cssh) - - [i3wm](http://i3wm.org/) - - [IntelliJIDEA](http://www.jetbrains.com/idea/) - - [Irssi](http://www.irssi.org/) - - [i3](https://i3wm.org/) - - [iStat Menus 5](http://bjango.com/mac/istatmenus/) - - [IPython](http://ipython.org/) - - [ITerm2](http://www.iterm2.com/) - - [JSHint](http://www.jshint.com/) - - [Janus](https://github.com/carlhuda/janus) - - [jrnl](http://maebert.github.io/jrnl/) - - [Julia](http://julialang.org) - - [Kaleidoscope](http://www.kaleidoscopeapp.com/) - - [Karabiner](https://pqrs.org/osx/karabiner) - - [KeePassX](http://www.keepassx.org/) - - [Keka](http://kekaosx.com/) - - [Keybase](https://keybase.io/) - - [Keymo](http://manytricks.com/keymo/) - - [KeyRemap4MacBook](http://pqrs.org/macosx/keyremap4macbook/) - - [LaTeXiT](http://www.chachatelier.fr/latexit/latexit-home.php?lang=en) - - [LaunchBar](http://www.obdev.at/products/launchbar/index.html) - - [Liftoff](http://github.com/thoughtbot/liftoff) - - [Light Table](http://www.lighttable.com/) - - [LimeChat](http://limechat.net/mac/) - - [LittleSnitch](http://www.obdev.at/products/littlesnitch/) - - [Livestreamer](http://livestreamer.tanuki.se/) - - [MacOSX](http://www.apple.com/osx/) - - [MacVim](https://code.google.com/p/macvim/) - - [Magic Launch](https://www.oneperiodic.com/products/magiclaunch/) - - [MagicPrefs](http://magicprefs.com/) - - [Mailmate](http://freron.com/) - - [Mailplane](http://mailplaneapp.com/) - - [MATLAB](http://www.mathworks.com/products/matlab/) - - [Maven](http://maven.apache.org) - - [Max](http://sbooth.org/Max/) - - [MenuMeters](http://www.ragingmenace.com/software/menumeters/) - - [Mercurial](http://mercurial.selenic.com/) - - [MercuryMover](http://www.heliumfoot.com/mercurymover/) - - [Messages](http://www.apple.com/osx/apps/#messages) - - [Microsoft Remote Desktop](https://itunes.apple.com/us/app/microsoft-remote-desktop/id715768417?mt=12&ls=1) - - [MusicBrainz Picard](https://picard.musicbrainz.org/) - - [MySQL](http://www.mysql.com/) - - [Moom](http://manytricks.com/moom/) - - [Mou](http://mouapp.com/) - - [mpd](http://www.musicpd.org) - - [MPV](http://mpv.io/) - - [Nano](http://www.nano-editor.org/) - - [Navicat](http://navicat.com/) - - [ncmpcpp](http://ncmpcpp.rybczak.net) - - [newsbeuter](http://newsbeuter.org/) - - [ngrok](https://ngrok.com/) - - [Nomacs](http://nomacs.org/) - - [npm](https://www.npmjs.com/) - - [nvALT](http://brettterpstra.com/projects/nvalt/) - - [nvpy](https://github.com/cpbotha/nvpy) - - [Oh My Fish](https://github.com/bpinto/oh-my-fish) - - [Oh My Zsh](https://github.com/robbyrussell/oh-my-zsh) - - [OmniFocus](http://www.omnigroup.com/products/omnifocus/) - - [OmniGraffle](http://www.omnigroup.com/omnigraffle/) - - [OpenSSH](http://www.openssh.org/) (NOTE: includes private keys) - - [Pass](http://www.passwordstore.org/) - - [Pastebot](http://tapbots.com/software/pastebot/) - - [Path Finder](http://www.cocoatech.com/pathfinder/) - - [Pear](http://pear.php.net/) - - [Pentadactyl](http://5digits.org/pentadactyl/) - - [Perl](http://www.perl.org/) - - [Phoenix](https://github.com/sdegutis/Phoenix) - - [PhpStorm](http://www.jetbrains.com/phpstorm/) - - [PIP](http://www.pip-installer.org/) - - [Poedit](http://poedit.net/) - - [PokerStars](http://www.pokerstars.com/) - - [PopClip](http://pilotmoon.com/popclip/) - - [Popcorn-Time](https://popcorntime.io/) - - [PostgreSQL](http://postgresql.org/) - - [Pow](http://pow.cx/) - - [Prezto](https://github.com/sorin-ionescu/prezto) - - [Processing](http://processing.org/) - - [ProxyChains](http://proxychains.sourceforge.net) - - [ProxyChains NG](https://sourceforge.net/projects/proxychains-ng) - - [Punto Switcher](http://punto.yandex.ru/) - - [PyCharm 4](https://www.jetbrains.com/pycharm/) - - [PyPI](https://pypi.python.org/pypi) - - [PyRadio](http://www.coderholic.com/pyradio/) - - [Quicksilver](http://qsapp.com/) - - [Rails](http://rubyonrails.org/) - - [rTorrent](http://libtorrent.rakshasa.no/) - - [R](http://www.r-project.org/) - - [Royal TSX](http://www.royaltsx.com/ts/osx/features) - - [RStudio](http://rstudio.com) - - [Rubocop](https://github.com/bbatsov/rubocop) - - [Ruby Version](https://gist.github.com/fnichol/1912050) - - [Ruby](http://ruby-lang.org/) - - [RubyMine](http://www.jetbrains.com/ruby/) - - [S3cmd](http://s3tools.org/s3cmd) - - [SABnzbd](http://sabnzbd.org/) - - [SBCL](http://www.sbcl.org/) - - [SBT](http://www.scala-sbt.org/) - - [Scenario](http://www.lagentesoft.com/scenario/) - - [Screen](http://www.gnu.org/software/screen/) - - [Screenhero](https://screenhero.com) - - [Scrivener](http://www.literatureandlatte.com/scrivener.php) - - [Scroll Reverser](https://pilotmoon.com/scrollreverser/) - - [SecureCRT](https://www.vandyke.com/products/securecrt/) - - [SelfControl](http://selfcontrolapp.com/) - - [Seil](https://pqrs.org/macosx/keyremap4macbook/seil.html.en) - - [Sequel Pro](http://www.sequelpro.com/) - - [SHSH Blobs](http://en.wikipedia.org/wiki/SHSH_blob) - - [ShiftIt](https://github.com/fikovnik/ShiftIt) - - [Shimo](http://www.chungwasoft.com/shimo/) - - [Shuttle](http://fitztrev.github.io/shuttle/) - - [SizeUp](http://www.irradiatedsoftware.com/sizeup/) - - [Skim](http://skim-app.sourceforge.net/) - - [Skitch](http://evernote.com/skitch/) - - [Skype](http://www.skype.com/) - - [Slate](https://github.com/jigish/slate) - - [Slogger](http://brettterpstra.com/projects/slogger/) - - [Soulver](http://www.acqualia.com/soulver/) - - [SourceTree](http://sourcetreeapp.com) - - [Spacemacs](https://github.com/syl20bnr/spacemacs) - - [Spark](http://www.shadowlab.org/softwares/spark.php) - - [Spectrwm](https://opensource.conformal.com/wiki/spectrwm) - - [Spectacle](http://spectacleapp.com/) - - [Spotify](https://www.spotify.com/) - - [Stata](http://www.stata.com/) - - [Stay](https://cordlessdog.com/stay/) - - [Sublime Text](http://www.sublimetext.com/) - - [Subversion](http://subversion.apache.org/) - - [SuperDuper!](http://www.shirt-pocket.com/SuperDuper/SuperDuperDescription.html) - - [TaskPaper](http://www.hogbaysoftware.com/products/taskpaper) - - [Taskwarrior](http://www.taskwarrior.org/) - - [Teamocil](http://remiprev.github.io/teamocil/) - - [Terminator](https://launchpad.net/terminator/) - - [TextMate](http://macromates.com/) - - [Textual](http://www.codeux.com/textual/) - - [Tig](https://github.com/jonas/tig) - - [tint2](https://code.google.com/p/tint2/) - - [Tmux](http://tmux.sourceforge.net/) - - [Tmuxinator](https://github.com/aziz/tmuxinator) - - [Todo.txt CLI](http://todotxt.com/) - - [Tower](http://www.git-tower.com/) - - [Transmission](http://www.transmissionbt.com/) - - [Transmit](http://panic.com/transmit/) - - [Twitterrific](http://twitterrific.com/) - - [tvnamer](https://github.com/dbr/tvnamer) - - [Übersicht](http://tracesof.net/uebersicht/) - - [uTorrent](http://www.utorrent.com/) - - [Ventrilo](http://www.ventrilo.com/) - - [Versions](http://www.versionsapp.com) - - [Vim](http://www.vim.org/) - - [Vimperator](http://www.vimperator.org/vimperator) - - [Viscosity](http://www.sparklabs.com/viscosity/) - - [VLC](http://www.videolan.org/) - - [Visual Studio Code](https://code.visualstudio.com) - - [WebStorm](https://www.jetbrains.com/webstorm/) - - [Wget](https://www.gnu.org/software/wget/) - - [Witch](http://manytricks.com/witch/) - - [X11](http://www.x.org/) - - [Xamarin Studio](https://xamarin.com/studio) - - [XBindKeys](http://www.nongnu.org/xbindkeys/) - - [Xchat](http://www.xchat.org/) - - [XCode](https://developer.apple.com/xcode/) - - [XEmacs](http://www.xemacs.org/) - - [XLD](http://tmkk.undo.jp/xld/) - - [XtraFinder](http://www.trankynam.com/xtrafinder/) - - [Yummy FTP](http://www.yummysoftware.com/) - - [Zsh](http://zsh.sourceforge.net/) - - iTunes Applescripts +- [1Password 4](https://agilebits.com/onepassword) +- [Ack](http://beyondgrep.com/) +- [Adium](http://adium.im/) +- [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) +- [Adobe Photoshop CC](http://www.adobe.com/products/photoshop.html) +- [Android Studio](https://developer.android.com/sdk/) +- [AppCode](http://www.jetbrains.com/objc/) +- [aria2c](http://aria2.sourceforge.net/) +- [Arara](http://cereda.github.io/arara/) +- [Artistic Style](http://astyle.sourceforge.net) +- [Arm](https://www.atagar.com/arm/) +- [asciinema](https://asciinema.org/) +- [Aspell](http://aspell.net/) +- [Atom](https://atom.io/) +- [AusKey](https://abr.gov.au/AUSkey/) +- [Autokey](https://code.google.com/p/autokey) +- [Awareness](http://iamfutureproof.com/tools/awareness/) +- [AWS Command Line Interface](https://aws.amazon.com/cli/) +- [Microsoft Azure CLI](https://github.com/Azure/azure-xplat-cli) +- [Bartender](http://www.macbartender.com/) +- [Bash it](https://github.com/revans/bash-it/) +- [Bash](http://www.gnu.org/software/bash/) +- [BetterSnapTool](http://blog.boastr.net/) +- [BetterTouchTool](http://blog.boastr.net/) +- [BibDesk](http://bibdesk.sourceforge.net/) +- [Billings Pro Server Admin](https://www.marketcircle.com/billingspro/download/billingspro-server/) +- [Bitchx](http://www.bitchx.org/) +- [Boto](https://github.com/boto/boto) +- [Brackets](http://brackets.io/) +- [Bundler](http://bundler.io) +- [Byobu](http://byobu.co/) +- [Caffeine](http://lightheadsw.com/caffeine/) +- [Capture One](http://www.phaseone.com/Imaging-Software/Capture-One.aspx) +- [Cartographica](http://www.macgis.com) +- [Charles](http://www.charlesproxy.com) +- [Chef](http://www.opscode.com/chef/) +- [Chicken](http://sourceforge.net/projects/chicken/) +- [Clementine](http://www.clementine-player.org/) +- [ClipMenu](http://www.clipmenu.com/) +- [Clipy](http://clipy-app.com) +- [CloudApp](http://getcloudapp.com/) +- [Coda 2](http://panic.com/coda/) +- [Colloquy](http://colloquy.info/) +- [ColorSchemer Studio 2](http://www.colorschemer.com/osx_info.php) +- [ColorSync](http://en.wikipedia.org/wiki/ColorSync) +- [Composer](https://getcomposer.org/) +- [Concentrate](http://www.getconcentrating.com/) +- [Conky](http://conky.sourceforge.net/) +- [Consular](https://github.com/achiu/consular) +- [ControlPlane](http://www.controlplaneapp.com/) +- [CoRD](http://cord.sourceforge.net/) +- [CotEditor](http://coteditor.com/) +- [Cyberduck](http://cyberduck.ch/) +- [Dash](http://kapeli.com/dash) +- [DbVisualizer](https://www.dbvis.com/) +- [Deal Alert](http://dealalertapp.com/) +- [Default Folder X](http://www.stclairsoft.com/DefaultFolderX/) +- [dig](http://en.wikipedia.org/wiki/Dig_(command)) +- [Divvy](http://mizage.com/divvy/) +- [Docker](https://www.docker.com/) +- [Dolphin](https://dolphin-emu.org/) +- [Droplr](https://droplr.com/hello) +- [Dropzone 3](https://aptonic.com/dropzone3/) +- [EditorConfig](http://editorconfig.org/) +- [Emacs](http://www.gnu.org/software/emacs/) +- [Enjoyable](http://yukkurigames.com/enjoyable/) +- [Exercism](http://exercism.io/) +- [ExpanDrive](http://www.expandrive.com/) +- [Fantastical](http://flexibits.com/fantastical) +- [Feeds](http://www.feedsapp.com/) +- [Filezilla](https://filezilla-project.org/) +- [Fish](http://ridiculousfish.com/shell/) +- [Flux](http://stereopsis.com/flux/) +- [FontExplorer X](http://www.fontexplorerx.com/) +- [ForkLift 2](http://www.binarynights.com/forklift/) +- [Gas Mask](https://github.com/2ndalpha/gasmask/) +- [Gear Player](http://www.gearmusicplayer.com/) +- [GeekTool](http://projects.tynsoe.org/en/geektool/) +- [GHCi](http://www.haskell.org/haskellwiki/GHC/GHCi) +- [Git Hooks](https://github.com/icefox/git-hooks) +- [Git](http://git-scm.com/) +- [Gitbox](http://gitboxapp.com/) +- [Gmail Notifr](http://ashchan.com/projects/gmail-notifr) +- [GMVault](http://gmvault.org/) +- [Go2Shell](http://zipzapmac.com/Go2Shell) +- [GnuPG](http://www.gnupg.org/) (NOTE: includes private keys) +- [GrandTotal 3](http://www.mediaatelier.com/GrandTotal3/) +- [Gradle](http://gradle.org) +- [Gnome SSH Tunnel Manager](http://sourceforge.net/projects/gstm/) +- [Hammerspoon](http://www.hammerspoon.org/) +- [Hands Off!](http://www.oneperiodic.com/products/handsoff/) +- [Hazel](http://www.noodlesoft.com/hazel.php) +- [Heroku](https://www.heroku.com/) +- [HexChat](https://hexchat.github.io/) +- [Hexels](http://hexraystudios.com/hexels/) +- [Houdini](http://uglyapps.co.uk/houdini/) +- [Htop](http://htop.sourceforge.net/) +- [HyperSwitch](https://bahoom.com/hyperswitch) +- [i2cssh](https://github.com/wouterdebie/i2cssh) +- [i3wm](http://i3wm.org/) +- [IntelliJIDEA](http://www.jetbrains.com/idea/) +- [Irssi](http://www.irssi.org/) +- [i3](https://i3wm.org/) +- [iStat Menus 5](http://bjango.com/mac/istatmenus/) +- [IPython](http://ipython.org/) +- [ITerm2](http://www.iterm2.com/) +- [JSHint](http://www.jshint.com/) +- [Janus](https://github.com/carlhuda/janus) +- [jrnl](http://maebert.github.io/jrnl/) +- [Julia](http://julialang.org) +- [Kaleidoscope](http://www.kaleidoscopeapp.com/) +- [Karabiner](https://pqrs.org/osx/karabiner) +- [KeePassX](http://www.keepassx.org/) +- [Keka](http://kekaosx.com/) +- [Keybase](https://keybase.io/) +- [Keymo](http://manytricks.com/keymo/) +- [KeyRemap4MacBook](http://pqrs.org/macosx/keyremap4macbook/) +- [LaTeXiT](http://www.chachatelier.fr/latexit/latexit-home.php?lang=en) +- [LaunchBar](http://www.obdev.at/products/launchbar/index.html) +- [Liftoff](http://github.com/thoughtbot/liftoff) +- [Light Table](http://www.lighttable.com/) +- [LimeChat](http://limechat.net/mac/) +- [LittleSnitch](http://www.obdev.at/products/littlesnitch/) +- [Livestreamer](http://livestreamer.tanuki.se/) +- [MacOSX](http://www.apple.com/osx/) +- [MacVim](https://code.google.com/p/macvim/) +- [Magic Launch](https://www.oneperiodic.com/products/magiclaunch/) +- [MagicPrefs](http://magicprefs.com/) +- [Mailmate](http://freron.com/) +- [Mailplane](http://mailplaneapp.com/) +- [MATLAB](http://www.mathworks.com/products/matlab/) +- [Maven](http://maven.apache.org) +- [Max](http://sbooth.org/Max/) +- [MenuMeters](http://www.ragingmenace.com/software/menumeters/) +- [Mercurial](http://mercurial.selenic.com/) +- [MercuryMover](http://www.heliumfoot.com/mercurymover/) +- [Messages](http://www.apple.com/osx/apps/#messages) +- [Microsoft Remote Desktop](https://itunes.apple.com/us/app/microsoft-remote-desktop/id715768417?mt=12&ls=1) +- [MusicBrainz Picard](https://picard.musicbrainz.org/) +- [MySQL](http://www.mysql.com/) +- [Moom](http://manytricks.com/moom/) +- [Mou](http://mouapp.com/) +- [mpd](http://www.musicpd.org) +- [MPV](http://mpv.io/) +- [Nano](http://www.nano-editor.org/) +- [Navicat](http://navicat.com/) +- [ncmpcpp](http://ncmpcpp.rybczak.net) +- [newsbeuter](http://newsbeuter.org/) +- [ngrok](https://ngrok.com/) +- [Nomacs](http://nomacs.org/) +- [npm](https://www.npmjs.com/) +- [nvALT](http://brettterpstra.com/projects/nvalt/) +- [nvpy](https://github.com/cpbotha/nvpy) +- [Oh My Fish](https://github.com/bpinto/oh-my-fish) +- [Oh My Zsh](https://github.com/robbyrussell/oh-my-zsh) +- [OmniFocus](http://www.omnigroup.com/products/omnifocus/) +- [OmniGraffle](http://www.omnigroup.com/omnigraffle/) +- [OpenSSH](http://www.openssh.org/) (NOTE: includes private keys) +- [Pass](http://www.passwordstore.org/) +- [Pastebot](http://tapbots.com/software/pastebot/) +- [Path Finder](http://www.cocoatech.com/pathfinder/) +- [Pear](http://pear.php.net/) +- [Pentadactyl](http://5digits.org/pentadactyl/) +- [Perl](http://www.perl.org/) +- [Phoenix](https://github.com/sdegutis/Phoenix) +- [PhpStorm](http://www.jetbrains.com/phpstorm/) +- [PIP](http://www.pip-installer.org/) +- [Poedit](http://poedit.net/) +- [PokerStars](http://www.pokerstars.com/) +- [PopClip](http://pilotmoon.com/popclip/) +- [Popcorn-Time](https://popcorntime.io/) +- [PostgreSQL](http://postgresql.org/) +- [Pow](http://pow.cx/) +- [Prezto](https://github.com/sorin-ionescu/prezto) +- [Processing](http://processing.org/) +- [ProxyChains](http://proxychains.sourceforge.net) +- [ProxyChains NG](https://sourceforge.net/projects/proxychains-ng) +- [Punto Switcher](http://punto.yandex.ru/) +- [PyCharm 4](https://www.jetbrains.com/pycharm/) +- [PyPI](https://pypi.python.org/pypi) +- [PyRadio](http://www.coderholic.com/pyradio/) +- [Quicksilver](http://qsapp.com/) +- [Rails](http://rubyonrails.org/) +- [rTorrent](http://libtorrent.rakshasa.no/) +- [R](http://www.r-project.org/) +- [Royal TSX](http://www.royaltsx.com/ts/osx/features) +- [RStudio](http://rstudio.com) +- [Rubocop](https://github.com/bbatsov/rubocop) +- [Ruby Version](https://gist.github.com/fnichol/1912050) +- [Ruby](http://ruby-lang.org/) +- [RubyMine](http://www.jetbrains.com/ruby/) +- [S3cmd](http://s3tools.org/s3cmd) +- [SABnzbd](http://sabnzbd.org/) +- [SBCL](http://www.sbcl.org/) +- [SBT](http://www.scala-sbt.org/) +- [Scenario](http://www.lagentesoft.com/scenario/) +- [Screen](http://www.gnu.org/software/screen/) +- [Screenhero](https://screenhero.com) +- [Scrivener](http://www.literatureandlatte.com/scrivener.php) +- [Scroll Reverser](https://pilotmoon.com/scrollreverser/) +- [SecureCRT](https://www.vandyke.com/products/securecrt/) +- [SelfControl](http://selfcontrolapp.com/) +- [Seil](https://pqrs.org/macosx/keyremap4macbook/seil.html.en) +- [Sequel Pro](http://www.sequelpro.com/) +- [SHSH Blobs](http://en.wikipedia.org/wiki/SHSH_blob) +- [ShiftIt](https://github.com/fikovnik/ShiftIt) +- [Shimo](http://www.chungwasoft.com/shimo/) +- [Shuttle](http://fitztrev.github.io/shuttle/) +- [SizeUp](http://www.irradiatedsoftware.com/sizeup/) +- [Skim](http://skim-app.sourceforge.net/) +- [Skitch](http://evernote.com/skitch/) +- [Skype](http://www.skype.com/) +- [Slate](https://github.com/jigish/slate) +- [Slogger](http://brettterpstra.com/projects/slogger/) +- [Soulver](http://www.acqualia.com/soulver/) +- [SourceTree](http://sourcetreeapp.com) +- [Spacemacs](https://github.com/syl20bnr/spacemacs) +- [Spark](http://www.shadowlab.org/softwares/spark.php) +- [Spectrwm](https://opensource.conformal.com/wiki/spectrwm) +- [Spectacle](http://spectacleapp.com/) +- [Spotify](https://www.spotify.com/) +- [Stata](http://www.stata.com/) +- [Stay](https://cordlessdog.com/stay/) +- [Sublime Text](http://www.sublimetext.com/) +- [Subversion](http://subversion.apache.org/) +- [SuperDuper!](http://www.shirt-pocket.com/SuperDuper/SuperDuperDescription.html) +- [TaskPaper](http://www.hogbaysoftware.com/products/taskpaper) +- [Taskwarrior](http://www.taskwarrior.org/) +- [Teamocil](http://remiprev.github.io/teamocil/) +- [Terminator](https://launchpad.net/terminator/) +- [TextMate](http://macromates.com/) +- [Textual](http://www.codeux.com/textual/) +- [Tig](https://github.com/jonas/tig) +- [tint2](https://code.google.com/p/tint2/) +- [Tmux](http://tmux.sourceforge.net/) +- [Tmuxinator](https://github.com/aziz/tmuxinator) +- [Todo.txt CLI](http://todotxt.com/) +- [Tower](http://www.git-tower.com/) +- [Transmission](http://www.transmissionbt.com/) +- [Transmit](http://panic.com/transmit/) +- [Twitterrific](http://twitterrific.com/) +- [tvnamer](https://github.com/dbr/tvnamer) +- [Übersicht](http://tracesof.net/uebersicht/) +- [uTorrent](http://www.utorrent.com/) +- [Ventrilo](http://www.ventrilo.com/) +- [Versions](http://www.versionsapp.com) +- [Vim](http://www.vim.org/) +- [Vimperator](http://www.vimperator.org/vimperator) +- [Viscosity](http://www.sparklabs.com/viscosity/) +- [VLC](http://www.videolan.org/) +- [Visual Studio Code](https://code.visualstudio.com) +- [WebStorm](https://www.jetbrains.com/webstorm/) +- [Wget](https://www.gnu.org/software/wget/) +- [Witch](http://manytricks.com/witch/) +- [X11](http://www.x.org/) +- [Xamarin Studio](https://xamarin.com/studio) +- [XBindKeys](http://www.nongnu.org/xbindkeys/) +- [Xchat](http://www.xchat.org/) +- [XCode](https://developer.apple.com/xcode/) +- [XEmacs](http://www.xemacs.org/) +- [XLD](http://tmkk.undo.jp/xld/) +- [XtraFinder](http://www.trankynam.com/xtrafinder/) +- [Yummy FTP](http://www.yummysoftware.com/) +- [Zsh](http://zsh.sourceforge.net/) +- iTunes Applescripts ## Can you support application X? diff --git a/doc/README.md b/doc/README.md index 4374ed51e..309798d7c 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,8 +1,10 @@ # Configuration -All the configuration is done into a file named `.mackup.cfg` to store at the root of your home folder. +All the configuration is done into a file named `.mackup.cfg` to store at the +root of your home folder. To configure mackup, create a file named ´.mackup.cfg´ in your home directory. + ```bash $ vi ~/.mackup.cfg ``` @@ -114,7 +116,7 @@ A [sample](.mackup.cfg) of this file is available in this folder. Just copy it in your home folder: ```bash -$ cp mackup/doc/.mackup.cfg ~/ +cp mackup/doc/.mackup.cfg ~/ ``` ### Don't sync an application @@ -133,7 +135,7 @@ A [sample](.mackup.cfg) of this file is available in this folder. Just copy it in your home folder: ```bash -$ cp mackup/doc/.mackup.cfg ~/ +cp mackup/doc/.mackup.cfg ~/ ``` ### Get official support for an application @@ -156,9 +158,9 @@ In your home, create a `.mackup` directory and add a config file for the application you'd like to support. ```bash -$ mkdir ~/.mackup -$ touch ~/.mackup/nethack.cfg -$ touch ~/.mackup/my-files.cfg +mkdir ~/.mackup +touch ~/.mackup/nethack.cfg +touch ~/.mackup/my-files.cfg ``` Edit those files @@ -183,6 +185,7 @@ bin ``` You can run mackup to see if they are listed + ```bash $ mackup list Supported applications: @@ -193,6 +196,7 @@ Supported applications: ``` All good, you can now sync your newly configured files: + ```bash mackup backup ``` diff --git a/tests/README.md b/tests/README.md index eec17a3d7..0d2ca02ee 100644 --- a/tests/README.md +++ b/tests/README.md @@ -1,17 +1,19 @@ -## Tests ? +# Tests Tests are put in this folder. + Feel free to add more, the more the better ! -## How to run the tests ? +## How to run the tests ```bash -$ cd src/mackup -$ pip install -r requirements.txt -$ nosetests +cd src/mackup +pip install -r requirements.txt +nosetests ``` And you should see + ``` . ---------------------------------------------------------------------- From 8052fe8cc385462f24322908f00591ee5f6548b0 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 22 Aug 2015 19:58:53 -0400 Subject: [PATCH 0459/1256] mdl fixes --- README.md | 21 +++++++++++++-------- doc/README.md | 2 +- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 1bda46206..f7b24cc64 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ that's super easy. On OS X, if you want an easy install, you can install [Homebrew](http://brew.sh/) and do: + ```bash # Install Mackup brew install mackup @@ -21,6 +22,7 @@ mackup backup ``` If not running OS X, or you don't like Homebrew, you can use PIP: + ```bash # Install Mackup with PIP pip install mackup @@ -32,6 +34,7 @@ mackup backup You're all set, and constantly backuped from now on. Next, on any new workstation, do: + ```bash # Install Mackup brew install mackup @@ -66,7 +69,7 @@ Display the list of applications supported by Mackup. Get some help, obvious... -## What does it do ? +## What does it do - Backups your application settings in a safe directory (e.g. Dropbox) - Syncs your application settings among all your workstations @@ -79,7 +82,7 @@ files are transfered). It also helps you spend more time doing real cool stuff, and less time setting up your environment. -## Bullsh*t, what does it really do to my files ?! +## Bullsh*t, what does it really do to my files Let's take `git` as an example. Your settings for `git` are saved in your home folder, in the `.gitconfig` file. @@ -108,10 +111,12 @@ That's it, you got your `git` config setup on your new workstation. ### Uninstall You can revert all your files to their original state. + ```bash # Just run this mackup uninstall ``` + This will move back any file from Dropbox to its original place in your home folder and destroy the Mackup folder in Dropbox. @@ -394,11 +399,11 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Zsh](http://zsh.sourceforge.net/) - iTunes Applescripts -## Can you support application X? +## Can you support application X -We can [with your help](https://github.com/lra/mackup/tree/master/doc#get-official-support-for-an-application) ;) +We can [with your help](doc#get-official-support-for-an-application) ;) -## Why did you do this ?! +## Why did you do this Yesterday, I had a talk with [Zach Zaro](http://zacharyzaro.com/), complaining about the pain it is to reconfigure our Macbook each time we get a new one or @@ -426,15 +431,15 @@ configs to Dropbox (or Google Drive, or anything). And it's [GPL](http://www.gnu.org/licenses/gpl.html) of course. -## What platform is supported ? +## What platform is supported - OS X - GNU/Linux -## What's up with the weird name ? +## What's up with the weird name Mackup is just a contraction of Mac and Backup, I suck at naming stuff, ok. -## Where can I find more information ? +## Where can I find more information In the [doc](doc) directory. diff --git a/doc/README.md b/doc/README.md index 309798d7c..dcb1cef35 100644 --- a/doc/README.md +++ b/doc/README.md @@ -6,7 +6,7 @@ root of your home folder. To configure mackup, create a file named ´.mackup.cfg´ in your home directory. ```bash -$ vi ~/.mackup.cfg +vi ~/.mackup.cfg ``` ## Storage From af33bf831b6158d4dce0606e4300554aa5f76f72 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 22 Aug 2015 20:02:27 -0400 Subject: [PATCH 0460/1256] md fixes --- CONTRIBUTING.md | 21 +++++++++++++++------ INSTALL.md | 8 ++++---- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9e2df4251..82ec8a596 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,19 +2,28 @@ You can: -- Add or improve the support of an application (Check the [TODO](https://github.com/lra/mackup/labels/TODO) and [TOFIX](https://github.com/lra/mackup/labels/TOFIX) tasks and pick one) +- Add or improve the support of an application (Check the [TODO][TODO] and + [TOFIX][TOFIX] tasks and pick one) - Improve the Mackup codebase -To speed up Pull Request (PR) approval and merger into Mackup, please follow these guidelines: +To speed up Pull Request (PR) approval and merger into Mackup, please follow +these guidelines: - Keep one application supported per PR -- Add the application to the list of supported applications in [README.md](README.md) +- 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) - 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 application - - The configuration should sync the minimal set of data, so that syncing happens quickly. Leave large app data out of the sync configuration. - - Do not sync any file or folder that represents some state, like session data, cache, any file specific to the local workstation. + - Syncing should not break any syncing functionality internal to the + application + - The configuration should sync the minimal set of data, so that syncing + happens quickly. Leave large app data out of the sync configuration. + - Do not sync any file or folder that represents some state, like session + data, cache, any file specific to the local workstation. - Do not sync sensitive information, like clear passwords or private keys Thank you for your contribution! + +[TODO]: https://github.com/lra/mackup/labels/TODO +[TOFIX]: https://github.com/lra/mackup/labels/TOFIX diff --git a/INSTALL.md b/INSTALL.md index 84cf8d33b..d1548558f 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -43,7 +43,7 @@ unzip mackup.zip ## Upgrade -### With Homebrew (OSX only) +### Upgrade with Homebrew (OSX only) ```bash brew update @@ -51,7 +51,7 @@ brew upgrade mackup -h ``` -### With Python's PIP +### Upgrade with Python's PIP ```bash pip install --upgrade mackup @@ -60,13 +60,13 @@ mackup -h ## Uninstall -### With Homebrew (OSX only) +### Uninstall with Homebrew (OSX only) ```bash brew uninstall mackup ``` -### With Python's PIP +### Uninstall with Python's PIP ```bash pip uninstall mackup From 8a6f4d3022752ea73440757cedf842eacaf97ac4 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 22 Aug 2015 20:44:04 -0400 Subject: [PATCH 0461/1256] Increase coverage --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f9c71683e..3bb4bd8ab 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ undevelop: test: flake8 mackup - nosetests --with-coverage --cover-package=mackup + nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup clean: rm -rf dist/ From e040a80838b59bbf8055486ffec9ada1fc039632 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 22 Aug 2015 20:51:42 -0400 Subject: [PATCH 0462/1256] More tests --- tests/main_tests.py | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 tests/main_tests.py diff --git a/tests/main_tests.py b/tests/main_tests.py new file mode 100644 index 000000000..3edda9e13 --- /dev/null +++ b/tests/main_tests.py @@ -0,0 +1,10 @@ +import unittest +from mackup import main + +class TestMain(unittest.TestCase): + + def test_main_header(self): + assert main.header('blah') == '\033[34mblah\033[0m' + + def test_main_bold(self): + assert main.bold('blah') == '\033[1mblah\033[0m' From 4b30875742030fe777bbfff0cf251fe2cb8b4f4b Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 22 Aug 2015 20:58:33 -0400 Subject: [PATCH 0463/1256] Mackup 0.8.11 --- CHANGELOG.md | 11 ++++++++--- mackup/constants.py | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d79725b6..c6187102d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,18 @@ ## WIP -- Added support for SecureCRT (via @micate) -- Added dry-run and verbose options (via @yastero) -- Removed a git link which was overwritten by GitHub to a file +## Mackup 0.8.11 + - Added support for Mailmate (via @cdransf) - Added support for Xcode plugins (via @bartoszj) - XDG support for app configs (via @mkwmms) +## Mackup 0.8.10 + +- Added support for SecureCRT (via @micate) +- Added dry-run and verbose options (via @yastero) +- Removed a git link which was overwritten by GitHub to a file + ## Mackup 0.8.9 - Fixed the 'force' option (via @hiyer) diff --git a/mackup/constants.py b/mackup/constants.py index 28ce00184..34f6b50e4 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.10' +VERSION = '0.8.11' # Support platforms PLATFORM_DARWIN = 'Darwin' From f765c009de633b5c8e787378cd62887b9771e81d Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 26 Aug 2015 11:57:54 -0400 Subject: [PATCH 0464/1256] Don't fail if the file is not in the mackup home --- mackup/application.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/application.py b/mackup/application.py index 19b63de40..eba4d7285 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -148,6 +148,7 @@ def restore(self): 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) From 189335f8420346eab4323ae829eab38577e672c9 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 26 Aug 2015 12:08:02 -0400 Subject: [PATCH 0465/1256] Verbose state when a link is broken --- mackup/application.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mackup/application.py b/mackup/application.py index eba4d7285..4bec3be37 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -120,6 +120,10 @@ def backup(self): 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)) else: print("Doing nothing\n {}\n does not exist" .format(home_filepath)) @@ -188,6 +192,10 @@ def restore(self): if os.path.exists(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)) else: print("Doing nothing\n {}\n does not exist" .format(mackup_filepath)) From da661284d471ae43486977059745454eebd9b435 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 26 Aug 2015 12:21:29 -0400 Subject: [PATCH 0466/1256] Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6187102d..aa9d6e245 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## WIP +- Don't fail if the file is not in the mackup home +- Verbose mode state when a link is broken + ## Mackup 0.8.11 - Added support for Mailmate (via @cdransf) From d15a7048b8f8c9516fb2882844377bc11ab1fead Mon Sep 17 00:00:00 2001 From: Peter Date: Fri, 28 Aug 2015 15:20:50 -0500 Subject: [PATCH 0467/1256] Add configuration for MacDive This adds configuration for MacDive (http://www.mac-dive.com/), the digital dive log for Mac OS X. --- mackup/applications/macdive2.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/macdive2.cfg diff --git a/mackup/applications/macdive2.cfg b/mackup/applications/macdive2.cfg new file mode 100644 index 000000000..5f8e033ed --- /dev/null +++ b/mackup/applications/macdive2.cfg @@ -0,0 +1,6 @@ +[application] +name = MacDive + +[configuration_files] +Library/Application Support/MacDive +Library/Preferences/com.mintsoftware.MacDive2.plist From 14973380dbfd1cca6838f402af4dc681f7b5f907 Mon Sep 17 00:00:00 2001 From: Peter Date: Fri, 28 Aug 2015 15:25:16 -0500 Subject: [PATCH 0468/1256] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f7b24cc64..76df45cfa 100644 --- a/README.md +++ b/README.md @@ -257,6 +257,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [LimeChat](http://limechat.net/mac/) - [LittleSnitch](http://www.obdev.at/products/littlesnitch/) - [Livestreamer](http://livestreamer.tanuki.se/) +- [MacDive](http://www.mac-dive.com/) - [MacOSX](http://www.apple.com/osx/) - [MacVim](https://code.google.com/p/macvim/) - [Magic Launch](https://www.oneperiodic.com/products/magiclaunch/) From 5cb4f4a7d06f2616ef4c99eacaab6aefbd4072ed Mon Sep 17 00:00:00 2001 From: USAMI Kosuke Date: Mon, 31 Aug 2015 21:47:02 +0900 Subject: [PATCH 0469/1256] Add support for AppCode 3.2 --- CHANGELOG.md | 1 + mackup/applications/appcode-32.cfg | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 mackup/applications/appcode-32.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index aa9d6e245..c18497e70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Don't fail if the file is not in the mackup home - Verbose mode state when a link is broken +- Added support of AppCode 3.2 (via @usami-k) ## Mackup 0.8.11 diff --git a/mackup/applications/appcode-32.cfg b/mackup/applications/appcode-32.cfg new file mode 100644 index 000000000..21cae32da --- /dev/null +++ b/mackup/applications/appcode-32.cfg @@ -0,0 +1,6 @@ +[application] +name = AppCode 3.2 + +[configuration_files] +Library/Application Support/AppCode32 +Library/Preferences/AppCode32 From c2d6e681fef915f35ab03561882d6ed647c16b8c Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Mon, 31 Aug 2015 09:45:23 -0400 Subject: [PATCH 0470/1256] Update bettertouchtool.cfg Sparkle is out of control. This limits the appsupport directory to just a data file called bttdata2. --- mackup/applications/bettertouchtool.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/bettertouchtool.cfg b/mackup/applications/bettertouchtool.cfg index 2a80396c0..05107b89e 100644 --- a/mackup/applications/bettertouchtool.cfg +++ b/mackup/applications/bettertouchtool.cfg @@ -3,4 +3,4 @@ name = BetterTouchTool [configuration_files] Library/Preferences/com.hegenberg.BetterTouchTool.plist -Library/Application Support/BetterTouchTool +Library/Application Support/BetterTouchTool/bttdata2 From 73e4f436f92a45d288bb3fd05dc1418e71697c4f Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Mon, 31 Aug 2015 09:46:29 -0400 Subject: [PATCH 0471/1256] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa9d6e245..d591819ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Don't fail if the file is not in the mackup home - Verbose mode state when a link is broken +- Improved support for BetterTouchTool, excluding Sparkle data (via @kfinlay) ## Mackup 0.8.11 From 206c87e4a99fdf2f78e90df42078ebff4d988367 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Mon, 31 Aug 2015 09:53:10 -0400 Subject: [PATCH 0472/1256] Update ubersicht.cfg Excludes Sparkle data --- mackup/applications/ubersicht.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/ubersicht.cfg b/mackup/applications/ubersicht.cfg index 7fbe86dc0..1f05da7ae 100644 --- a/mackup/applications/ubersicht.cfg +++ b/mackup/applications/ubersicht.cfg @@ -2,5 +2,5 @@ name = Ubersicht [configuration_files] -Library/Application Support/Übersicht +Library/Application Support/Übersicht/widgets Library/Preferences/tracesOf.Uebersicht.plist From a06bd8c074ab70c7e22517840993c64df38a496f Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Mon, 31 Aug 2015 09:54:04 -0400 Subject: [PATCH 0473/1256] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa9d6e245..ae5db3c1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Don't fail if the file is not in the mackup home - Verbose mode state when a link is broken +- Improved Ubersicht support, excluding Sparkle data (via @kfinlay) ## Mackup 0.8.11 From 54be5770d08c28059dc133894ecfc90b7373c479 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 2 Sep 2015 18:57:22 -0400 Subject: [PATCH 0474/1256] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa9d6e245..ce4d6906e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Don't fail if the file is not in the mackup home - Verbose mode state when a link is broken +- Add support for MacDive (via @peschee) ## Mackup 0.8.11 From f797b557b1b8683318e6852d2ee7060342c36c75 Mon Sep 17 00:00:00 2001 From: Hariharan Iyer Date: Mon, 7 Sep 2015 17:53:09 +0530 Subject: [PATCH 0475/1256] add support for neovim --- CHANGELOG.md | 1 + mackup/applications/neovim.cfg | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 mackup/applications/neovim.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bd8bf28a..f4790f8f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Added support of AppCode 3.2 (via @usami-k) - Improved support for BetterTouchTool, excluding Sparkle data (via @kfinlay) - Improved Ubersicht support, excluding Sparkle data (via @kfinlay) +- Add support for neovim (via @hiyer) ## Mackup 0.8.11 diff --git a/mackup/applications/neovim.cfg b/mackup/applications/neovim.cfg new file mode 100644 index 000000000..a30a8c049 --- /dev/null +++ b/mackup/applications/neovim.cfg @@ -0,0 +1,6 @@ +[application] +name = neovim + +[configuration_files] +.nvimrc +.nvim From 6d9a5a0f09fd58e8e3e9479ae2ae6b5040396ce2 Mon Sep 17 00:00:00 2001 From: Hariharan Iyer Date: Mon, 7 Sep 2015 17:58:16 +0530 Subject: [PATCH 0476/1256] Add neovim to list of files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 76df45cfa..57c16fd87 100644 --- a/README.md +++ b/README.md @@ -281,6 +281,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://ncmpcpp.rybczak.net) +- [neovim](https://github.com/neovim/neovim) - [newsbeuter](http://newsbeuter.org/) - [ngrok](https://ngrok.com/) - [Nomacs](http://nomacs.org/) From baa25cd3e54351750b8c7c83a081cbc4da9c7fc0 Mon Sep 17 00:00:00 2001 From: Justin Krup Date: Mon, 14 Sep 2015 11:56:05 -0400 Subject: [PATCH 0477/1256] include .vim/vimrc in backup Since Vim 7.4 you can also just place a file vimrc into $HOME/.vim/vimrc and Vim finds it automatically, so this is a potential spot for vimrc --- mackup/applications/vim.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/vim.cfg b/mackup/applications/vim.cfg index 878e5690d..2f5fd81d3 100644 --- a/mackup/applications/vim.cfg +++ b/mackup/applications/vim.cfg @@ -13,6 +13,7 @@ name = Vim .vim/ftplugin .vim/indent .vim/syntax +.vim/vimrc .vimrc .vimrc.after .vimrc.before From 2d512b83076f554dbe7dcff178db95373b128ac1 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Thu, 17 Sep 2015 15:45:14 -0400 Subject: [PATCH 0478/1256] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4790f8f6..4df1449a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Improved support for BetterTouchTool, excluding Sparkle data (via @kfinlay) - Improved Ubersicht support, excluding Sparkle data (via @kfinlay) - Add support for neovim (via @hiyer) +- Add support for Pandoc ## Mackup 0.8.11 From db6a83b28c10a76c1e1bd989ef16af2f85282bd8 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Thu, 17 Sep 2015 15:46:07 -0400 Subject: [PATCH 0479/1256] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 57c16fd87..c0f2b71bc 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. - [OmniFocus](http://www.omnigroup.com/products/omnifocus/) - [OmniGraffle](http://www.omnigroup.com/omnigraffle/) - [OpenSSH](http://www.openssh.org/) (NOTE: includes private keys) +- [Pandoc](http://pandoc.org) - [Pass](http://www.passwordstore.org/) - [Pastebot](http://tapbots.com/software/pastebot/) - [Path Finder](http://www.cocoatech.com/pathfinder/) From 4ce408666c110aff11ec5891b4a9a59c78ece098 Mon Sep 17 00:00:00 2001 From: Keith Finlay Date: Thu, 17 Sep 2015 15:47:20 -0400 Subject: [PATCH 0480/1256] Added support for Pandoc --- mackup/applications/pandoc.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/pandoc.cfg diff --git a/mackup/applications/pandoc.cfg b/mackup/applications/pandoc.cfg new file mode 100644 index 000000000..fc85bdda5 --- /dev/null +++ b/mackup/applications/pandoc.cfg @@ -0,0 +1,5 @@ +[application] +name = Pandoc + +[configuration_files] +.pandoc From 898b5a1f4e8bfc913740562e271f83a44f9fdd35 Mon Sep 17 00:00:00 2001 From: "Rico Sta. Cruz" Date: Sat, 19 Sep 2015 22:56:09 +0800 Subject: [PATCH 0481/1256] Install: remove master install instructions --- INSTALL.md | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index d1548558f..23dd83af5 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,10 +1,9 @@ # Detailed install instructions for Mackup -There are 3 ways to run mackup +There are 2 ways to run mackup 1. Install it with Homebrew (OSX only) 1. Install it with PIP (OSX and GNU/Linux) -1. Download it, and run it without installing it (OSX and GNU/Linux) ## Install @@ -28,19 +27,6 @@ pip install mackup mackup -h ``` -### Run it without installing it - -```bash -# Download Mackup -curl -o mackup.zip https://codeload.github.com/lra/mackup/zip/master - -# Uncompress the archive -unzip mackup.zip - -# Run it without the need to install it -./mackup-master/bin/mackup -h -``` - ## Upgrade ### Upgrade with Homebrew (OSX only) @@ -71,5 +57,3 @@ brew uninstall mackup ```bash pip uninstall mackup ``` - - From a9996858fe16827406486ff6ad977664ee1fa9df Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Mon, 21 Sep 2015 21:36:42 +0200 Subject: [PATCH 0482/1256] Add support for PhpStorm 9.5 --- mackup/applications/phpstorm-9.5.cfg | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 mackup/applications/phpstorm-9.5.cfg diff --git a/mackup/applications/phpstorm-9.5.cfg b/mackup/applications/phpstorm-9.5.cfg new file mode 100644 index 000000000..9a06060e1 --- /dev/null +++ b/mackup/applications/phpstorm-9.5.cfg @@ -0,0 +1,7 @@ +[application] +name = PhpStorm 9.5 + +[configuration_files] +Library/Application Support/WebIde95 +Library/Preferences/WebIde95 +Library/Preferences/com.jetbrains.PhpStorm.plist From c1eea743747a222412913404a5de74df1bd59fee Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Tue, 22 Sep 2015 11:30:34 +0200 Subject: [PATCH 0483/1256] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4df1449a3..7e39aa671 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Improved Ubersicht support, excluding Sparkle data (via @kfinlay) - Add support for neovim (via @hiyer) - Add support for Pandoc +- Add support for PhpStorm 9.5 (via @mnapoli) ## Mackup 0.8.11 From e9a3f52b32cfbfcd35317c1eca0592c44f53ae06 Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Tue, 22 Sep 2015 11:31:48 +0200 Subject: [PATCH 0484/1256] Improve composer support --- CHANGELOG.md | 1 + mackup/applications/composer.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4df1449a3..d328e23de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Improved Ubersicht support, excluding Sparkle data (via @kfinlay) - Add support for neovim (via @hiyer) - Add support for Pandoc +- Improved support for Composer, backup ./composer/composer.json (via @mnapoli) ## Mackup 0.8.11 diff --git a/mackup/applications/composer.cfg b/mackup/applications/composer.cfg index f3f332514..991dfc411 100644 --- a/mackup/applications/composer.cfg +++ b/mackup/applications/composer.cfg @@ -4,3 +4,4 @@ name = composer [configuration_files] .composer/auth.json .composer/config.json +.composer/composer.json From 87d973c68f2c41822e2fe7d9c3fd9ba78662d33e Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Tue, 22 Sep 2015 11:33:26 +0200 Subject: [PATCH 0485/1256] Add support for Blackfire --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/blackfire.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/blackfire.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b7768c137..4ff74f738 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Add support for Pandoc - Add support for PhpStorm 9.5 (via @mnapoli) - Improved support for Composer, backup ./composer/composer.json (via @mnapoli) +- Add support for Blackfire (via @mnapoli) ## Mackup 0.8.11 diff --git a/README.md b/README.md index c0f2b71bc..368ad13fb 100644 --- a/README.md +++ b/README.md @@ -160,6 +160,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [BibDesk](http://bibdesk.sourceforge.net/) - [Billings Pro Server Admin](https://www.marketcircle.com/billingspro/download/billingspro-server/) - [Bitchx](http://www.bitchx.org/) +- [Blackfire](https://blackfire.io/) - [Boto](https://github.com/boto/boto) - [Brackets](http://brackets.io/) - [Bundler](http://bundler.io) diff --git a/mackup/applications/blackfire.cfg b/mackup/applications/blackfire.cfg new file mode 100644 index 000000000..fbefba967 --- /dev/null +++ b/mackup/applications/blackfire.cfg @@ -0,0 +1,5 @@ +[application] +name = Blackfire + +[configuration_files] +.blackfire.ini From 87559f2da3f86a44fa0528c32f6c328f3fa58fb2 Mon Sep 17 00:00:00 2001 From: GochoMugo Date: Tue, 22 Sep 2015 18:32:40 +0300 Subject: [PATCH 0486/1256] Add support for liquidprompt See https://github.com/nojhan/liquidprompt for more info. --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/liquidprompt.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/liquidprompt.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b7768c137..fddfa2e0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Add support for Pandoc - Add support for PhpStorm 9.5 (via @mnapoli) - Improved support for Composer, backup ./composer/composer.json (via @mnapoli) +- Add support for liquidprompt (via @GochoMugo) ## Mackup 0.8.11 diff --git a/README.md b/README.md index c0f2b71bc..bf80ce6cc 100644 --- a/README.md +++ b/README.md @@ -255,6 +255,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Liftoff](http://github.com/thoughtbot/liftoff) - [Light Table](http://www.lighttable.com/) - [LimeChat](http://limechat.net/mac/) +- [Liquid Prompt](https://github.com/nojhan/liquidprompt) - [LittleSnitch](http://www.obdev.at/products/littlesnitch/) - [Livestreamer](http://livestreamer.tanuki.se/) - [MacDive](http://www.mac-dive.com/) diff --git a/mackup/applications/liquidprompt.cfg b/mackup/applications/liquidprompt.cfg new file mode 100644 index 000000000..be815a559 --- /dev/null +++ b/mackup/applications/liquidprompt.cfg @@ -0,0 +1,6 @@ +[application] +name = Liquid Prompt + +[configuration_files] +.liquidpromptrc +.config/liquidpromptrc From 2511fc953f4ed23d0b23d09f37d2f74c6483ae18 Mon Sep 17 00:00:00 2001 From: Robert Orzanna Date: Sat, 26 Sep 2015 10:40:51 +0200 Subject: [PATCH 0487/1256] Added redshift --- mackup/applications/redshift.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/redshift.cfg diff --git a/mackup/applications/redshift.cfg b/mackup/applications/redshift.cfg new file mode 100644 index 000000000..85bb31e65 --- /dev/null +++ b/mackup/applications/redshift.cfg @@ -0,0 +1,5 @@ +[application] +name = Redshift + +[configuration_files] +.config/redshift.conf From 246be9cfa01cdfbcb45c58668a172541e5e0e9ef Mon Sep 17 00:00:00 2001 From: Robert Orzanna Date: Sun, 27 Sep 2015 09:56:00 +0200 Subject: [PATCH 0488/1256] Added redshift --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/redshift.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/redshift.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d43a9058..45ba1553a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Improved support for Composer, backup ./composer/composer.json (via @mnapoli) - Add support for Blackfire (via @mnapoli) - Add support for liquidprompt (via @GochoMugo) +- Add support for REdshift (via @orschiro) ## Mackup 0.8.11 diff --git a/README.md b/README.md index 24caed478..31fc18970 100644 --- a/README.md +++ b/README.md @@ -323,6 +323,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Rails](http://rubyonrails.org/) - [rTorrent](http://libtorrent.rakshasa.no/) - [R](http://www.r-project.org/) +- [Redshift](http://jonls.dk/redshift/) - [Royal TSX](http://www.royaltsx.com/ts/osx/features) - [RStudio](http://rstudio.com) - [Rubocop](https://github.com/bbatsov/rubocop) diff --git a/mackup/applications/redshift.cfg b/mackup/applications/redshift.cfg new file mode 100644 index 000000000..85bb31e65 --- /dev/null +++ b/mackup/applications/redshift.cfg @@ -0,0 +1,5 @@ +[application] +name = Redshift + +[configuration_files] +.config/redshift.conf From ecc6bf87ed5126929eb9296b67c7f01191c739b1 Mon Sep 17 00:00:00 2001 From: Robert Orzanna Date: Mon, 28 Sep 2015 10:11:59 +0200 Subject: [PATCH 0489/1256] Add support for CopyQ --- CHANGELOG.md | 3 ++- README.md | 1 + mackup/applications/copyq.cfg | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 mackup/applications/copyq.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 45ba1553a..0ca34ccfe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,8 @@ - Improved support for Composer, backup ./composer/composer.json (via @mnapoli) - Add support for Blackfire (via @mnapoli) - Add support for liquidprompt (via @GochoMugo) -- Add support for REdshift (via @orschiro) +- Add support for Redshift (via @orschiro) +- Add support for CopyQ (via @orschiro) ## Mackup 0.8.11 diff --git a/README.md b/README.md index 31fc18970..20973bb6f 100644 --- a/README.md +++ b/README.md @@ -184,6 +184,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Conky](http://conky.sourceforge.net/) - [Consular](https://github.com/achiu/consular) - [ControlPlane](http://www.controlplaneapp.com/) +- [CopyQ](https://github.com/hluk/CopyQ) - [CoRD](http://cord.sourceforge.net/) - [CotEditor](http://coteditor.com/) - [Cyberduck](http://cyberduck.ch/) diff --git a/mackup/applications/copyq.cfg b/mackup/applications/copyq.cfg new file mode 100644 index 000000000..05b5530d4 --- /dev/null +++ b/mackup/applications/copyq.cfg @@ -0,0 +1,5 @@ +[application] +name = CopyQ + +[configuration_files] +.config/copyq From 823034aa2ec5b4fc22d83239a6dc3fb46abe1ab4 Mon Sep 17 00:00:00 2001 From: Naidis Date: Mon, 5 Oct 2015 08:56:25 +0900 Subject: [PATCH 0490/1256] add support for showyedge, which displays a color bar at the top edge of the screen depending on the current input source. --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/showyedge.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/showyedge.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 45ba1553a..937a8a6c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Add support for Blackfire (via @mnapoli) - Add support for liquidprompt (via @GochoMugo) - Add support for REdshift (via @orschiro) +- Add support for ShowyEdge (via @zanderzhng) ## Mackup 0.8.11 diff --git a/README.md b/README.md index 31fc18970..2f9efa167 100644 --- a/README.md +++ b/README.md @@ -346,6 +346,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [SHSH Blobs](http://en.wikipedia.org/wiki/SHSH_blob) - [ShiftIt](https://github.com/fikovnik/ShiftIt) - [Shimo](http://www.chungwasoft.com/shimo/) +- [ShowyEdge](https://pqrs.org/osx/ShowyEdge/index.html.en) - [Shuttle](http://fitztrev.github.io/shuttle/) - [SizeUp](http://www.irradiatedsoftware.com/sizeup/) - [Skim](http://skim-app.sourceforge.net/) diff --git a/mackup/applications/showyedge.cfg b/mackup/applications/showyedge.cfg new file mode 100644 index 000000000..e8883e1a1 --- /dev/null +++ b/mackup/applications/showyedge.cfg @@ -0,0 +1,5 @@ +[application] +name = ShowyEdge + +[configuration_files] +Library/Preferences/org.pqrs.ShowyEdge.plist From 7df586589b0d1ac900dd2be626c20bbae59ac048 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Fri, 9 Oct 2015 22:04:01 -0400 Subject: [PATCH 0491/1256] Mackup 0.8.12 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 937a8a6c2..62602c32b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.12 + - Don't fail if the file is not in the mackup home - Verbose mode state when a link is broken - Add support for MacDive (via @peschee) diff --git a/mackup/constants.py b/mackup/constants.py index 34f6b50e4..68cf73c25 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.11' +VERSION = '0.8.12' # Support platforms PLATFORM_DARWIN = 'Darwin' From f38274ec0d7a7c25ff7ecf1dc020e7ce79ca5e07 Mon Sep 17 00:00:00 2001 From: Riccardo Bartoli Date: Sat, 10 Oct 2015 23:06:43 +0100 Subject: [PATCH 0492/1256] Add support for Robomongo --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/robomongo.cfg | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/robomongo.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 62602c32b..6540a7632 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Add support for Robomongo (via @rbartoli) + ## Mackup 0.8.12 - Don't fail if the file is not in the mackup home diff --git a/README.md b/README.md index 2f9efa167..dd5bed05e 100644 --- a/README.md +++ b/README.md @@ -324,6 +324,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [rTorrent](http://libtorrent.rakshasa.no/) - [R](http://www.r-project.org/) - [Redshift](http://jonls.dk/redshift/) +- [Robomongo](http://robomongo.org/) - [Royal TSX](http://www.royaltsx.com/ts/osx/features) - [RStudio](http://rstudio.com) - [Rubocop](https://github.com/bbatsov/rubocop) diff --git a/mackup/applications/robomongo.cfg b/mackup/applications/robomongo.cfg new file mode 100644 index 000000000..177835292 --- /dev/null +++ b/mackup/applications/robomongo.cfg @@ -0,0 +1,5 @@ +[application] +name = Robomongo + +[configuration_files] +.config/robomongo From 45c42dadd12e3cfd05b415dc3cf8200f190e0d4c Mon Sep 17 00:00:00 2001 From: Riccardo Bartoli Date: Sun, 11 Oct 2015 22:40:38 +0100 Subject: [PATCH 0493/1256] Add support for Doxie --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/doxie.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/doxie.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 6540a7632..55c5fb640 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Add support for Robomongo (via @rbartoli) +- Add support for Doxie (via @rbartoli) ## Mackup 0.8.12 diff --git a/README.md b/README.md index dd5bed05e..05e8d25f2 100644 --- a/README.md +++ b/README.md @@ -195,6 +195,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/) +- [Doxie](http://www.getdoxie.com/) - [Droplr](https://droplr.com/hello) - [Dropzone 3](https://aptonic.com/dropzone3/) - [EditorConfig](http://editorconfig.org/) diff --git a/mackup/applications/doxie.cfg b/mackup/applications/doxie.cfg new file mode 100644 index 000000000..94089a0f1 --- /dev/null +++ b/mackup/applications/doxie.cfg @@ -0,0 +1,5 @@ +[application] +name = Doxie + +[configuration_files] +Library/Preferences/com.getdoxie.doxie.plist From ea297d5bd252449bc1911e12a594d5ab9c4f5e42 Mon Sep 17 00:00:00 2001 From: Riccardo Bartoli Date: Sun, 11 Oct 2015 22:42:27 +0100 Subject: [PATCH 0494/1256] Add support for AppCleaner --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/appcleaner.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/appcleaner.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 6540a7632..671a802b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Add support for Robomongo (via @rbartoli) +- Add support for AppCleaner (via @rbartoli) ## Mackup 0.8.12 diff --git a/README.md b/README.md index dd5bed05e..0fc7aeca1 100644 --- a/README.md +++ b/README.md @@ -139,6 +139,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - [Adobe Photoshop CC](http://www.adobe.com/products/photoshop.html) - [Android Studio](https://developer.android.com/sdk/) +- [AppCleaner](http://www.freemacsoft.net/appcleaner/) - [AppCode](http://www.jetbrains.com/objc/) - [aria2c](http://aria2.sourceforge.net/) - [Arara](http://cereda.github.io/arara/) diff --git a/mackup/applications/appcleaner.cfg b/mackup/applications/appcleaner.cfg new file mode 100644 index 000000000..05d29b66b --- /dev/null +++ b/mackup/applications/appcleaner.cfg @@ -0,0 +1,5 @@ +[application] +name = AppCleaner + +[configuration_files] +Library/Preferences/net.freemacsoft.AppCleaner.plist From bdbd946311dc4a261294369f99519ad2accccda3 Mon Sep 17 00:00:00 2001 From: Riccardo Bartoli Date: Sun, 11 Oct 2015 23:44:07 +0100 Subject: [PATCH 0495/1256] Add support for TotalSpaces2 --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/totalspaces2.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/totalspaces2.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 6540a7632..b9e2fef32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Add support for Robomongo (via @rbartoli) +- Add support for TotalSpaces2 (via @rbartoli) ## Mackup 0.8.12 diff --git a/README.md b/README.md index dd5bed05e..1448859f3 100644 --- a/README.md +++ b/README.md @@ -378,6 +378,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Tmux](http://tmux.sourceforge.net/) - [Tmuxinator](https://github.com/aziz/tmuxinator) - [Todo.txt CLI](http://todotxt.com/) +- [TotalSpaces2](http://totalspaces.binaryage.com/) - [Tower](http://www.git-tower.com/) - [Transmission](http://www.transmissionbt.com/) - [Transmit](http://panic.com/transmit/) diff --git a/mackup/applications/totalspaces2.cfg b/mackup/applications/totalspaces2.cfg new file mode 100644 index 000000000..956a288ed --- /dev/null +++ b/mackup/applications/totalspaces2.cfg @@ -0,0 +1,5 @@ +[application] +name = TotalSpaces2 + +[configuration_files] +Library/Preferences/com.binaryage.TotalSpaces2.plist From 75745b8e6db51acaaeb10e475285c24f924491b4 Mon Sep 17 00:00:00 2001 From: Riccardo Bartoli Date: Mon, 12 Oct 2015 00:22:47 +0100 Subject: [PATCH 0496/1256] Add support for WebStorm 11 --- CHANGELOG.md | 1 + mackup/applications/webstorm-11.cfg | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 mackup/applications/webstorm-11.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 6540a7632..d4c92d866 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Add support for Robomongo (via @rbartoli) +- Add support for WebStorm 11 (via @rbartoli) ## Mackup 0.8.12 diff --git a/mackup/applications/webstorm-11.cfg b/mackup/applications/webstorm-11.cfg new file mode 100644 index 000000000..0b3df3e2d --- /dev/null +++ b/mackup/applications/webstorm-11.cfg @@ -0,0 +1,6 @@ +[application] +name = WebStorm 11 + +[configuration_files] +Library/Application Support/WebStorm11 +Library/Preferences/WebStorm11 From 05772c7cc50ff1a8d5b3df88bba5bae4f70a4a43 Mon Sep 17 00:00:00 2001 From: Riccardo Bartoli Date: Sun, 11 Oct 2015 22:30:58 +0100 Subject: [PATCH 0497/1256] Add support for Jumpcut --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/jumpcut.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/jumpcut.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 6540a7632..3ed18dbae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Add support for Robomongo (via @rbartoli) +- Add support for Jumpcut (via @rbartoli) ## Mackup 0.8.12 diff --git a/README.md b/README.md index dd5bed05e..e8031e976 100644 --- a/README.md +++ b/README.md @@ -244,6 +244,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Janus](https://github.com/carlhuda/janus) - [jrnl](http://maebert.github.io/jrnl/) - [Julia](http://julialang.org) +- [Jumpcut](http://jumpcut.sourceforge.net/) - [Kaleidoscope](http://www.kaleidoscopeapp.com/) - [Karabiner](https://pqrs.org/osx/karabiner) - [KeePassX](http://www.keepassx.org/) diff --git a/mackup/applications/jumpcut.cfg b/mackup/applications/jumpcut.cfg new file mode 100644 index 000000000..1fba7da91 --- /dev/null +++ b/mackup/applications/jumpcut.cfg @@ -0,0 +1,6 @@ +[application] +name = Jumpcut + +[configuration_files] +Library/Application Support/Jumpcut +Library/Preferences/net.sf.Jumpcut.plist From 24d3e101f5bce09be308a3e14f4374d4dfdf54ce Mon Sep 17 00:00:00 2001 From: Riccardo Bartoli Date: Mon, 12 Oct 2015 00:33:29 +0100 Subject: [PATCH 0498/1256] Add support for z --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/z.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/z.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 6540a7632..5edf24e0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Add support for Robomongo (via @rbartoli) +- Add support for z (via @rbartoli) ## Mackup 0.8.12 diff --git a/README.md b/README.md index dd5bed05e..b4197ca50 100644 --- a/README.md +++ b/README.md @@ -404,6 +404,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [XLD](http://tmkk.undo.jp/xld/) - [XtraFinder](http://www.trankynam.com/xtrafinder/) - [Yummy FTP](http://www.yummysoftware.com/) +- [z](https://github.com/rupa/z) - [Zsh](http://zsh.sourceforge.net/) - iTunes Applescripts diff --git a/mackup/applications/z.cfg b/mackup/applications/z.cfg new file mode 100644 index 000000000..44db737dd --- /dev/null +++ b/mackup/applications/z.cfg @@ -0,0 +1,5 @@ +[application] +name = z + +[configuration_files] +.z From 01ddc4db9fb310556f5251e6904ef93bc795b179 Mon Sep 17 00:00:00 2001 From: Riccardo Bartoli Date: Sun, 11 Oct 2015 22:36:47 +0100 Subject: [PATCH 0499/1256] Add support for Electrum --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/electrum.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/electrum.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 6540a7632..a0641870c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Add support for Robomongo (via @rbartoli) +- Add support for Electrum (via @rbartoli) ## Mackup 0.8.12 diff --git a/README.md b/README.md index dd5bed05e..5246bf2d2 100644 --- a/README.md +++ b/README.md @@ -198,6 +198,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Droplr](https://droplr.com/hello) - [Dropzone 3](https://aptonic.com/dropzone3/) - [EditorConfig](http://editorconfig.org/) +- [Electrum](https://electrum.org/#home) - [Emacs](http://www.gnu.org/software/emacs/) - [Enjoyable](http://yukkurigames.com/enjoyable/) - [Exercism](http://exercism.io/) diff --git a/mackup/applications/electrum.cfg b/mackup/applications/electrum.cfg new file mode 100644 index 000000000..95f2dba6d --- /dev/null +++ b/mackup/applications/electrum.cfg @@ -0,0 +1,5 @@ +[application] +name = Electrum + +[configuration_files] +.electrum/config From e680ccaba16e0a27f45bd1ddbbba38f32f02c3ba Mon Sep 17 00:00:00 2001 From: Mateus Revoredo Date: Wed, 14 Oct 2015 00:25:23 -0300 Subject: [PATCH 0500/1256] Add support for Day-O --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/day-o.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/day-o.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 34c1ebdb6..0cc3605d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Add support for WebStorm 11 (via @rbartoli) - Add support for z (via @rbartoli) - Add support for Electrum (via @rbartoli) +- Add support for Day-O (via @mateusrevoredo) ## Mackup 0.8.12 diff --git a/README.md b/README.md index d06402b23..9a797636a 100644 --- a/README.md +++ b/README.md @@ -189,6 +189,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [CotEditor](http://coteditor.com/) - [Cyberduck](http://cyberduck.ch/) - [Dash](http://kapeli.com/dash) +- [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/) - [Default Folder X](http://www.stclairsoft.com/DefaultFolderX/) diff --git a/mackup/applications/day-o.cfg b/mackup/applications/day-o.cfg new file mode 100644 index 000000000..afaa74203 --- /dev/null +++ b/mackup/applications/day-o.cfg @@ -0,0 +1,5 @@ +[application] +name = Day-O + +[configuration_files] +Library/Preferences/com.shauninman.Day-O.plist From 6f8d4d077e59139988064e6748c5f1d076606b4d Mon Sep 17 00:00:00 2001 From: Esteban Date: Thu, 15 Oct 2015 10:55:46 -0300 Subject: [PATCH 0501/1256] Mailplane fix http://i.imgur.com/ONyEFBI.png --- mackup/applications/mailplane.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/mailplane.cfg b/mackup/applications/mailplane.cfg index be9240df7..0e1130a9c 100644 --- a/mackup/applications/mailplane.cfg +++ b/mackup/applications/mailplane.cfg @@ -4,4 +4,4 @@ name = Mailplane [configuration_files] Library/Preferences/com.mailplaneapp.Mailplane.plist Library/Preferences/com.mailplaneapp.Mailplane3.plist -Library/Application Support/Mailplane 3/Accounts.xml + From 2c823a1568ee4c796868ceb30e446ccde9acc29b Mon Sep 17 00:00:00 2001 From: Esteban Date: Thu, 15 Oct 2015 10:56:44 -0300 Subject: [PATCH 0502/1256] gearplayer fix http://i.imgur.com/ONyEFBI.png --- mackup/applications/gearplayer.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/gearplayer.cfg b/mackup/applications/gearplayer.cfg index 9aa0ecb61..001c85a3b 100644 --- a/mackup/applications/gearplayer.cfg +++ b/mackup/applications/gearplayer.cfg @@ -5,4 +5,4 @@ name = Gear Player Library/Preferences/com.treasurebox.gear.plist Library/Preferences/com.treasurebox.magickeys.plist Library/Application Support/Gear Player/paddata.padl -Library/Application Support/Gear Player/queue.pak + From 1b23e96385ca1067e8f541b73b43997e6b967657 Mon Sep 17 00:00:00 2001 From: Esteban Date: Thu, 15 Oct 2015 14:01:50 -0300 Subject: [PATCH 0503/1256] changelog --- CHANGELOG.md | 1 + mackup/applications/gearplayer.cfg | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34c1ebdb6..f37092081 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Add support for WebStorm 11 (via @rbartoli) - Add support for z (via @rbartoli) - Add support for Electrum (via @rbartoli) +- Fixed Gear Player Support (via @TCattd) ## Mackup 0.8.12 diff --git a/mackup/applications/gearplayer.cfg b/mackup/applications/gearplayer.cfg index 001c85a3b..358431d03 100644 --- a/mackup/applications/gearplayer.cfg +++ b/mackup/applications/gearplayer.cfg @@ -5,4 +5,3 @@ name = Gear Player Library/Preferences/com.treasurebox.gear.plist Library/Preferences/com.treasurebox.magickeys.plist Library/Application Support/Gear Player/paddata.padl - From 6e8f52645a11f61bf1081784f5c88e6fdc1df5fa Mon Sep 17 00:00:00 2001 From: Esteban Date: Thu, 15 Oct 2015 14:02:50 -0300 Subject: [PATCH 0504/1256] changelog --- CHANGELOG.md | 1 + mackup/applications/mailplane.cfg | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34c1ebdb6..88b69dd74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Add support for WebStorm 11 (via @rbartoli) - Add support for z (via @rbartoli) - Add support for Electrum (via @rbartoli) +- Fixed Mailplane Support (via @TCattd) ## Mackup 0.8.12 diff --git a/mackup/applications/mailplane.cfg b/mackup/applications/mailplane.cfg index 0e1130a9c..4374f663b 100644 --- a/mackup/applications/mailplane.cfg +++ b/mackup/applications/mailplane.cfg @@ -4,4 +4,3 @@ name = Mailplane [configuration_files] Library/Preferences/com.mailplaneapp.Mailplane.plist Library/Preferences/com.mailplaneapp.Mailplane3.plist - From 41950c27db48b2de622a9a2cce86de741d128042 Mon Sep 17 00:00:00 2001 From: digglife Date: Sat, 17 Oct 2015 22:21:19 +0800 Subject: [PATCH 0505/1256] add support for mplayerx MPlayerX is a popular media player for OS X. --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/mplayerx.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/mplayerx.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e392da392..aa71874a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Add support for WebStorm 11 (via @rbartoli) - Add support for z (via @rbartoli) - Add support for Electrum (via @rbartoli) +- Add support for MPlayerX (via @digglife) - Fixed Gear Player Support (via @TCattd) - Fixed Mailplane Support (via @TCattd) diff --git a/README.md b/README.md index d06402b23..8ff797611 100644 --- a/README.md +++ b/README.md @@ -278,6 +278,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [MercuryMover](http://www.heliumfoot.com/mercurymover/) - [Messages](http://www.apple.com/osx/apps/#messages) - [Microsoft Remote Desktop](https://itunes.apple.com/us/app/microsoft-remote-desktop/id715768417?mt=12&ls=1) +- [MPlayerX](http://mplayerx.org) - [MusicBrainz Picard](https://picard.musicbrainz.org/) - [MySQL](http://www.mysql.com/) - [Moom](http://manytricks.com/moom/) diff --git a/mackup/applications/mplayerx.cfg b/mackup/applications/mplayerx.cfg new file mode 100644 index 000000000..f0b596a25 --- /dev/null +++ b/mackup/applications/mplayerx.cfg @@ -0,0 +1,5 @@ +[application] +name = MPlayerX + +[configuration_files] +Library/Preferences/org.niltsh.MPlayerX.plist From c93d1a336e845986b4cd968101442d25a248a338 Mon Sep 17 00:00:00 2001 From: Craig Steinberger Date: Sat, 17 Oct 2015 12:31:12 -0400 Subject: [PATCH 0506/1256] Initial TextExpander support --- mackup/applications/textexpander.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/textexpander.cfg diff --git a/mackup/applications/textexpander.cfg b/mackup/applications/textexpander.cfg new file mode 100644 index 000000000..5bd103a25 --- /dev/null +++ b/mackup/applications/textexpander.cfg @@ -0,0 +1,6 @@ +[application] +name = TextExpander + +[configuration_files] +Library/Application Support/TextExpander +Library/Preferences/com.smileonmymac.textexpander.plist From edfb250216b6730673d7b3246a05fd4681ca5c1e Mon Sep 17 00:00:00 2001 From: Craig Steinberger Date: Sat, 17 Oct 2015 12:55:32 -0400 Subject: [PATCH 0507/1256] Add TextExpander to README and CHANGELOG --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa71874a8..65c8235c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Add support for MPlayerX (via @digglife) - Fixed Gear Player Support (via @TCattd) - Fixed Mailplane Support (via @TCattd) +- ADd support for TextExpander (via @cjs) ## Mackup 0.8.12 diff --git a/README.md b/README.md index 8ff797611..ec6089cc3 100644 --- a/README.md +++ b/README.md @@ -376,6 +376,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Taskwarrior](http://www.taskwarrior.org/) - [Teamocil](http://remiprev.github.io/teamocil/) - [Terminator](https://launchpad.net/terminator/) +- [TextExpander](https://smilesoftware.com/TextExpander/index.html) - [TextMate](http://macromates.com/) - [Textual](http://www.codeux.com/textual/) - [Tig](https://github.com/jonas/tig) From 89a8a704287e9aff3b71e5b69da6c4f51b2d2482 Mon Sep 17 00:00:00 2001 From: Craig Steinberger Date: Sat, 17 Oct 2015 13:27:14 -0400 Subject: [PATCH 0508/1256] Limit backup to only the latest settings --- mackup/applications/textexpander.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/textexpander.cfg b/mackup/applications/textexpander.cfg index 5bd103a25..b1b16c676 100644 --- a/mackup/applications/textexpander.cfg +++ b/mackup/applications/textexpander.cfg @@ -2,5 +2,5 @@ name = TextExpander [configuration_files] -Library/Application Support/TextExpander +Library/Application Support/TextExpander/Settings.textexpander Library/Preferences/com.smileonmymac.textexpander.plist From 7b49a63736f86053664197ce1afa89bee34197e8 Mon Sep 17 00:00:00 2001 From: Craig Steinberger Date: Sat, 17 Oct 2015 13:28:35 -0400 Subject: [PATCH 0509/1256] Fix Typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65c8235c8..499399e81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ - Add support for MPlayerX (via @digglife) - Fixed Gear Player Support (via @TCattd) - Fixed Mailplane Support (via @TCattd) -- ADd support for TextExpander (via @cjs) +- Add support for TextExpander (via @cjs) ## Mackup 0.8.12 From 3a2ff686fc887b44a9a4624cd63731b2f1853b17 Mon Sep 17 00:00:00 2001 From: Mateus Revoredo Date: Mon, 19 Oct 2015 11:38:27 -0300 Subject: [PATCH 0510/1256] Add support for Smooth Mouse --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/smooth-mouse.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/smooth-mouse.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 873d7526a..eb59b3fa2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Add support for Electrum (via @rbartoli) - Add support for MPlayerX (via @digglife) - Add support for Day-O (via @mateusrevoredo) +- Add support for Smooth Mouse (via @mateusrevoredo) - Fixed Gear Player Support (via @TCattd) - Fixed Mailplane Support (via @TCattd) diff --git a/README.md b/README.md index 46f8431b8..62c565265 100644 --- a/README.md +++ b/README.md @@ -361,6 +361,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Skype](http://www.skype.com/) - [Slate](https://github.com/jigish/slate) - [Slogger](http://brettterpstra.com/projects/slogger/) +- [Smooth Mouse](http://smoothmouse.com/) - [Soulver](http://www.acqualia.com/soulver/) - [SourceTree](http://sourcetreeapp.com) - [Spacemacs](https://github.com/syl20bnr/spacemacs) diff --git a/mackup/applications/smooth-mouse.cfg b/mackup/applications/smooth-mouse.cfg new file mode 100644 index 000000000..d0eccde94 --- /dev/null +++ b/mackup/applications/smooth-mouse.cfg @@ -0,0 +1,5 @@ +[application] +name = Smooth Mouse + +[configuration_files] +Library/Preferences/com.cyberic.SmoothMouse.plist From 642c294284cfb1adc1023add27bc7a45ede73592 Mon Sep 17 00:00:00 2001 From: Mateus Revoredo Date: Mon, 19 Oct 2015 11:53:55 -0300 Subject: [PATCH 0511/1256] Add support for MacDown --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/macdown.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/macdown.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index eb59b3fa2..e0afe0a54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Add support for MPlayerX (via @digglife) - Add support for Day-O (via @mateusrevoredo) - Add support for Smooth Mouse (via @mateusrevoredo) +- Add support for MacDown (via @mateusrevoredo) - Fixed Gear Player Support (via @TCattd) - Fixed Mailplane Support (via @TCattd) diff --git a/README.md b/README.md index 62c565265..1cddd7212 100644 --- a/README.md +++ b/README.md @@ -265,6 +265,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/) - [MacDive](http://www.mac-dive.com/) +- [MacDown](http://macdown.uranusjr.com/) - [MacOSX](http://www.apple.com/osx/) - [MacVim](https://code.google.com/p/macvim/) - [Magic Launch](https://www.oneperiodic.com/products/magiclaunch/) diff --git a/mackup/applications/macdown.cfg b/mackup/applications/macdown.cfg new file mode 100644 index 000000000..84c77b8cc --- /dev/null +++ b/mackup/applications/macdown.cfg @@ -0,0 +1,6 @@ +[application] +name = MacDown + +[configuration_files] +Library/Preferences/com.uranusjr.macdown.plist +Library/Application Support/MacDown From 309bf30efbb2f207751e0cb460d173550985705c Mon Sep 17 00:00:00 2001 From: Mateus Revoredo Date: Mon, 19 Oct 2015 12:10:48 -0300 Subject: [PATCH 0512/1256] Add support for Spotify Notifications --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/spotify-notifications.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/spotify-notifications.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index eb59b3fa2..b23a06369 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Add support for MPlayerX (via @digglife) - Add support for Day-O (via @mateusrevoredo) - Add support for Smooth Mouse (via @mateusrevoredo) +- Add support for Spotify Notifications (via @mateusrevoredo) - Fixed Gear Player Support (via @TCattd) - Fixed Mailplane Support (via @TCattd) diff --git a/README.md b/README.md index 62c565265..66eb5f704 100644 --- a/README.md +++ b/README.md @@ -369,6 +369,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Spectrwm](https://opensource.conformal.com/wiki/spectrwm) - [Spectacle](http://spectacleapp.com/) - [Spotify](https://www.spotify.com/) +- [Spotify Notifications](http://spotify-notifications.citruspi.io/) - [Stata](http://www.stata.com/) - [Stay](https://cordlessdog.com/stay/) - [Sublime Text](http://www.sublimetext.com/) diff --git a/mackup/applications/spotify-notifications.cfg b/mackup/applications/spotify-notifications.cfg new file mode 100644 index 000000000..f25424fde --- /dev/null +++ b/mackup/applications/spotify-notifications.cfg @@ -0,0 +1,5 @@ +[application] +name = Spotify-Notifications + +[configuration_files] +Library/Preferences/io.citruspi.Spotify-Notifications.plist From de5662c80f34e33551bb0f41002c4aede3b7da14 Mon Sep 17 00:00:00 2001 From: Naidis Date: Thu, 22 Oct 2015 17:37:43 +0900 Subject: [PATCH 0513/1256] add support for maid. --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/maid.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/maid.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index d7532ff16..4d413d5f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Add support for Spotify Notifications (via @mateusrevoredo) - Fixed Gear Player Support (via @TCattd) - Fixed Mailplane Support (via @TCattd) +- Add support for Maid (via @zanderzhng) ## Mackup 0.8.12 diff --git a/README.md b/README.md index 71e18e838..8805c178e 100644 --- a/README.md +++ b/README.md @@ -270,6 +270,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [MacVim](https://code.google.com/p/macvim/) - [Magic Launch](https://www.oneperiodic.com/products/magiclaunch/) - [MagicPrefs](http://magicprefs.com/) +- [Maid](https://github.com/benjaminoakes/maid/) - [Mailmate](http://freron.com/) - [Mailplane](http://mailplaneapp.com/) - [MATLAB](http://www.mathworks.com/products/matlab/) diff --git a/mackup/applications/maid.cfg b/mackup/applications/maid.cfg new file mode 100644 index 000000000..9dfc9531b --- /dev/null +++ b/mackup/applications/maid.cfg @@ -0,0 +1,5 @@ +[application] +name = Maid + +[configuration_files] +.maid From c524e1d81a10d96d440df053ab05dac88e5918a3 Mon Sep 17 00:00:00 2001 From: Matthew Robinson Date: Sat, 24 Oct 2015 16:19:29 -0700 Subject: [PATCH 0514/1256] Add support for Ansible --- mackup/applications/ansible.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/ansible.cfg diff --git a/mackup/applications/ansible.cfg b/mackup/applications/ansible.cfg new file mode 100644 index 000000000..b08aa5440 --- /dev/null +++ b/mackup/applications/ansible.cfg @@ -0,0 +1,6 @@ +[application] +name = Ansible + +[configuration_files] +.ansible +.ansible.cfg From 6e9116064cfc6167cecd62b0f41e1e9dff8d8307 Mon Sep 17 00:00:00 2001 From: Matthew Robinson Date: Sat, 24 Oct 2015 17:38:45 -0700 Subject: [PATCH 0515/1256] Update documentation --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d413d5f6..e3adba784 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Fixed Gear Player Support (via @TCattd) - Fixed Mailplane Support (via @TCattd) - Add support for Maid (via @zanderzhng) +- Add support for Ansible (via @mlrobinson) ## Mackup 0.8.12 diff --git a/README.md b/README.md index 8805c178e..a8a1f2c6b 100644 --- a/README.md +++ b/README.md @@ -139,6 +139,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - [Adobe Photoshop CC](http://www.adobe.com/products/photoshop.html) - [Android Studio](https://developer.android.com/sdk/) +- [Ansible](http://www.ansible.com/) - [AppCleaner](http://www.freemacsoft.net/appcleaner/) - [AppCode](http://www.jetbrains.com/objc/) - [aria2c](http://aria2.sourceforge.net/) From 44e534fd4a93dbd0c73e36c23c196cec6bf0fb78 Mon Sep 17 00:00:00 2001 From: Andrew Kennedy Date: Wed, 28 Oct 2015 07:13:12 -0700 Subject: [PATCH 0516/1256] Update for the new version of oh-my-fish --- mackup/applications/oh-my-fish.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/oh-my-fish.cfg b/mackup/applications/oh-my-fish.cfg index 07e4fe2ef..a9b07cf49 100644 --- a/mackup/applications/oh-my-fish.cfg +++ b/mackup/applications/oh-my-fish.cfg @@ -2,4 +2,4 @@ name = Oh My Fish [configuration_files] -.oh-my-fish/custom +.config/omf From 7686049c93782aeb4efe55d2469eef680ef0d20b Mon Sep 17 00:00:00 2001 From: "Ryan J. Bonnell" Date: Fri, 30 Oct 2015 14:51:28 -0700 Subject: [PATCH 0517/1256] Add support for BBEdit --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/bbedit.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/bbedit.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e3adba784..4c06e4a65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Fixed Mailplane Support (via @TCattd) - Add support for Maid (via @zanderzhng) - Add support for Ansible (via @mlrobinson) +- Add support for BBEdit (via @ryanjbonnell) ## Mackup 0.8.12 diff --git a/README.md b/README.md index a8a1f2c6b..0a00c675f 100644 --- a/README.md +++ b/README.md @@ -157,6 +157,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/revans/bash-it/) - [Bash](http://www.gnu.org/software/bash/) +- [BBEdit](http://www.barebones.com/products/bbedit/) - [BetterSnapTool](http://blog.boastr.net/) - [BetterTouchTool](http://blog.boastr.net/) - [BibDesk](http://bibdesk.sourceforge.net/) diff --git a/mackup/applications/bbedit.cfg b/mackup/applications/bbedit.cfg new file mode 100644 index 000000000..8e3a971e1 --- /dev/null +++ b/mackup/applications/bbedit.cfg @@ -0,0 +1,6 @@ +[application] +name = BBEdit + +[configuration_files] +Library/Application Support/BBEdit +Library/Preferences/com.barebones.bbedit.plist From e574d3578f3cef843e7c8b3b2d2fb8639413aab6 Mon Sep 17 00:00:00 2001 From: "Ryan J. Bonnell" Date: Fri, 30 Oct 2015 14:55:10 -0700 Subject: [PATCH 0518/1256] Add support for Querious --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/querious.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/querious.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e3adba784..8928882d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Fixed Mailplane Support (via @TCattd) - Add support for Maid (via @zanderzhng) - Add support for Ansible (via @mlrobinson) +- Add support for Querious (via @ryanjbonnell) ## Mackup 0.8.12 diff --git a/README.md b/README.md index a8a1f2c6b..adc0bdad7 100644 --- a/README.md +++ b/README.md @@ -328,6 +328,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [PyCharm 4](https://www.jetbrains.com/pycharm/) - [PyPI](https://pypi.python.org/pypi) - [PyRadio](http://www.coderholic.com/pyradio/) +- [Querious](http://www.araelium.com/querious/) - [Quicksilver](http://qsapp.com/) - [Rails](http://rubyonrails.org/) - [rTorrent](http://libtorrent.rakshasa.no/) diff --git a/mackup/applications/querious.cfg b/mackup/applications/querious.cfg new file mode 100644 index 000000000..304364697 --- /dev/null +++ b/mackup/applications/querious.cfg @@ -0,0 +1,6 @@ +[application] +name = Querious + +[configuration_files] +Library/Preferences/com.araeliumgroup.querious.plist +Library/Application Support/Querious From 24e72293d0d59ee4aa6409dc7ccee7074d33d751 Mon Sep 17 00:00:00 2001 From: "Ryan J. Bonnell" Date: Fri, 30 Oct 2015 15:47:40 -0700 Subject: [PATCH 0519/1256] Add support for Mac OS X Terminal --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/terminal.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/terminal.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e3adba784..578c8ed70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Fixed Mailplane Support (via @TCattd) - Add support for Maid (via @zanderzhng) - Add support for Ansible (via @mlrobinson) +- Add support for Terminal (via @ryanjbonnell) ## Mackup 0.8.12 diff --git a/README.md b/README.md index a8a1f2c6b..e2a039cd3 100644 --- a/README.md +++ b/README.md @@ -381,6 +381,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [TaskPaper](http://www.hogbaysoftware.com/products/taskpaper) - [Taskwarrior](http://www.taskwarrior.org/) - [Teamocil](http://remiprev.github.io/teamocil/) +- [Terminal](http://www.apple.com/osx/apps/) - [Terminator](https://launchpad.net/terminator/) - [TextMate](http://macromates.com/) - [Textual](http://www.codeux.com/textual/) diff --git a/mackup/applications/terminal.cfg b/mackup/applications/terminal.cfg new file mode 100644 index 000000000..3b8a257df --- /dev/null +++ b/mackup/applications/terminal.cfg @@ -0,0 +1,5 @@ +[application] +name = Terminal + +[configuration_files] +Library/Preferences/com.apple.Terminal.plist From 020d252c2789ad53098d7a7285f4d24a42013380 Mon Sep 17 00:00:00 2001 From: She Jinxin Date: Sun, 1 Nov 2015 18:42:25 +0800 Subject: [PATCH 0520/1256] Add missing `.spacemacs.d` for spacemacs See https://github.com/syl20bnr/spacemacs/blob/master/doc/DOCUMENTATION.org#alternative-setup for details --- mackup/applications/spacemacs.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/spacemacs.cfg b/mackup/applications/spacemacs.cfg index 321df45c5..d46741cd9 100644 --- a/mackup/applications/spacemacs.cfg +++ b/mackup/applications/spacemacs.cfg @@ -3,3 +3,4 @@ name = Spacemacs [configuration_files] .spacemacs +.spacemacs.d From 3d838a6e122975ccedba3597759d4beb965d0d58 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 2 Nov 2015 12:35:27 -0500 Subject: [PATCH 0521/1256] Use the list of apps without mackup --- mackup/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/main.py b/mackup/main.py index adca6c0ba..865e067b0 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -136,7 +136,7 @@ def printAppHeader(app_name): app_names = mckp.get_apps_to_backup() app_names.discard(MACKUP_APP_NAME) - for app_name in mckp.get_apps_to_backup(): + for app_name in app_names: app = ApplicationProfile(mckp, app_db.get_files(app_name), dry_run, From fd952121ab1b27c5aaf1e31eb9b80a3a78976751 Mon Sep 17 00:00:00 2001 From: Scott Reeves Date: Sat, 31 Oct 2015 19:40:46 -0400 Subject: [PATCH 0522/1256] Alpha sort backup, restore, uninstall --- mackup/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mackup/main.py b/mackup/main.py index 865e067b0..c5e2b57e1 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -81,7 +81,7 @@ def printAppHeader(app_name): mckp.check_for_usable_backup_env() # Backup each application - for app_name in mckp.get_apps_to_backup(): + for app_name in sorted(mckp.get_apps_to_backup()): app = ApplicationProfile(mckp, app_db.get_files(app_name), dry_run, @@ -112,7 +112,7 @@ def printAppHeader(app_name): # Mackup has already been done app_names.discard(MACKUP_APP_NAME) - for app_name in app_names: + for app_name in sorted(app_names): app = ApplicationProfile(mckp, app_db.get_files(app_name), dry_run, @@ -136,7 +136,7 @@ def printAppHeader(app_name): app_names = mckp.get_apps_to_backup() app_names.discard(MACKUP_APP_NAME) - for app_name in app_names: + for app_name in sorted(app_names): app = ApplicationProfile(mckp, app_db.get_files(app_name), dry_run, From bba9b5da5f2e7fc94a51e20b87aa7f641d55972b Mon Sep 17 00:00:00 2001 From: Alastair Moore Date: Wed, 11 Nov 2015 15:01:09 +0930 Subject: [PATCH 0523/1256] Added support for PHPStorm 10 Added support for PHPStorm 10 --- CHANGELOG.md | 1 + mackup/applications/phpstorm-10.cfg | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 mackup/applications/phpstorm-10.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 8928882d9..3fa30f8f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for PHPStorm 10 (via @welly) - Add support for Robomongo (via @rbartoli) - Add support for AppCleaner (via @rbartoli) - Add support for Doxie (via @rbartoli) diff --git a/mackup/applications/phpstorm-10.cfg b/mackup/applications/phpstorm-10.cfg new file mode 100644 index 000000000..fd24ffaef --- /dev/null +++ b/mackup/applications/phpstorm-10.cfg @@ -0,0 +1,7 @@ +[application] +name = PhpStorm 10 + +[configuration_files] +Library/Application Support/WebIde100 +Library/Preferences/WebIde100 +Library/Preferences/com.jetbrains.PhpStorm.plist From a5de8e66ab6c27854427f89b36c96a11198aef0e Mon Sep 17 00:00:00 2001 From: ReadmeCritic Date: Sat, 14 Nov 2015 16:36:49 -0800 Subject: [PATCH 0524/1256] Update README URLs based on HTTP redirects --- README.md | 116 +++++++++++++++++++++++++++--------------------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/README.md b/README.md index adc0bdad7..1d7d8c2e8 100644 --- a/README.md +++ b/README.md @@ -3,7 +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) -[![codecov.io](http://codecov.io/github/lra/mackup/coverage.svg?branch=master)](http://codecov.io/github/lra/mackup?branch=master) +[![codecov.io](https://codecov.io/github/lra/mackup/coverage.svg?branch=master)](http://codecov.io/github/lra/mackup?branch=master) ## Quickstart @@ -135,12 +135,12 @@ See the [README](doc/README.md) file in the doc directory for more info. - [1Password 4](https://agilebits.com/onepassword) - [Ack](http://beyondgrep.com/) -- [Adium](http://adium.im/) +- [Adium](https://adium.im/) - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - [Adobe Photoshop CC](http://www.adobe.com/products/photoshop.html) - [Android Studio](https://developer.android.com/sdk/) - [Ansible](http://www.ansible.com/) -- [AppCleaner](http://www.freemacsoft.net/appcleaner/) +- [AppCleaner](http://freemacsoft.net/appcleaner/) - [AppCode](http://www.jetbrains.com/objc/) - [aria2c](http://aria2.sourceforge.net/) - [Arara](http://cereda.github.io/arara/) @@ -150,15 +150,15 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Aspell](http://aspell.net/) - [Atom](https://atom.io/) - [AusKey](https://abr.gov.au/AUSkey/) -- [Autokey](https://code.google.com/p/autokey) +- [Autokey](https://code.google.com/p/autokey/) - [Awareness](http://iamfutureproof.com/tools/awareness/) - [AWS Command Line Interface](https://aws.amazon.com/cli/) - [Microsoft Azure CLI](https://github.com/Azure/azure-xplat-cli) - [Bartender](http://www.macbartender.com/) -- [Bash it](https://github.com/revans/bash-it/) +- [Bash it](https://github.com/Bash-it/bash-it) - [Bash](http://www.gnu.org/software/bash/) -- [BetterSnapTool](http://blog.boastr.net/) -- [BetterTouchTool](http://blog.boastr.net/) +- [BetterSnapTool](http://www.boastr.net/) +- [BetterTouchTool](http://www.boastr.net/) - [BibDesk](http://bibdesk.sourceforge.net/) - [Billings Pro Server Admin](https://www.marketcircle.com/billingspro/download/billingspro-server/) - [Bitchx](http://www.bitchx.org/) @@ -169,27 +169,27 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Byobu](http://byobu.co/) - [Caffeine](http://lightheadsw.com/caffeine/) - [Capture One](http://www.phaseone.com/Imaging-Software/Capture-One.aspx) -- [Cartographica](http://www.macgis.com) +- [Cartographica](https://www.macgis.com/) - [Charles](http://www.charlesproxy.com) -- [Chef](http://www.opscode.com/chef/) +- [Chef](https://www.chef.io/chef/) - [Chicken](http://sourceforge.net/projects/chicken/) -- [Clementine](http://www.clementine-player.org/) +- [Clementine](https://www.clementine-player.org/) - [ClipMenu](http://www.clipmenu.com/) -- [Clipy](http://clipy-app.com) +- [Clipy](https://clipy-app.com/) - [CloudApp](http://getcloudapp.com/) - [Coda 2](http://panic.com/coda/) - [Colloquy](http://colloquy.info/) - [ColorSchemer Studio 2](http://www.colorschemer.com/osx_info.php) -- [ColorSync](http://en.wikipedia.org/wiki/ColorSync) +- [ColorSync](https://en.wikipedia.org/wiki/ColorSync) - [Composer](https://getcomposer.org/) - [Concentrate](http://www.getconcentrating.com/) -- [Conky](http://conky.sourceforge.net/) +- [Conky](https://github.com/brndnmtthws/conky) - [Consular](https://github.com/achiu/consular) - [ControlPlane](http://www.controlplaneapp.com/) - [CoRD](http://cord.sourceforge.net/) - [CotEditor](http://coteditor.com/) -- [Cyberduck](http://cyberduck.ch/) -- [Dash](http://kapeli.com/dash) +- [Cyberduck](https://cyberduck.io/) +- [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/) - [Deal Alert](http://dealalertapp.com/) @@ -199,33 +199,33 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Docker](https://www.docker.com/) - [Dolphin](https://dolphin-emu.org/) - [Doxie](http://www.getdoxie.com/) -- [Droplr](https://droplr.com/hello) +- [Droplr](https://droplr.com/) - [Dropzone 3](https://aptonic.com/dropzone3/) - [EditorConfig](http://editorconfig.org/) - [Electrum](https://electrum.org/#home) - [Emacs](http://www.gnu.org/software/emacs/) -- [Enjoyable](http://yukkurigames.com/enjoyable/) +- [Enjoyable](https://yukkurigames.com/enjoyable/) - [Exercism](http://exercism.io/) - [ExpanDrive](http://www.expandrive.com/) - [Fantastical](http://flexibits.com/fantastical) - [Feeds](http://www.feedsapp.com/) - [Filezilla](https://filezilla-project.org/) - [Fish](http://ridiculousfish.com/shell/) -- [Flux](http://stereopsis.com/flux/) +- [Flux](https://justgetflux.com/) - [FontExplorer X](http://www.fontexplorerx.com/) - [ForkLift 2](http://www.binarynights.com/forklift/) - [Gas Mask](https://github.com/2ndalpha/gasmask/) -- [Gear Player](http://www.gearmusicplayer.com/) +- [Gear Player](https://www.gearmusicplayer.com/) - [GeekTool](http://projects.tynsoe.org/en/geektool/) -- [GHCi](http://www.haskell.org/haskellwiki/GHC/GHCi) +- [GHCi](https://wiki.haskell.org/GHC/GHCi) - [Git Hooks](https://github.com/icefox/git-hooks) - [Git](http://git-scm.com/) - [Gitbox](http://gitboxapp.com/) - [Gmail Notifr](http://ashchan.com/projects/gmail-notifr) - [GMVault](http://gmvault.org/) - [Go2Shell](http://zipzapmac.com/Go2Shell) -- [GnuPG](http://www.gnupg.org/) (NOTE: includes private keys) -- [GrandTotal 3](http://www.mediaatelier.com/GrandTotal3/) +- [GnuPG](https://www.gnupg.org/) (NOTE: includes private keys) +- [GrandTotal 3](http://www.mediaatelier.com/GrandTotal4/) - [Gradle](http://gradle.org) - [Gnome SSH Tunnel Manager](http://sourceforge.net/projects/gstm/) - [Hammerspoon](http://www.hammerspoon.org/) @@ -242,25 +242,25 @@ See the [README](doc/README.md) file in the doc directory for more info. - [IntelliJIDEA](http://www.jetbrains.com/idea/) - [Irssi](http://www.irssi.org/) - [i3](https://i3wm.org/) -- [iStat Menus 5](http://bjango.com/mac/istatmenus/) +- [iStat Menus 5](https://bjango.com/mac/istatmenus/) - [IPython](http://ipython.org/) - [ITerm2](http://www.iterm2.com/) -- [JSHint](http://www.jshint.com/) +- [JSHint](http://jshint.com/) - [Janus](https://github.com/carlhuda/janus) - [jrnl](http://maebert.github.io/jrnl/) - [Julia](http://julialang.org) - [Jumpcut](http://jumpcut.sourceforge.net/) - [Kaleidoscope](http://www.kaleidoscopeapp.com/) -- [Karabiner](https://pqrs.org/osx/karabiner) +- [Karabiner](https://pqrs.org/osx/karabiner/) - [KeePassX](http://www.keepassx.org/) -- [Keka](http://kekaosx.com/) +- [Keka](http://www.kekaosx.com/en/) - [Keybase](https://keybase.io/) - [Keymo](http://manytricks.com/keymo/) -- [KeyRemap4MacBook](http://pqrs.org/macosx/keyremap4macbook/) +- [KeyRemap4MacBook](https://pqrs.org/osx/karabiner/) - [LaTeXiT](http://www.chachatelier.fr/latexit/latexit-home.php?lang=en) -- [LaunchBar](http://www.obdev.at/products/launchbar/index.html) -- [Liftoff](http://github.com/thoughtbot/liftoff) -- [Light Table](http://www.lighttable.com/) +- [LaunchBar](https://www.obdev.at/products/launchbar/index.html) +- [Liftoff](https://github.com/thoughtbot/liftoff) +- [Light Table](http://lighttable.com/) - [LimeChat](http://limechat.net/mac/) - [Liquid Prompt](https://github.com/nojhan/liquidprompt) - [LittleSnitch](http://www.obdev.at/products/littlesnitch/) @@ -268,7 +268,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [MacDive](http://www.mac-dive.com/) - [MacDown](http://macdown.uranusjr.com/) - [MacOSX](http://www.apple.com/osx/) -- [MacVim](https://code.google.com/p/macvim/) +- [MacVim](https://github.com/macvim-dev/macvim) - [Magic Launch](https://www.oneperiodic.com/products/magiclaunch/) - [MagicPrefs](http://magicprefs.com/) - [Maid](https://github.com/benjaminoakes/maid/) @@ -278,7 +278,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Maven](http://maven.apache.org) - [Max](http://sbooth.org/Max/) - [MenuMeters](http://www.ragingmenace.com/software/menumeters/) -- [Mercurial](http://mercurial.selenic.com/) +- [Mercurial](https://www.mercurial-scm.org/) - [MercuryMover](http://www.heliumfoot.com/mercurymover/) - [Messages](http://www.apple.com/osx/apps/#messages) - [Microsoft Remote Desktop](https://itunes.apple.com/us/app/microsoft-remote-desktop/id715768417?mt=12&ls=1) @@ -286,12 +286,12 @@ See the [README](doc/README.md) file in the doc directory for more info. - [MusicBrainz Picard](https://picard.musicbrainz.org/) - [MySQL](http://www.mysql.com/) - [Moom](http://manytricks.com/moom/) -- [Mou](http://mouapp.com/) +- [Mou](http://25.io/mou/) - [mpd](http://www.musicpd.org) -- [MPV](http://mpv.io/) +- [MPV](https://mpv.io/) - [Nano](http://www.nano-editor.org/) - [Navicat](http://navicat.com/) -- [ncmpcpp](http://ncmpcpp.rybczak.net) +- [ncmpcpp](http://rybczak.net/ncmpcpp/) - [neovim](https://github.com/neovim/neovim) - [newsbeuter](http://newsbeuter.org/) - [ngrok](https://ngrok.com/) @@ -301,30 +301,30 @@ 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 Zsh](https://github.com/robbyrussell/oh-my-zsh) -- [OmniFocus](http://www.omnigroup.com/products/omnifocus/) -- [OmniGraffle](http://www.omnigroup.com/omnigraffle/) -- [OpenSSH](http://www.openssh.org/) (NOTE: includes private keys) +- [OmniFocus](https://www.omnigroup.com/omnifocus/) +- [OmniGraffle](https://www.omnigroup.com/omnigraffle/) +- [OpenSSH](http://www.openssh.com/) (NOTE: includes private keys) - [Pandoc](http://pandoc.org) - [Pass](http://www.passwordstore.org/) - [Pastebot](http://tapbots.com/software/pastebot/) - [Path Finder](http://www.cocoatech.com/pathfinder/) - [Pear](http://pear.php.net/) - [Pentadactyl](http://5digits.org/pentadactyl/) -- [Perl](http://www.perl.org/) -- [Phoenix](https://github.com/sdegutis/Phoenix) +- [Perl](https://www.perl.org/) +- [Phoenix](https://github.com/kasper/phoenix) - [PhpStorm](http://www.jetbrains.com/phpstorm/) - [PIP](http://www.pip-installer.org/) - [Poedit](http://poedit.net/) -- [PokerStars](http://www.pokerstars.com/) +- [PokerStars](https://www.pokerstars.com/) - [PopClip](http://pilotmoon.com/popclip/) - [Popcorn-Time](https://popcorntime.io/) -- [PostgreSQL](http://postgresql.org/) +- [PostgreSQL](http://www.postgresql.org/) - [Pow](http://pow.cx/) - [Prezto](https://github.com/sorin-ionescu/prezto) -- [Processing](http://processing.org/) +- [Processing](https://processing.org/) - [ProxyChains](http://proxychains.sourceforge.net) -- [ProxyChains NG](https://sourceforge.net/projects/proxychains-ng) -- [Punto Switcher](http://punto.yandex.ru/) +- [ProxyChains NG](http://sourceforge.net/projects/proxychains-ng/) +- [Punto Switcher](https://punto.yandex.ru/) - [PyCharm 4](https://www.jetbrains.com/pycharm/) - [PyPI](https://pypi.python.org/pypi) - [PyRadio](http://www.coderholic.com/pyradio/) @@ -336,10 +336,10 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Redshift](http://jonls.dk/redshift/) - [Robomongo](http://robomongo.org/) - [Royal TSX](http://www.royaltsx.com/ts/osx/features) -- [RStudio](http://rstudio.com) +- [RStudio](https://www.rstudio.com/) - [Rubocop](https://github.com/bbatsov/rubocop) - [Ruby Version](https://gist.github.com/fnichol/1912050) -- [Ruby](http://ruby-lang.org/) +- [Ruby](https://www.ruby-lang.org/) - [RubyMine](http://www.jetbrains.com/ruby/) - [S3cmd](http://s3tools.org/s3cmd) - [SABnzbd](http://sabnzbd.org/) @@ -352,26 +352,26 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Scroll Reverser](https://pilotmoon.com/scrollreverser/) - [SecureCRT](https://www.vandyke.com/products/securecrt/) - [SelfControl](http://selfcontrolapp.com/) -- [Seil](https://pqrs.org/macosx/keyremap4macbook/seil.html.en) +- [Seil](https://pqrs.org/osx/karabiner/seil.html.en) - [Sequel Pro](http://www.sequelpro.com/) -- [SHSH Blobs](http://en.wikipedia.org/wiki/SHSH_blob) +- [SHSH Blobs](https://en.wikipedia.org/wiki/SHSH_blob) - [ShiftIt](https://github.com/fikovnik/ShiftIt) -- [Shimo](http://www.chungwasoft.com/shimo/) +- [Shimo](https://www.feingeist.io/shimo/) - [ShowyEdge](https://pqrs.org/osx/ShowyEdge/index.html.en) - [Shuttle](http://fitztrev.github.io/shuttle/) - [SizeUp](http://www.irradiatedsoftware.com/sizeup/) - [Skim](http://skim-app.sourceforge.net/) -- [Skitch](http://evernote.com/skitch/) +- [Skitch](https://evernote.com/skitch/) - [Skype](http://www.skype.com/) - [Slate](https://github.com/jigish/slate) - [Slogger](http://brettterpstra.com/projects/slogger/) - [Smooth Mouse](http://smoothmouse.com/) - [Soulver](http://www.acqualia.com/soulver/) -- [SourceTree](http://sourcetreeapp.com) +- [SourceTree](https://www.sourcetreeapp.com/) - [Spacemacs](https://github.com/syl20bnr/spacemacs) - [Spark](http://www.shadowlab.org/softwares/spark.php) -- [Spectrwm](https://opensource.conformal.com/wiki/spectrwm) -- [Spectacle](http://spectacleapp.com/) +- [Spectrwm](https://github.com/conformal/spectrwm/wiki) +- [Spectacle](https://www.spectacleapp.com/) - [Spotify](https://www.spotify.com/) - [Spotify Notifications](http://spotify-notifications.citruspi.io/) - [Stata](http://www.stata.com/) @@ -380,7 +380,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) - [TaskPaper](http://www.hogbaysoftware.com/products/taskpaper) -- [Taskwarrior](http://www.taskwarrior.org/) +- [Taskwarrior](http://taskwarrior.org/) - [Teamocil](http://remiprev.github.io/teamocil/) - [Terminator](https://launchpad.net/terminator/) - [TextMate](http://macromates.com/) @@ -388,7 +388,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Tig](https://github.com/jonas/tig) - [tint2](https://code.google.com/p/tint2/) - [Tmux](http://tmux.sourceforge.net/) -- [Tmuxinator](https://github.com/aziz/tmuxinator) +- [Tmuxinator](https://github.com/tmuxinator/tmuxinator) - [Todo.txt CLI](http://todotxt.com/) - [TotalSpaces2](http://totalspaces.binaryage.com/) - [Tower](http://www.git-tower.com/) @@ -411,7 +411,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [X11](http://www.x.org/) - [Xamarin Studio](https://xamarin.com/studio) - [XBindKeys](http://www.nongnu.org/xbindkeys/) -- [Xchat](http://www.xchat.org/) +- [Xchat](http://xchat.org/) - [XCode](https://developer.apple.com/xcode/) - [XEmacs](http://www.xemacs.org/) - [XLD](http://tmkk.undo.jp/xld/) @@ -439,7 +439,7 @@ same stuff again on all my workstations (home, work) Boring... Some people tried to solve the problem on the application layer, like -[Github's Boxen](http://boxen.github.com/), but I feel like it solves a non +[Github's Boxen](https://boxen.github.com/), but I feel like it solves a non problem: I don't really spend time installing stuff, mostly downloading: I spend time configuring it. From 541abe41970df973a06e70426a97015bb3fbbb44 Mon Sep 17 00:00:00 2001 From: Radek Benkel Date: Wed, 18 Nov 2015 21:41:50 +0100 Subject: [PATCH 0525/1256] Add IntelliJ IDEA 15 --- CHANGELOG.md | 1 + mackup/applications/intellijidea-15.cfg | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 mackup/applications/intellijidea-15.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fa30f8f4..e0bbf48a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - Add support for Maid (via @zanderzhng) - Add support for Ansible (via @mlrobinson) - Add support for Querious (via @ryanjbonnell) +- Add support for IntelliJ IDEA 15 (via @singles) ## Mackup 0.8.12 diff --git a/mackup/applications/intellijidea-15.cfg b/mackup/applications/intellijidea-15.cfg new file mode 100644 index 000000000..3f753e7e0 --- /dev/null +++ b/mackup/applications/intellijidea-15.cfg @@ -0,0 +1,6 @@ +[application] +name = IntelliJ IDEA 15 + +[configuration_files] +Library/Application Support/IntelliJIdea15 +Library/Preferences/IntelliJIdea15 From 5062cb35b2956c9406defb2c50d09ccd2ed23d8e Mon Sep 17 00:00:00 2001 From: Adam McCrea Date: Fri, 20 Nov 2015 06:50:12 -0500 Subject: [PATCH 0526/1256] Remove support for iTerm2 iTerm2 is overwriting the symlink, and it has its own syncing mechanism for preferences. Fixes #382. --- CHANGELOG.md | 1 + README.md | 1 - mackup/applications/iterm2.cfg | 5 ----- 3 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 mackup/applications/iterm2.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e0bbf48a3..425c38087 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ - Add support for Ansible (via @mlrobinson) - Add support for Querious (via @ryanjbonnell) - Add support for IntelliJ IDEA 15 (via @singles) +- Removed iTerm2 support since iTerm2 overwrites the symlink (via @adamlogic) ## Mackup 0.8.12 diff --git a/README.md b/README.md index 1d7d8c2e8..54f4c13a0 100644 --- a/README.md +++ b/README.md @@ -244,7 +244,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [i3](https://i3wm.org/) - [iStat Menus 5](https://bjango.com/mac/istatmenus/) - [IPython](http://ipython.org/) -- [ITerm2](http://www.iterm2.com/) - [JSHint](http://jshint.com/) - [Janus](https://github.com/carlhuda/janus) - [jrnl](http://maebert.github.io/jrnl/) diff --git a/mackup/applications/iterm2.cfg b/mackup/applications/iterm2.cfg deleted file mode 100644 index 02e826fe3..000000000 --- a/mackup/applications/iterm2.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[application] -name = iTerm2 - -[configuration_files] -Library/Preferences/com.googlecode.iterm2.plist From 454f1f113a3858b635892eb875c1c7ccde617ca4 Mon Sep 17 00:00:00 2001 From: codefalling Date: Sun, 8 Nov 2015 19:33:40 +0800 Subject: [PATCH 0527/1256] Add rime Rime is a input method for Mac OS X,Linux and Windows:http://rime.im/ --- mackup/applications/rime.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/rime.cfg diff --git a/mackup/applications/rime.cfg b/mackup/applications/rime.cfg new file mode 100644 index 000000000..fa679f8e3 --- /dev/null +++ b/mackup/applications/rime.cfg @@ -0,0 +1,6 @@ +[application] +name = Rime + +[configuration_files] +Library/Rime +.config/ibus/rime From 787d76930ca287ebb4d0a107ca303c48597294e0 Mon Sep 17 00:00:00 2001 From: codefalling Date: Tue, 10 Nov 2015 14:24:59 +0800 Subject: [PATCH 0528/1256] minial sync of rime --- mackup/applications/rime.cfg | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/mackup/applications/rime.cfg b/mackup/applications/rime.cfg index fa679f8e3..0865c581e 100644 --- a/mackup/applications/rime.cfg +++ b/mackup/applications/rime.cfg @@ -2,5 +2,19 @@ name = Rime [configuration_files] -Library/Rime -.config/ibus/rime + +Library/Rime/default.custom.yaml +Library/Rime/default.yaml +Library/Rime/installation.yaml +Library/Rime/squirrel.custom.yaml +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 From e17a17c6c322b33064c1867c6eb88760d033face Mon Sep 17 00:00:00 2001 From: codefalling Date: Tue, 10 Nov 2015 14:28:02 +0800 Subject: [PATCH 0529/1256] update readme for rime --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 54f4c13a0..2051d1540 100644 --- a/README.md +++ b/README.md @@ -333,6 +333,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [rTorrent](http://libtorrent.rakshasa.no/) - [R](http://www.r-project.org/) - [Redshift](http://jonls.dk/redshift/) +- [Rime](rime.im) - [Robomongo](http://robomongo.org/) - [Royal TSX](http://www.royaltsx.com/ts/osx/features) - [RStudio](https://www.rstudio.com/) From 22111fae597b83c4255a2780875a1b77c2c29dac Mon Sep 17 00:00:00 2001 From: codefalling Date: Tue, 10 Nov 2015 14:29:54 +0800 Subject: [PATCH 0530/1256] update changelog for add rime --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 425c38087..8f819c2a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ - Add support for Querious (via @ryanjbonnell) - Add support for IntelliJ IDEA 15 (via @singles) - Removed iTerm2 support since iTerm2 overwrites the symlink (via @adamlogic) +- Add support for Rime (via @codefalling) ## Mackup 0.8.12 From a9dae3d799783ccca33a30879c50008415678103 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 23 Nov 2015 16:10:55 -0500 Subject: [PATCH 0531/1256] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2051d1540..57b480cbc 100644 --- a/README.md +++ b/README.md @@ -333,7 +333,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [rTorrent](http://libtorrent.rakshasa.no/) - [R](http://www.r-project.org/) - [Redshift](http://jonls.dk/redshift/) -- [Rime](rime.im) +- [Rime](http://rime.im/) - [Robomongo](http://robomongo.org/) - [Royal TSX](http://www.royaltsx.com/ts/osx/features) - [RStudio](https://www.rstudio.com/) From c80c925cf872b4b8e58dcda6f24ecf5d2c4f3cc2 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 24 Nov 2015 14:01:47 +0800 Subject: [PATCH 0532/1256] Add support for new neovim config path --- mackup/applications/neovim.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/neovim.cfg b/mackup/applications/neovim.cfg index a30a8c049..01c4d5fdb 100644 --- a/mackup/applications/neovim.cfg +++ b/mackup/applications/neovim.cfg @@ -2,5 +2,6 @@ name = neovim [configuration_files] +.config/nvim .nvimrc .nvim From 26b2b4abe43585ae980e87a5819184387696bd2a Mon Sep 17 00:00:00 2001 From: Evan Wong Date: Tue, 1 Dec 2015 21:59:54 +0800 Subject: [PATCH 0533/1256] Add the setting file of R.app It stores some settings of R.app, including encoding, font, color syntax, etc. --- mackup/applications/r.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/r.cfg b/mackup/applications/r.cfg index d638cf338..7d5d7289f 100644 --- a/mackup/applications/r.cfg +++ b/mackup/applications/r.cfg @@ -5,3 +5,4 @@ name = R .R .Rhistory .Rprofile +Library/Preferences/org.R-project.R.plist From 0c060f699f01b5682f0076e5d8bfdafe8d113fb1 Mon Sep 17 00:00:00 2001 From: Evan Wong Date: Tue, 1 Dec 2015 22:08:10 +0800 Subject: [PATCH 0534/1256] Improve R support --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f819c2a8..06c3604f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ - Add support for IntelliJ IDEA 15 (via @singles) - Removed iTerm2 support since iTerm2 overwrites the symlink (via @adamlogic) - Add support for Rime (via @codefalling) +- Improved support for R (via @wyf88) ## Mackup 0.8.12 From bbb87313d511c39f5183d408d8a6b0f32a0d80f9 Mon Sep 17 00:00:00 2001 From: Joen Tolgraven Date: Fri, 4 Dec 2015 05:13:11 +0100 Subject: [PATCH 0535/1256] changed wording in readme - mackup uninstall does NOT nuke the Mackup folder. --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 57b480cbc..40a641060 100644 --- a/README.md +++ b/README.md @@ -117,8 +117,7 @@ You can revert all your files to their original state. mackup uninstall ``` -This will move back any file from Dropbox to its original place in your home -folder and destroy the Mackup folder in Dropbox. +This will remove the symlinks and copy back the files from the Mackup folder in Dropbox to their original places in your home. The Mackup folder and the files in it stay put, so that any other computer also running Mackup is unaffected. ## Supported Storages From 72857bbc80f5da53edfd89fa4737b9410404d0d2 Mon Sep 17 00:00:00 2001 From: Katya Demidova Date: Tue, 15 Dec 2015 01:37:37 +0300 Subject: [PATCH 0536/1256] Minor text fixes I've fixed some typos/misspellings. Btw, I've googled the word "backup" and found out that *backup* is a noun or adjective, while *back up* is a verb. Fixed that too. :) --- mackup/mackup.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mackup/mackup.py b/mackup/mackup.py index a91a1e135..0f45146af 100644 --- a/mackup/mackup.py +++ b/mackup/mackup.py @@ -1,7 +1,7 @@ """ The Mackup Class. -The Mackup class is keeping all the state that mackup needs to keep during its +The Mackup class is keeping all the state that Mackup needs to keep during its runtime. It also provides easy to use interface that is used by the Mackup UI. The only UI for now is the command line. """ @@ -56,7 +56,7 @@ def check_for_usable_restore_env(self): if not os.path.isdir(self.mackup_folder): utils.error("Unable to find the Mackup folder: {}\n" - "You might want to backup some files or get your" + "You might want to back up some files or get your" " storage directory synced first." .format(self.mackup_folder)) @@ -69,7 +69,7 @@ def create_mackup_home(self): 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 ? <{}>" + "Do you want to create it now? <{}>" .format(self.mackup_folder)): os.makedirs(self.mackup_folder) else: @@ -77,12 +77,12 @@ def create_mackup_home(self): def get_apps_to_backup(self): """ - Get the list of application that should be backup by Mackup. + Get the list of applications that should be backed up by Mackup. It's the list of allowed apps minus the list of ignored apps. Returns: - (set) List of application names to backup + (set) List of application names to back up """ # Instantiate the app db app_db = appsdb.ApplicationsDatabase() From ffeffa42af45ae71fb4edbefc831fe71ec957f32 Mon Sep 17 00:00:00 2001 From: Katya Demidova Date: Tue, 15 Dec 2015 02:59:21 +0300 Subject: [PATCH 0537/1256] Improved Readme fixed typos, rearranged some sentences, etc. --- README.md | 56 +++++++++++++++++++++++++------------------------------ 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 57b480cbc..927de0933 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,7 @@ Keep your application settings in sync. ## Quickstart -If you have Dropbox installed and want to use it to save your config files, -that's super easy. +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 [Homebrew](http://brew.sh/) and do: @@ -21,7 +20,7 @@ brew install mackup mackup backup ``` -If not running OS X, or you don't like Homebrew, you can use PIP: +If not running OS X, or you don't like Homebrew, you can use [pip](https://pip.pypa.io/en/stable/): ```bash # Install Mackup with PIP @@ -31,7 +30,7 @@ pip install mackup mackup backup ``` -You're all set, and constantly backuped from now on. +You're all set and constantly backuped from now on. Next, on any new workstation, do: @@ -43,9 +42,9 @@ brew install mackup mackup restore ``` -Done ! +Done! -You can find more detailed instructions in [INSTALL.md](INSTALL.md) +You can find more detailed instructions in [INSTALL.md](INSTALL.md). ## Usage @@ -67,36 +66,34 @@ Display the list of applications supported by Mackup. `mackup -h` -Get some help, obvious... +Get some help, obviously... -## What does it do +## What does it do? -- Backups your application settings in a safe directory (e.g. Dropbox) +- Back ups your application settings in a safe directory (e.g. Dropbox) - Syncs your application settings among all your workstations - Restores your configuration on any fresh install in one command line By only tracking pure configuration files, it keeps the crap out of your -freshly new installed workstation (No cache, temporary and locally specific +freshly new installed workstation (no cache, temporary and locally specific files are transfered). -It also helps you spend more time doing real cool stuff, and less time setting -up your environment. +Mackup makes setting up the environment easy and simple, saving time for your family, great ideas, and all the cool stuff you like. -## Bullsh*t, what does it really do to my files +## Bullsh*t, what does it really do to my files? Let's take `git` as an example. Your settings for `git` are saved in your home folder, in the `.gitconfig` file. ### Backup -If you have Dropbox, when you launch `mackup backup`, here's what it's really -doing: +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` -Now your `git` config is always backup and up to date on all your workstations. +Now your `git` config is always backed up and up to date on all your workstations. ### Restore @@ -421,7 +418,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Zsh](http://zsh.sourceforge.net/) - iTunes Applescripts -## Can you support application X +## Can you support application X? We can [with your help](doc#get-official-support-for-an-application) ;) @@ -429,21 +426,18 @@ We can [with your help](doc#get-official-support-for-an-application) ;) Yesterday, I had a talk with [Zach Zaro](http://zacharyzaro.com/), complaining about the pain it is to reconfigure our Macbook each time we get a new one or -install from scratch. That's a talk we already had months ago. +install from scratch. That's a talk we have already had months ago. -I change my workstation every X months. Each time I either loose the -configuration of all the apps I use, or I just waste a bunch of hours getting -setup like I was on my old box. I also spent a lot of time reconfiguring the -same stuff again on all my workstations (home, work) +I change my workstation every X months. Each time I either lose my apps' +configurations, or I just waste a bunch of hours getting setup like I was on my old box. I also spend a lot of time reconfiguring the same stuff again on all my workstations (home, work). Boring... Some people tried to solve the problem on the application layer, like -[Github's Boxen](https://boxen.github.com/), but I feel like it solves a non -problem: I don't really spend time installing stuff, mostly downloading: I -spend time configuring it. +[Github's Boxen](https://boxen.github.com/), but it solves a different +problem, from my point of view. I don't spend a lot of time installing or downloading stuff. I spend time configuring it. -For years, I've used a personnal shell script that was copying known config +For years, I've used a personal shell script that was copying known config files into Subversion, Git or Dropbox, and linked them into my home. But I felt a lot of us had the same problem: Making a more generic tool could help others and I could get help from others to support more apps in the tool. @@ -451,17 +445,17 @@ and I could get help from others to support more apps in the tool. So here comes Mackup, the little tool that will sync all your application configs to Dropbox (or Google Drive, or anything). -And it's [GPL](http://www.gnu.org/licenses/gpl.html) of course. +And it's [GPL](http://www.gnu.org/licenses/gpl.html), of course. -## What platform is supported +## What platforms are supported? - OS X - GNU/Linux -## What's up with the weird name +## What's up with the weird name? -Mackup is just a contraction of Mac and Backup, I suck at naming stuff, ok. +Mackup is just a contraction of Mac and Backup. It is simple, short, and easy to remember, and it corresponds with the whole idea of Mackup: the simpler – the better! (And I suck at naming stuff, but who doesn't.) -## Where can I find more information +## Where can I find more information? In the [doc](doc) directory. From 56570921f794425a0f211761d72035790343d1d3 Mon Sep 17 00:00:00 2001 From: Katya Demidova Date: Tue, 15 Dec 2015 14:37:01 +0300 Subject: [PATCH 0538/1256] Fixed: Line length, trailing spaces README.md:81: MD009 Trailing spaces README.md:437: MD009 Trailing spaces README.md:10: MD013 Line length README.md:81: MD013 Line length README.md:432: MD013 Line length README.md:438: MD013 Line length README.md:457: MD013 Line length --- README.md | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 927de0933..e12775093 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,8 @@ Keep your application settings in sync. ## Quickstart -If you have [Dropbox](https://www.dropbox.com) installed and want to use it to save your config files, that's super easy. +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 [Homebrew](http://brew.sh/) and do: @@ -78,7 +79,8 @@ By only tracking pure configuration files, it keeps the crap out of your freshly new installed workstation (no cache, temporary and locally specific files are transfered). -Mackup makes setting up the environment easy and simple, saving time for your family, great ideas, and all the cool stuff you like. +Mackup makes setting up the environment easy and simple, saving time for your +family, great ideas, and all the cool stuff you like. ## Bullsh*t, what does it really do to my files? @@ -429,13 +431,15 @@ about the pain it is to reconfigure our Macbook each time we get a new one or install from scratch. That's a talk we have already had months ago. I change my workstation every X months. Each time I either lose my apps' -configurations, or I just waste a bunch of hours getting setup like I was on my old box. I also spend a lot of time reconfiguring the same stuff again on all my workstations (home, work). +configurations, or I just waste a bunch of hours getting setup like I was on my +old box. I also spend a lot of time reconfiguring the same stuff again on all my +workstations (home, work). Boring... -Some people tried to solve the problem on the application layer, like -[Github's Boxen](https://boxen.github.com/), but it solves a different -problem, from my point of view. I don't spend a lot of time installing or downloading stuff. I spend time configuring it. +Some people tried to solve the problem on the application layer, like [Github's Boxen](https://boxen.github.com/), +but it solves a different problem, from my point of view. I don't spend a lot +of time installing or downloading stuff. I spend time configuring it. For years, I've used a personal shell script that was copying known config files into Subversion, Git or Dropbox, and linked them into my home. But I felt @@ -454,7 +458,9 @@ And it's [GPL](http://www.gnu.org/licenses/gpl.html), of course. ## What's up with the weird name? -Mackup is just a contraction of Mac and Backup. It is simple, short, and easy to remember, and it corresponds with the whole idea of Mackup: the simpler – the better! (And I suck at naming stuff, but who doesn't.) +Mackup is just a contraction of Mac and Backup. It is simple, short, and easy to +remember, and it corresponds with the whole idea of Mackup: the simpler – the better! +(And I suck at naming stuff, but who doesn't.) ## Where can I find more information? From 5b460ecbb969a44bfc60760870de476b2544e61d Mon Sep 17 00:00:00 2001 From: Katya Demidova Date: Tue, 15 Dec 2015 14:42:48 +0300 Subject: [PATCH 0539/1256] Fixed Trailing punctuation in header README.md:441: MD009 Trailing spaces README.md:10: MD013 Line length README.md:72: MD026 Trailing punctuation in header README.md:85: MD026 Trailing punctuation in header README.md:423: MD026 Trailing punctuation in header README.md:454: MD026 Trailing punctuation in header README.md:459: MD026 Trailing punctuation in header README.md:465: MD026 Trailing punctuation in header --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index e12775093..3f1c3576f 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ Keep your application settings in sync. ## Quickstart -If you have [Dropbox](https://www.dropbox.com) installed and want to use it to save your config -files, that's super easy. +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 [Homebrew](http://brew.sh/) and do: @@ -69,7 +69,7 @@ Display the list of applications supported by Mackup. Get some help, obviously... -## What does it do? +## What does it do - Back ups your application settings in a safe directory (e.g. Dropbox) - Syncs your application settings among all your workstations @@ -82,7 +82,7 @@ files are transfered). Mackup makes setting up the environment easy and simple, saving time for your family, great ideas, and all the cool stuff you like. -## Bullsh*t, what does it really do to my files? +## Bullsh*t, what does it really do to my files Let's take `git` as an example. Your settings for `git` are saved in your home folder, in the `.gitconfig` file. @@ -420,7 +420,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Zsh](http://zsh.sourceforge.net/) - iTunes Applescripts -## Can you support application X? +## Can you support application X We can [with your help](doc#get-official-support-for-an-application) ;) @@ -438,7 +438,7 @@ workstations (home, work). Boring... Some people tried to solve the problem on the application layer, like [Github's Boxen](https://boxen.github.com/), -but it solves a different problem, from my point of view. I don't spend a lot +but it solves a different problem, from my point of view. I don't spend a lot of time installing or downloading stuff. I spend time configuring it. For years, I've used a personal shell script that was copying known config @@ -451,17 +451,17 @@ configs to Dropbox (or Google Drive, or anything). And it's [GPL](http://www.gnu.org/licenses/gpl.html), of course. -## What platforms are supported? +## What platforms are supported - OS X - GNU/Linux -## What's up with the weird name? +## What's up with the weird name Mackup is just a contraction of Mac and Backup. It is simple, short, and easy to remember, and it corresponds with the whole idea of Mackup: the simpler – the better! (And I suck at naming stuff, but who doesn't.) -## Where can I find more information? +## Where can I find more information In the [doc](doc) directory. From 3d8bcad8ef708313346bbccada95b0e6b1616d50 Mon Sep 17 00:00:00 2001 From: Katya Demidova Date: Wed, 16 Dec 2015 21:16:32 +0300 Subject: [PATCH 0540/1256] Added table of contents to Readme --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index 3f1c3576f..bfc52caf6 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,20 @@ Keep your application settings in sync. [![Circle CI](https://circleci.com/gh/lra/mackup.svg?style=shield)](https://circleci.com/gh/lra/mackup) [![codecov.io](https://codecov.io/github/lra/mackup/coverage.svg?branch=master)](http://codecov.io/github/lra/mackup?branch=master) +**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](#what-s-up-with-the-weird-name) +- [Where can I find more information](#where-can-i-find-more-information) + ## Quickstart If you have [Dropbox](https://www.dropbox.com) installed and want to use it to From c76616aa950d03168de3ed14b224e70a9819480d Mon Sep 17 00:00:00 2001 From: Katya Demidova Date: Wed, 16 Dec 2015 21:23:22 +0300 Subject: [PATCH 0541/1256] Fixed Emphasis used instead of a header mdl 'CHANGELOG.md' 'README.md' 'doc/README.md' 'CONTRIBUTING.md' 'INSTALL.md' 'tests/README.md' 'doc/release.md' 'tests/fixtures/Library/Mobile Documents/com~apple~CloudDocs/_blank_.md' README.md:8: MD036 Emphasis used instead of a header mdl returned exit code 1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bfc52caf6..935d600e2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Keep your application settings in sync. [![Circle CI](https://circleci.com/gh/lra/mackup.svg?style=shield)](https://circleci.com/gh/lra/mackup) [![codecov.io](https://codecov.io/github/lra/mackup/coverage.svg?branch=master)](http://codecov.io/github/lra/mackup?branch=master) -**Table of content:** +## Table of content: - [Quickstart](#quickstart) - [Usage](#usage) From e1aeec2607771f55c9c18d6ab2f3199b8c97fbfc Mon Sep 17 00:00:00 2001 From: Katya Demidova Date: Wed, 16 Dec 2015 21:28:48 +0300 Subject: [PATCH 0542/1256] Fixed Trailing punctuation in header --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 935d600e2..32195148b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Keep your application settings in sync. [![Circle CI](https://circleci.com/gh/lra/mackup.svg?style=shield)](https://circleci.com/gh/lra/mackup) [![codecov.io](https://codecov.io/github/lra/mackup/coverage.svg?branch=master)](http://codecov.io/github/lra/mackup?branch=master) -## Table of content: +## Table of content - [Quickstart](#quickstart) - [Usage](#usage) From 0617ee12d6c91b98201c069d36172f254d1266a9 Mon Sep 17 00:00:00 2001 From: Simon Dick Date: Sat, 19 Dec 2015 09:56:04 +0000 Subject: [PATCH 0543/1256] Add Tunnelblick support --- mackup/applications/tunnelblick.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/tunnelblick.cfg diff --git a/mackup/applications/tunnelblick.cfg b/mackup/applications/tunnelblick.cfg new file mode 100644 index 000000000..33fa64249 --- /dev/null +++ b/mackup/applications/tunnelblick.cfg @@ -0,0 +1,5 @@ +[application] +name = Tunnelblick + +[configuration_files] +Library/Application Support/Tunnelblick/Configurations From 4bf488e0156eaf868b4dd768b24a0f38b31ab38e Mon Sep 17 00:00:00 2001 From: Simon Dick Date: Sat, 19 Dec 2015 09:58:51 +0000 Subject: [PATCH 0544/1256] Update docs --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06c3604f0..30deedfe7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for Tunnelblick (via @sidick) - Add support for PHPStorm 10 (via @welly) - Add support for Robomongo (via @rbartoli) - Add support for AppCleaner (via @rbartoli) diff --git a/README.md b/README.md index 3f1c3576f..ab116b21a 100644 --- a/README.md +++ b/README.md @@ -393,6 +393,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/) +- [Tunnelblick](https://tunnelblick.net) - [Twitterrific](http://twitterrific.com/) - [tvnamer](https://github.com/dbr/tvnamer) - [Übersicht](http://tracesof.net/uebersicht/) From e3e1938397af8bf92af755fc6e079fd805437e5d Mon Sep 17 00:00:00 2001 From: Timidger Date: Sun, 27 Dec 2015 23:14:23 -0500 Subject: [PATCH 0545/1256] Added Zathura Support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/zathura.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/zathura.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 06c3604f0..a156395ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for Zathura (via @timidger) - Add support for PHPStorm 10 (via @welly) - Add support for Robomongo (via @rbartoli) - Add support for AppCleaner (via @rbartoli) diff --git a/README.md b/README.md index 3f1c3576f..57bc58fee 100644 --- a/README.md +++ b/README.md @@ -417,6 +417,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [XtraFinder](http://www.trankynam.com/xtrafinder/) - [Yummy FTP](http://www.yummysoftware.com/) - [z](https://github.com/rupa/z) +- [zathura](https://pwmt.org/projects/zathura/) - [Zsh](http://zsh.sourceforge.net/) - iTunes Applescripts diff --git a/mackup/applications/zathura.cfg b/mackup/applications/zathura.cfg new file mode 100644 index 000000000..103e16273 --- /dev/null +++ b/mackup/applications/zathura.cfg @@ -0,0 +1,5 @@ +[application] +name = zathura + +[configuration_files] +.config/zathura/zathurarc From 2f62df6c95ba9832df5f601b95ff4171febc0c2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=81uczy=C5=84ski?= Date: Thu, 31 Dec 2015 13:44:53 +0100 Subject: [PATCH 0546/1256] htop: added linux path --- mackup/applications/htop.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/htop.cfg b/mackup/applications/htop.cfg index 87b1e031f..c17e11ead 100644 --- a/mackup/applications/htop.cfg +++ b/mackup/applications/htop.cfg @@ -3,3 +3,4 @@ name = Htop [configuration_files] .htoprc +.config/htop/htoprc From 1f18822ffc5ed6f45b6d9b71ea0493f66d2a7281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=81uczy=C5=84ski?= Date: Thu, 31 Dec 2015 13:49:30 +0100 Subject: [PATCH 0547/1256] keepassx2: added linux path --- mackup/applications/keepassx.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/keepassx.cfg b/mackup/applications/keepassx.cfg index d475b80ce..5c72b6994 100644 --- a/mackup/applications/keepassx.cfg +++ b/mackup/applications/keepassx.cfg @@ -3,5 +3,6 @@ name = KeePassX [configuration_files] .keepassx +.config/keepassx/keepassx2.ini Library/Preferences/org.keepassx.keepassx.plist Library/Application Support/keepassxkeepassx2.ini From a4bd16d342bcb48ee861d0afa329f11be351e478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=81uczy=C5=84ski?= Date: Thu, 31 Dec 2015 14:20:50 +0100 Subject: [PATCH 0548/1256] added workrave support --- README.md | 1 + mackup/applications/workrave.cfg | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 mackup/applications/workrave.cfg diff --git a/README.md b/README.md index 3f1c3576f..5dc9dc8b2 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. - [WebStorm](https://www.jetbrains.com/webstorm/) - [Wget](https://www.gnu.org/software/wget/) - [Witch](http://manytricks.com/witch/) +- [Workrave](http://www.workrave.org/) - [X11](http://www.x.org/) - [Xamarin Studio](https://xamarin.com/studio) - [XBindKeys](http://www.nongnu.org/xbindkeys/) diff --git a/mackup/applications/workrave.cfg b/mackup/applications/workrave.cfg new file mode 100644 index 000000000..b704106ec --- /dev/null +++ b/mackup/applications/workrave.cfg @@ -0,0 +1,6 @@ +[application] +name = Workrave + +[configuration_files] +.workrave/id +.workrave/historystats From 691aa444f7bb629a17b1b78817ab83fc9659ca48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=81uczy=C5=84ski?= Date: Thu, 31 Dec 2015 14:28:42 +0100 Subject: [PATCH 0549/1256] added support for fasd --- README.md | 1 + mackup/applications/fasd.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/fasd.cfg diff --git a/README.md b/README.md index 3f1c3576f..b950ebc1e 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. - [ExpanDrive](http://www.expandrive.com/) - [Fantastical](http://flexibits.com/fantastical) - [Feeds](http://www.feedsapp.com/) +- [fasd](https://github.com/clvv/fasd) - [Filezilla](https://filezilla-project.org/) - [Fish](http://ridiculousfish.com/shell/) - [Flux](https://justgetflux.com/) diff --git a/mackup/applications/fasd.cfg b/mackup/applications/fasd.cfg new file mode 100644 index 000000000..4bcb0321e --- /dev/null +++ b/mackup/applications/fasd.cfg @@ -0,0 +1,5 @@ +[application] +name = fasd + +[configuration_files] +.fasd From cc33654278d91c2a6f5fd9643d700f25431bcc49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=81uczy=C5=84ski?= Date: Thu, 31 Dec 2015 14:31:44 +0100 Subject: [PATCH 0550/1256] added support for gdb --- README.md | 1 + mackup/applications/gdb.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/gdb.cfg diff --git a/README.md b/README.md index 3f1c3576f..1d5f75cdb 100644 --- a/README.md +++ b/README.md @@ -214,6 +214,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [FontExplorer X](http://www.fontexplorerx.com/) - [ForkLift 2](http://www.binarynights.com/forklift/) - [Gas Mask](https://github.com/2ndalpha/gasmask/) +- [gdb](https://www.gnu.org/software/gdb/) - [Gear Player](https://www.gearmusicplayer.com/) - [GeekTool](http://projects.tynsoe.org/en/geektool/) - [GHCi](https://wiki.haskell.org/GHC/GHCi) diff --git a/mackup/applications/gdb.cfg b/mackup/applications/gdb.cfg new file mode 100644 index 000000000..6ac8a8ed7 --- /dev/null +++ b/mackup/applications/gdb.cfg @@ -0,0 +1,5 @@ +[application] +name = gdb + +[configuration_files] +.gdbinit From c626fb7260c4f5e81ecacdaffb588b625cad5492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=81uczy=C5=84ski?= Date: Thu, 31 Dec 2015 14:36:00 +0100 Subject: [PATCH 0551/1256] added support for myrepos --- README.md | 1 + mackup/applications/myrepos.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/myrepos.cfg diff --git a/README.md b/README.md index 3f1c3576f..b5ba3f4c5 100644 --- a/README.md +++ b/README.md @@ -287,6 +287,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Mou](http://25.io/mou/) - [mpd](http://www.musicpd.org) - [MPV](https://mpv.io/) +- [myrepos](https://github.com/joeyh/myrepos) - [Nano](http://www.nano-editor.org/) - [Navicat](http://navicat.com/) - [ncmpcpp](http://rybczak.net/ncmpcpp/) diff --git a/mackup/applications/myrepos.cfg b/mackup/applications/myrepos.cfg new file mode 100644 index 000000000..76ba6ba65 --- /dev/null +++ b/mackup/applications/myrepos.cfg @@ -0,0 +1,5 @@ +[application] +name = myrepos + +[configuration_files] +.mrconfig From 593158cb8ef98cdd929cf36e3938992da30df2a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=81uczy=C5=84ski?= Date: Thu, 31 Dec 2015 14:48:54 +0100 Subject: [PATCH 0552/1256] added support for audacious --- README.md | 1 + mackup/applications/audacious.cfg | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 mackup/applications/audacious.cfg diff --git a/README.md b/README.md index 3f1c3576f..f40cf13bb 100644 --- a/README.md +++ b/README.md @@ -148,6 +148,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [asciinema](https://asciinema.org/) - [Aspell](http://aspell.net/) - [Atom](https://atom.io/) +- [Audacious](http://audacious-media-player.org/) - [AusKey](https://abr.gov.au/AUSkey/) - [Autokey](https://code.google.com/p/autokey/) - [Awareness](http://iamfutureproof.com/tools/awareness/) diff --git a/mackup/applications/audacious.cfg b/mackup/applications/audacious.cfg new file mode 100644 index 000000000..092f5e56e --- /dev/null +++ b/mackup/applications/audacious.cfg @@ -0,0 +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 From 51cdd9629b14160e149e5b5bc95c2a568c13b0b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=81uczy=C5=84ski?= Date: Thu, 31 Dec 2015 15:00:40 +0100 Subject: [PATCH 0553/1256] added support for doublecmd --- README.md | 1 + mackup/applications/doublecmd.cfg | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 mackup/applications/doublecmd.cfg diff --git a/README.md b/README.md index 3f1c3576f..5c33d0645 100644 --- a/README.md +++ b/README.md @@ -197,6 +197,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/) +- [Double Commander](http://doublecmd.sourceforge.net/) - [Doxie](http://www.getdoxie.com/) - [Droplr](https://droplr.com/) - [Dropzone 3](https://aptonic.com/dropzone3/) diff --git a/mackup/applications/doublecmd.cfg b/mackup/applications/doublecmd.cfg new file mode 100644 index 000000000..5f775c8ec --- /dev/null +++ b/mackup/applications/doublecmd.cfg @@ -0,0 +1,8 @@ +[application] +name = Double Commander + +[configuration_files] +.config/doublecmd/wfx.ini +.config/doublecmd/doublecmd.ext +.config/doublecmd/shortcuts.scf +.config/doublecmd/doublecmd.xml From d7ee2a91771040ef57cd572c6fd39474cc1083cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=81uczy=C5=84ski?= Date: Thu, 31 Dec 2015 18:01:28 +0100 Subject: [PATCH 0554/1256] pycharm: support for v5, linux support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/pycharm40.cfg | 1 + mackup/applications/pycharm50.cfg | 7 +++++++ 4 files changed, 10 insertions(+) create mode 100644 mackup/applications/pycharm50.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 06c3604f0..fbe49619e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for PyCharm 5, Linux support (via @doubleloop) - Add support for PHPStorm 10 (via @welly) - Add support for Robomongo (via @rbartoli) - Add support for AppCleaner (via @rbartoli) diff --git a/README.md b/README.md index 3f1c3576f..ff8bac5f3 100644 --- a/README.md +++ b/README.md @@ -324,6 +324,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [ProxyChains NG](http://sourceforge.net/projects/proxychains-ng/) - [Punto Switcher](https://punto.yandex.ru/) - [PyCharm 4](https://www.jetbrains.com/pycharm/) +- [PyCharm 5](https://www.jetbrains.com/pycharm/) - [PyPI](https://pypi.python.org/pypi) - [PyRadio](http://www.coderholic.com/pyradio/) - [Querious](http://www.araelium.com/querious/) diff --git a/mackup/applications/pycharm40.cfg b/mackup/applications/pycharm40.cfg index b9fa72cd3..f55bd2985 100644 --- a/mackup/applications/pycharm40.cfg +++ b/mackup/applications/pycharm40.cfg @@ -2,5 +2,6 @@ name = PyCharm 4 [configuration_files] +.PyCharm40/config Library/Application Support/PyCharm40 Library/Preferences/PyCharm40 diff --git a/mackup/applications/pycharm50.cfg b/mackup/applications/pycharm50.cfg new file mode 100644 index 000000000..09eebd115 --- /dev/null +++ b/mackup/applications/pycharm50.cfg @@ -0,0 +1,7 @@ +[application] +name = PyCharm 5 + +[configuration_files] +.PyCharm50/config +Library/Application Support/PyCharm50 +Library/Preferences/PyCharm50 From c78d2d7b576d0d861bf71d8476d57d2cc49b92cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=81uczy=C5=84ski?= Date: Thu, 31 Dec 2015 18:07:30 +0100 Subject: [PATCH 0555/1256] intellij: added linux support --- mackup/applications/intellijidea-12.cfg | 1 + mackup/applications/intellijidea-13.cfg | 1 + mackup/applications/intellijidea-14.cfg | 1 + mackup/applications/intellijidea-15.cfg | 1 + 4 files changed, 4 insertions(+) diff --git a/mackup/applications/intellijidea-12.cfg b/mackup/applications/intellijidea-12.cfg index 105256a84..66fbc40db 100644 --- a/mackup/applications/intellijidea-12.cfg +++ b/mackup/applications/intellijidea-12.cfg @@ -2,5 +2,6 @@ name = IntelliJ IDEA 12 [configuration_files] +.IntelliJIdea12/config/ Library/Application Support/IntelliJIdea12 Library/Preferences/IntelliJIdea12 diff --git a/mackup/applications/intellijidea-13.cfg b/mackup/applications/intellijidea-13.cfg index 06501f503..b624ce405 100644 --- a/mackup/applications/intellijidea-13.cfg +++ b/mackup/applications/intellijidea-13.cfg @@ -2,5 +2,6 @@ name = IntelliJ IDEA 13 [configuration_files] +.IntelliJIdea13/config/ Library/Application Support/IntelliJIdea13 Library/Preferences/IntelliJIdea13 diff --git a/mackup/applications/intellijidea-14.cfg b/mackup/applications/intellijidea-14.cfg index c3abb2241..483fc704d 100644 --- a/mackup/applications/intellijidea-14.cfg +++ b/mackup/applications/intellijidea-14.cfg @@ -2,5 +2,6 @@ name = IntelliJ IDEA 14 [configuration_files] +.IntelliJIdea14/config/ Library/Application Support/IntelliJIdea14 Library/Preferences/IntelliJIdea14 diff --git a/mackup/applications/intellijidea-15.cfg b/mackup/applications/intellijidea-15.cfg index 3f753e7e0..0fbdad2ed 100644 --- a/mackup/applications/intellijidea-15.cfg +++ b/mackup/applications/intellijidea-15.cfg @@ -2,5 +2,6 @@ name = IntelliJ IDEA 15 [configuration_files] +.IntelliJIdea15/config/ Library/Application Support/IntelliJIdea15 Library/Preferences/IntelliJIdea15 From 31fc467d49c508ec008467c8c880fd0499771a4a Mon Sep 17 00:00:00 2001 From: Jimmy Doan Date: Fri, 1 Jan 2016 00:15:56 -0800 Subject: [PATCH 0556/1256] Adding support for Photoshop CC 2015. --- mackup/applications/photoshop.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/photoshop.cfg b/mackup/applications/photoshop.cfg index e1eaf721d..978e3690c 100644 --- a/mackup/applications/photoshop.cfg +++ b/mackup/applications/photoshop.cfg @@ -4,6 +4,8 @@ name = Adobe Photoshop [configuration_files] 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/Preferences/Adobe Photoshop CC 2013 Settings Library/Preferences/Adobe Photoshop CC 2014 Settings +Library/Preferences/Adobe Photoshop CC 2015 Settings Library/Preferences/com.adobe.Photoshop.plist From 72cbdc45c45bc41ef4bc8e82be74e08fd02b40fe Mon Sep 17 00:00:00 2001 From: Robert Orzanna Date: Fri, 15 Jan 2016 16:11:12 +0100 Subject: [PATCH 0557/1256] Create rhythmbox.cfg --- mackup/applications/rhythmbox.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/rhythmbox.cfg diff --git a/mackup/applications/rhythmbox.cfg b/mackup/applications/rhythmbox.cfg new file mode 100644 index 000000000..576c5b2cf --- /dev/null +++ b/mackup/applications/rhythmbox.cfg @@ -0,0 +1,5 @@ +[application] +name = Rhythmbox + +[configuration_files] +.gconf/apps/rhythmbox From f1450215dcc807213946231acc83f9ce9e5f1eca Mon Sep 17 00:00:00 2001 From: Robert Orzanna Date: Mon, 28 Sep 2015 10:11:59 +0200 Subject: [PATCH 0558/1256] Add support for CopyQ --- CHANGELOG.md | 4 +++- README.md | 1 + mackup/applications/copyq.cfg | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 mackup/applications/copyq.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 06c3604f0..c7357ca62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,8 +40,10 @@ - Improved support for Composer, backup ./composer/composer.json (via @mnapoli) - Add support for Blackfire (via @mnapoli) - Add support for liquidprompt (via @GochoMugo) -- Add support for REdshift (via @orschiro) - Add support for ShowyEdge (via @zanderzhng) +- Add support for Redshift (via @orschiro) +- Add support for CopyQ (via @orschiro) + ## Mackup 0.8.11 diff --git a/README.md b/README.md index 3f1c3576f..ecbe925ec 100644 --- a/README.md +++ b/README.md @@ -185,6 +185,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Conky](https://github.com/brndnmtthws/conky) - [Consular](https://github.com/achiu/consular) - [ControlPlane](http://www.controlplaneapp.com/) +- [CopyQ](https://github.com/hluk/CopyQ) - [CoRD](http://cord.sourceforge.net/) - [CotEditor](http://coteditor.com/) - [Cyberduck](https://cyberduck.io/) diff --git a/mackup/applications/copyq.cfg b/mackup/applications/copyq.cfg new file mode 100644 index 000000000..05b5530d4 --- /dev/null +++ b/mackup/applications/copyq.cfg @@ -0,0 +1,5 @@ +[application] +name = CopyQ + +[configuration_files] +.config/copyq From ca43027dbefed86909dfc6c5ac350bbdf735c905 Mon Sep 17 00:00:00 2001 From: Robert Orzanna Date: Fri, 15 Jan 2016 16:11:12 +0100 Subject: [PATCH 0559/1256] Create rhythmbox.cfg --- mackup/applications/rhythmbox.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/rhythmbox.cfg diff --git a/mackup/applications/rhythmbox.cfg b/mackup/applications/rhythmbox.cfg new file mode 100644 index 000000000..576c5b2cf --- /dev/null +++ b/mackup/applications/rhythmbox.cfg @@ -0,0 +1,5 @@ +[application] +name = Rhythmbox + +[configuration_files] +.gconf/apps/rhythmbox From 1e88f514898d6b05f7ebcc35c12c522111db3b19 Mon Sep 17 00:00:00 2001 From: Robert Orzanna Date: Mon, 18 Jan 2016 07:33:01 +0100 Subject: [PATCH 0560/1256] Added Rhythmbox to README and CHANGELOG --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4f505881..1bb154668 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - Removed iTerm2 support since iTerm2 overwrites the symlink (via @adamlogic) - Add support for Rime (via @codefalling) - Improved support for R (via @wyf88) +- Add support for Rhythmbox (via @orschiro) ## Mackup 0.8.12 diff --git a/README.md b/README.md index ecbe925ec..8ca92831d 100644 --- a/README.md +++ b/README.md @@ -341,6 +341,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/) +- [Rhythmbox](https://wiki.gnome.org/Apps/Rhythmbox) - [S3cmd](http://s3tools.org/s3cmd) - [SABnzbd](http://sabnzbd.org/) - [SBCL](http://www.sbcl.org/) From a237cd10fb4e1ef968293980731cb7788152032a Mon Sep 17 00:00:00 2001 From: Neil Barton-Greenwood Date: Mon, 18 Jan 2016 16:45:59 +0000 Subject: [PATCH 0561/1256] Specify Byobu files except SSH agent socket. --- mackup/applications/byobu.cfg | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/mackup/applications/byobu.cfg b/mackup/applications/byobu.cfg index e577afca7..5ac146e3c 100644 --- a/mackup/applications/byobu.cfg +++ b/mackup/applications/byobu.cfg @@ -2,7 +2,22 @@ name = Byobu [configuration_files] -.byobu +.byobu/.screenrc +.byobu/.tmux.conf +.byobu/backend +.byobu/color +.byobu/color.tmux +.byobu/datetime.tmux +.byobu/keybindings +.byobu/keybindings.tmux +.byobu/profile +.byobu/profile.tmux +.byobu/prompt +.byobu/prompt.tmux +.byobu/status +.byobu/statusrc +.byobu/windows +.byobu/windows.tmux .byoburc .byoburc.tmux .byoburc.screen From 64ea550c6d204e105e3e8150b709b4d35565904e Mon Sep 17 00:00:00 2001 From: Andrew Babichev Date: Wed, 27 Jan 2016 14:27:40 +0200 Subject: [PATCH 0562/1256] Add RubyMine 8 support --- mackup/applications/rubymine.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/rubymine.cfg b/mackup/applications/rubymine.cfg index 64ae5c48c..3789a0e31 100644 --- a/mackup/applications/rubymine.cfg +++ b/mackup/applications/rubymine.cfg @@ -10,3 +10,5 @@ Library/Application Support/RubyMine60 Library/Preferences/RubyMine60 Library/Application Support/RubyMine70 Library/Preferences/RubyMine70 +Library/Application Support/RubyMine80 +Library/Preferences/RubyMine80 From f8f44a1e4f68217ca0a99f172d2da4d5dbfd47cc Mon Sep 17 00:00:00 2001 From: "Ryan J. Bonnell" Date: Wed, 27 Jan 2016 14:48:03 -0700 Subject: [PATCH 0563/1256] Add support for Name Mangler --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/name-mangler.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100755 mackup/applications/name-mangler.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 032235097..ae5625324 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Add support for Rime (via @codefalling) - Improved support for R (via @wyf88) - Add support for Rhythmbox (via @orschiro) +- Add support for Name Mangler (via @ryanjbonnell) ## Mackup 0.8.12 diff --git a/README.md b/README.md index 245e878f2..c35436fc0 100644 --- a/README.md +++ b/README.md @@ -288,6 +288,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Mou](http://25.io/mou/) - [mpd](http://www.musicpd.org) - [MPV](https://mpv.io/) +- [Name Mangler](http://manytricks.com/namemangler/) - [Nano](http://www.nano-editor.org/) - [Navicat](http://navicat.com/) - [ncmpcpp](http://rybczak.net/ncmpcpp/) diff --git a/mackup/applications/name-mangler.cfg b/mackup/applications/name-mangler.cfg new file mode 100755 index 000000000..92185a36a --- /dev/null +++ b/mackup/applications/name-mangler.cfg @@ -0,0 +1,6 @@ +[application] +name = Name Mangler + +[configuration_files] +Library/Application Support/Name Mangler +Library/Preferences/com.manytricks.NameMangler.plist From c0ccf85b0665f5fe4f86a1bcdac5c0e3cf6ccbd7 Mon Sep 17 00:00:00 2001 From: gmp Date: Thu, 4 Feb 2016 10:07:22 +0100 Subject: [PATCH 0564/1256] Add .vim/plugin/settings folder --- CHANGELOG.md | 1 + mackup/applications/vim.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 032235097..d863671b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add .vim/plugin/settings folder (via @gmpetrov) - Add support for Tunnelblick (via @sidick) - Add support for PHPStorm 10 (via @welly) - Add support for Robomongo (via @rbartoli) diff --git a/mackup/applications/vim.cfg b/mackup/applications/vim.cfg index 2f5fd81d3..ccea44831 100644 --- a/mackup/applications/vim.cfg +++ b/mackup/applications/vim.cfg @@ -14,6 +14,7 @@ name = Vim .vim/indent .vim/syntax .vim/vimrc +.vim/plugin/settings .vimrc .vimrc.after .vimrc.before From f8c4e54848edb4c7c45a38820c71de26ee0b36b8 Mon Sep 17 00:00:00 2001 From: sethherr Date: Thu, 4 Feb 2016 11:48:53 -0600 Subject: [PATCH 0565/1256] Add documentation to the main readme about personalization In reference to #236 --- README.md | 10 +++++++++- doc/README.md | 9 ++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 245e878f2..28f0a0efc 100644 --- a/README.md +++ b/README.md @@ -427,6 +427,14 @@ See the [README](doc/README.md) file in the doc directory for more info. We can [with your help](doc#get-official-support-for-an-application) ;) +## Personalization & configuration + +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 Yesterday, I had a talk with [Zach Zaro](http://zacharyzaro.com/), complaining @@ -467,4 +475,4 @@ remember, and it corresponds with the whole idea of Mackup: the simpler – the ## Where can I find more information -In the [doc](doc) directory. +In the [doc](doc) directory. \ No newline at end of file diff --git a/doc/README.md b/doc/README.md index dcb1cef35..755975d22 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,6 +1,6 @@ # Configuration -All the configuration is done into a file named `.mackup.cfg` to store at the +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. @@ -9,6 +9,13 @@ 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 +``` + ## Storage ### Dropbox From 3f6ad18b723340e4097205b630317064780d2736 Mon Sep 17 00:00:00 2001 From: Esteban Date: Fri, 5 Feb 2016 17:24:43 -0300 Subject: [PATCH 0566/1256] Fix Skype support Issue #705 https://github.com/lra/mackup/issues/705 --- CHANGELOG.md | 1 + mackup/applications/skype.cfg | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 032235097..24904e5a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Add support for Rime (via @codefalling) - Improved support for R (via @wyf88) - Add support for Rhythmbox (via @orschiro) +- Fixed Skype Support (via @TCattd) ## Mackup 0.8.12 diff --git a/mackup/applications/skype.cfg b/mackup/applications/skype.cfg index 82f8801da..d352f2da9 100644 --- a/mackup/applications/skype.cfg +++ b/mackup/applications/skype.cfg @@ -2,4 +2,6 @@ name = Skype [configuration_files] -Library/Application Support/Skype +Library/Application Support/Skype/DataRv +Library/Application Support/Skype/shared_dynco +Library/Application Support/Skype/shared_httpfe From a295b712e1201e8592fdcb721e38a826df10a38f Mon Sep 17 00:00:00 2001 From: Vivien Leroy Date: Wed, 17 Feb 2016 01:26:29 +0100 Subject: [PATCH 0567/1256] Added support for OpenEmu --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/openemu.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/openemu.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 032235097..5a6b3a828 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for OpenEmu (via @fantattitude) - Add support for Tunnelblick (via @sidick) - Add support for PHPStorm 10 (via @welly) - Add support for Robomongo (via @rbartoli) diff --git a/README.md b/README.md index 28f0a0efc..b278bf46b 100644 --- a/README.md +++ b/README.md @@ -302,6 +302,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Oh My Zsh](https://github.com/robbyrussell/oh-my-zsh) - [OmniFocus](https://www.omnigroup.com/omnifocus/) - [OmniGraffle](https://www.omnigroup.com/omnigraffle/) +- [OpenEmu](http://openemu.org) - [OpenSSH](http://www.openssh.com/) (NOTE: includes private keys) - [Pandoc](http://pandoc.org) - [Pass](http://www.passwordstore.org/) diff --git a/mackup/applications/openemu.cfg b/mackup/applications/openemu.cfg new file mode 100644 index 000000000..477712c6a --- /dev/null +++ b/mackup/applications/openemu.cfg @@ -0,0 +1,6 @@ +[application] +name = OpenEmu + +[configuration_files] +Library/Preferences/org.openemu.OpenEmu.plist +Library/Application Support/OpenEmu From 3066dec73f3be972001f5f0584449bd88df6eccc Mon Sep 17 00:00:00 2001 From: james sa Date: Mon, 22 Feb 2016 11:07:41 +0800 Subject: [PATCH 0568/1256] Add support for MonoDevelop --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/monodevelop.cfg | 7 +++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/monodevelop.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 032235097..82960fd00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Add support for Rime (via @codefalling) - Improved support for R (via @wyf88) - Add support for Rhythmbox (via @orschiro) +- Add support for MonoDevelop (via @jamessa) ## Mackup 0.8.12 diff --git a/README.md b/README.md index 28f0a0efc..698e83fef 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. - [MPlayerX](http://mplayerx.org) - [MusicBrainz Picard](https://picard.musicbrainz.org/) - [MySQL](http://www.mysql.com/) +- [MonoDevelop](http://www.monodevelop.com) - [Moom](http://manytricks.com/moom/) - [Mou](http://25.io/mou/) - [mpd](http://www.musicpd.org) diff --git a/mackup/applications/monodevelop.cfg b/mackup/applications/monodevelop.cfg new file mode 100644 index 000000000..f9acc426e --- /dev/null +++ b/mackup/applications/monodevelop.cfg @@ -0,0 +1,7 @@ +[application] +name = MonoDevelop 5 + +[configuration_files] +Library/MonoDevelop-Unity-5.0/KeyBindings/Custom.mac-kb.xml +Library/Preferences/MonoDevelop-Unity-5.0/MonoDevelopProperties.xml +Library/MonoDevelop-Unity-5.0/Policies/Default.mdpolicy.xml From 0f30978de631f042ff2bf1658d9e066ede626942 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 19 Mar 2016 12:13:14 -0400 Subject: [PATCH 0569/1256] No need to keep the version in the name --- mackup/applications/monodevelop.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/monodevelop.cfg b/mackup/applications/monodevelop.cfg index f9acc426e..28d342a80 100644 --- a/mackup/applications/monodevelop.cfg +++ b/mackup/applications/monodevelop.cfg @@ -1,5 +1,5 @@ [application] -name = MonoDevelop 5 +name = MonoDevelop [configuration_files] Library/MonoDevelop-Unity-5.0/KeyBindings/Custom.mac-kb.xml From b8f3a79674ad3fe0dfcc8c22c4c333a6619d1aae Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 19 Mar 2016 12:15:24 -0400 Subject: [PATCH 0570/1256] newline missing --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 03935bbf9..65fb910c8 100644 --- a/README.md +++ b/README.md @@ -478,4 +478,4 @@ remember, and it corresponds with the whole idea of Mackup: the simpler – the ## Where can I find more information -In the [doc](doc) directory. \ No newline at end of file +In the [doc](doc) directory. From 70571c323a0b9f03ba368f7201133cf1b920f546 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 19 Mar 2016 12:20:33 -0400 Subject: [PATCH 0571/1256] let's keep it a-z ordered to prevent duplicates --- mackup/applications/vim.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/vim.cfg b/mackup/applications/vim.cfg index ccea44831..0d8c23ed2 100644 --- a/mackup/applications/vim.cfg +++ b/mackup/applications/vim.cfg @@ -12,9 +12,9 @@ name = Vim .vim/ftdetect .vim/ftplugin .vim/indent +.vim/plugin/settings .vim/syntax .vim/vimrc -.vim/plugin/settings .vimrc .vimrc.after .vimrc.before From 91aff122582404c645cb26209e20bb5ae3be8875 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 19 Mar 2016 12:27:11 -0400 Subject: [PATCH 0572/1256] Missing changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b5a05e26..33304950f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ - Add support for MonoDevelop (via @jamessa) - Fixed Skype Support (via @TCattd) - Add support for Name Mangler (via @ryanjbonnell) +- Add support for Workrave (via @doubleloop) ## Mackup 0.8.12 From 389309191c8b9ec1e3110459654eef5293acf1ba Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 19 Mar 2016 12:29:05 -0400 Subject: [PATCH 0573/1256] Missing changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33304950f..7c8ce8fc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ - Fixed Skype Support (via @TCattd) - Add support for Name Mangler (via @ryanjbonnell) - Add support for Workrave (via @doubleloop) +- Add support for gdb (via @doubleloop) ## Mackup 0.8.12 From 20aef9c418824612075c285db902e6d911922180 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 19 Mar 2016 12:30:38 -0400 Subject: [PATCH 0574/1256] Missing changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c8ce8fc7..d11c1d007 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ - Add support for Name Mangler (via @ryanjbonnell) - Add support for Workrave (via @doubleloop) - Add support for gdb (via @doubleloop) +- Add support for fasd (via @doubleloop) ## Mackup 0.8.12 From 22f9ba16f5a35e65e40ee6f4eb56ffc6cdaa1367 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 19 Mar 2016 12:31:36 -0400 Subject: [PATCH 0575/1256] Missing changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d11c1d007..5171a70e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ - Add support for Workrave (via @doubleloop) - Add support for gdb (via @doubleloop) - Add support for fasd (via @doubleloop) +- Add support for doublecmd (via @doubleloop) ## Mackup 0.8.12 From c76ba98bc02fb0acb4acf6d50c17b1f5f5f03040 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 19 Mar 2016 12:35:28 -0400 Subject: [PATCH 0576/1256] MD013 Line length mdl returned exit code 1 --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ac697823..03051c365 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,9 @@ You can revert all your files to their original state. mackup uninstall ``` -This will remove the symlinks and copy back the files from the Mackup folder in Dropbox to their original places in your home. The Mackup folder and the files in it stay put, so that any other computer also running Mackup is unaffected. +This will remove the symlinks and copy back the files from the Mackup folder in +Dropbox to their original places in your home. The Mackup folder and the files +in it stay put, so that any other computer also running Mackup is unaffected. ## Supported Storages From 78ab0c3c13a61c9cdd1e9d3af8396396dec04a40 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 19 Mar 2016 12:49:49 -0400 Subject: [PATCH 0577/1256] Mackup 0.8.13 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da291c4ed..b39fa8db6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.13 + - Add support for OpenEmu (via @fantattitude) - Add .vim/plugin/settings folder (via @gmpetrov) - Add support for Tunnelblick (via @sidick) diff --git a/mackup/constants.py b/mackup/constants.py index 68cf73c25..c133257fc 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.12' +VERSION = '0.8.13' # Support platforms PLATFORM_DARWIN = 'Darwin' From b22ac90c8a88c824959f8603c16cbd300ea5b88e Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Wed, 9 Mar 2016 23:06:16 +0100 Subject: [PATCH 0578/1256] Add support for PhpStorm 2016.1 --- CHANGELOG.md | 1 + mackup/applications/phpstorm-11.cfg | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 mackup/applications/phpstorm-11.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b39fa8db6..af30acd3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ - Add support for doublecmd (via @doubleloop) - Add support for BBEdit (via @ryanjbonnell) - Add support for TextExpander (via @cjs) +- Add support for PhpStorm 11 (via @driesvints) ## Mackup 0.8.12 diff --git a/mackup/applications/phpstorm-11.cfg b/mackup/applications/phpstorm-11.cfg new file mode 100644 index 000000000..08a876b5f --- /dev/null +++ b/mackup/applications/phpstorm-11.cfg @@ -0,0 +1,7 @@ +[application] +name = PhpStorm 11 + +[configuration_files] +Library/Application Support/PhpStorm2016.1 +Library/Preferences/PhpStorm2016.1 +Library/Preferences/com.jetbrains.PhpStorm.plist From 5d107db67b091efbcd5580b0d3c49a5250c3d621 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Sun, 20 Mar 2016 00:32:48 +0100 Subject: [PATCH 0579/1256] Merge phpstorm files --- CHANGELOG.md | 3 ++- mackup/applications/phpstorm-10.cfg | 7 ------- mackup/applications/phpstorm-11.cfg | 7 ------- mackup/applications/phpstorm-6.cfg | 7 ------- mackup/applications/phpstorm-7.cfg | 7 ------- mackup/applications/phpstorm-8.cfg | 7 ------- mackup/applications/phpstorm-9.5.cfg | 7 ------- mackup/applications/phpstorm-9.cfg | 7 ------- mackup/applications/phpstorm.cfg | 19 +++++++++++++++++++ 9 files changed, 21 insertions(+), 50 deletions(-) delete mode 100644 mackup/applications/phpstorm-10.cfg delete mode 100644 mackup/applications/phpstorm-11.cfg delete mode 100644 mackup/applications/phpstorm-6.cfg delete mode 100644 mackup/applications/phpstorm-7.cfg delete mode 100644 mackup/applications/phpstorm-8.cfg delete mode 100644 mackup/applications/phpstorm-9.5.cfg delete mode 100644 mackup/applications/phpstorm-9.cfg create mode 100644 mackup/applications/phpstorm.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index af30acd3f..b19555db5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Add support for PhpStorm 2016.1 (via @driesvints) + ## Mackup 0.8.13 - Add support for OpenEmu (via @fantattitude) @@ -41,7 +43,6 @@ - Add support for doublecmd (via @doubleloop) - Add support for BBEdit (via @ryanjbonnell) - Add support for TextExpander (via @cjs) -- Add support for PhpStorm 11 (via @driesvints) ## Mackup 0.8.12 diff --git a/mackup/applications/phpstorm-10.cfg b/mackup/applications/phpstorm-10.cfg deleted file mode 100644 index fd24ffaef..000000000 --- a/mackup/applications/phpstorm-10.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[application] -name = PhpStorm 10 - -[configuration_files] -Library/Application Support/WebIde100 -Library/Preferences/WebIde100 -Library/Preferences/com.jetbrains.PhpStorm.plist diff --git a/mackup/applications/phpstorm-11.cfg b/mackup/applications/phpstorm-11.cfg deleted file mode 100644 index 08a876b5f..000000000 --- a/mackup/applications/phpstorm-11.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[application] -name = PhpStorm 11 - -[configuration_files] -Library/Application Support/PhpStorm2016.1 -Library/Preferences/PhpStorm2016.1 -Library/Preferences/com.jetbrains.PhpStorm.plist diff --git a/mackup/applications/phpstorm-6.cfg b/mackup/applications/phpstorm-6.cfg deleted file mode 100644 index bba1650f1..000000000 --- a/mackup/applications/phpstorm-6.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[application] -name = PhpStorm 6 - -[configuration_files] -Library/Application Support/WebIde60 -Library/Preferences/WebIde60 -Library/Preferences/com.jetbrains.PhpStorm.plist diff --git a/mackup/applications/phpstorm-7.cfg b/mackup/applications/phpstorm-7.cfg deleted file mode 100644 index b872d33d9..000000000 --- a/mackup/applications/phpstorm-7.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[application] -name = PhpStorm 7 - -[configuration_files] -Library/Application Support/WebIde70 -Library/Preferences/WebIde70 -Library/Preferences/com.jetbrains.PhpStorm.plist diff --git a/mackup/applications/phpstorm-8.cfg b/mackup/applications/phpstorm-8.cfg deleted file mode 100644 index 1c00110e8..000000000 --- a/mackup/applications/phpstorm-8.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[application] -name = PhpStorm 8 - -[configuration_files] -Library/Application Support/WebIde80 -Library/Preferences/WebIde80 -Library/Preferences/com.jetbrains.PhpStorm.plist diff --git a/mackup/applications/phpstorm-9.5.cfg b/mackup/applications/phpstorm-9.5.cfg deleted file mode 100644 index 9a06060e1..000000000 --- a/mackup/applications/phpstorm-9.5.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[application] -name = PhpStorm 9.5 - -[configuration_files] -Library/Application Support/WebIde95 -Library/Preferences/WebIde95 -Library/Preferences/com.jetbrains.PhpStorm.plist diff --git a/mackup/applications/phpstorm-9.cfg b/mackup/applications/phpstorm-9.cfg deleted file mode 100644 index b3292ac94..000000000 --- a/mackup/applications/phpstorm-9.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[application] -name = PhpStorm 9 - -[configuration_files] -Library/Application Support/WebIde90 -Library/Preferences/WebIde90 -Library/Preferences/com.jetbrains.PhpStorm.plist diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg new file mode 100644 index 000000000..de876877a --- /dev/null +++ b/mackup/applications/phpstorm.cfg @@ -0,0 +1,19 @@ +[application] +name = PhpStorm + +[configuration_files] +Library/Preferences/com.jetbrains.PhpStorm.plist +Library/Application Support/PhpStorm2016.1 +Library/Preferences/PhpStorm2016.1 +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/Preferences/WebIde60 From 57c9dabffab2ba0a9e46310966dac87ef27ad8bc Mon Sep 17 00:00:00 2001 From: Jean-Christophe GAY Date: Sat, 19 Mar 2016 12:23:52 +0100 Subject: [PATCH 0580/1256] Add support for IntelliJ IDEA 2016.1 --- CHANGELOG.md | 2 ++ mackup/applications/intellijidea-2016-1.cfg | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 mackup/applications/intellijidea-2016-1.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b39fa8db6..5bd6d0018 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Add support for IntelliJ IDEA 2016.1 (via @jcgay) + ## Mackup 0.8.13 - Add support for OpenEmu (via @fantattitude) diff --git a/mackup/applications/intellijidea-2016-1.cfg b/mackup/applications/intellijidea-2016-1.cfg new file mode 100644 index 000000000..26047a976 --- /dev/null +++ b/mackup/applications/intellijidea-2016-1.cfg @@ -0,0 +1,8 @@ +[application] +name = IntelliJ IDEA 2016.1 + +[configuration_files] +Library/Application Support/IntelliJIdea2016.1 +Library/Preferences/IntelliJIdea2016.1 +Library/Application Support/IdeaIC2016.1 +Library/Preferences/IdeaIC2016.1 From d6eec503bc9227e41d2068cad4059c0656becd92 Mon Sep 17 00:00:00 2001 From: Jean-Christophe GAY Date: Sun, 20 Mar 2016 10:12:32 +0100 Subject: [PATCH 0581/1256] Merge IntelliJ IDEA configuration files in intellijidea.cfg --- mackup/applications/intellijidea-12.cfg | 7 ------- mackup/applications/intellijidea-13.cfg | 7 ------- mackup/applications/intellijidea-14.cfg | 7 ------- mackup/applications/intellijidea-15.cfg | 7 ------- mackup/applications/intellijidea-2016-1.cfg | 8 -------- mackup/applications/intellijidea.cfg | 20 ++++++++++++++++++++ 6 files changed, 20 insertions(+), 36 deletions(-) delete mode 100644 mackup/applications/intellijidea-12.cfg delete mode 100644 mackup/applications/intellijidea-13.cfg delete mode 100644 mackup/applications/intellijidea-14.cfg delete mode 100644 mackup/applications/intellijidea-15.cfg delete mode 100644 mackup/applications/intellijidea-2016-1.cfg create mode 100644 mackup/applications/intellijidea.cfg diff --git a/mackup/applications/intellijidea-12.cfg b/mackup/applications/intellijidea-12.cfg deleted file mode 100644 index 66fbc40db..000000000 --- a/mackup/applications/intellijidea-12.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[application] -name = IntelliJ IDEA 12 - -[configuration_files] -.IntelliJIdea12/config/ -Library/Application Support/IntelliJIdea12 -Library/Preferences/IntelliJIdea12 diff --git a/mackup/applications/intellijidea-13.cfg b/mackup/applications/intellijidea-13.cfg deleted file mode 100644 index b624ce405..000000000 --- a/mackup/applications/intellijidea-13.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[application] -name = IntelliJ IDEA 13 - -[configuration_files] -.IntelliJIdea13/config/ -Library/Application Support/IntelliJIdea13 -Library/Preferences/IntelliJIdea13 diff --git a/mackup/applications/intellijidea-14.cfg b/mackup/applications/intellijidea-14.cfg deleted file mode 100644 index 483fc704d..000000000 --- a/mackup/applications/intellijidea-14.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[application] -name = IntelliJ IDEA 14 - -[configuration_files] -.IntelliJIdea14/config/ -Library/Application Support/IntelliJIdea14 -Library/Preferences/IntelliJIdea14 diff --git a/mackup/applications/intellijidea-15.cfg b/mackup/applications/intellijidea-15.cfg deleted file mode 100644 index 0fbdad2ed..000000000 --- a/mackup/applications/intellijidea-15.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[application] -name = IntelliJ IDEA 15 - -[configuration_files] -.IntelliJIdea15/config/ -Library/Application Support/IntelliJIdea15 -Library/Preferences/IntelliJIdea15 diff --git a/mackup/applications/intellijidea-2016-1.cfg b/mackup/applications/intellijidea-2016-1.cfg deleted file mode 100644 index 26047a976..000000000 --- a/mackup/applications/intellijidea-2016-1.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[application] -name = IntelliJ IDEA 2016.1 - -[configuration_files] -Library/Application Support/IntelliJIdea2016.1 -Library/Preferences/IntelliJIdea2016.1 -Library/Application Support/IdeaIC2016.1 -Library/Preferences/IdeaIC2016.1 diff --git a/mackup/applications/intellijidea.cfg b/mackup/applications/intellijidea.cfg new file mode 100644 index 000000000..4fd8e845d --- /dev/null +++ b/mackup/applications/intellijidea.cfg @@ -0,0 +1,20 @@ +[application] +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 +Library/Application Support/IntelliJIdea2016.1 +Library/Preferences/IntelliJIdea2016.1 +Library/Application Support/IdeaIC2016.1 +Library/Preferences/IdeaIC2016.1 From 38f4739e8d6d267d365a6aa31c2c77ac1a2a1e94 Mon Sep 17 00:00:00 2001 From: Jean-Christophe GAY Date: Sun, 20 Mar 2016 10:51:03 +0100 Subject: [PATCH 0582/1256] Use unbroken mdl version The build fails on circleci with: mdl 'CHANGELOG.md' 'README.md' 'doc/README.md' 'CONTRIBUTING.md' 'INSTALL.md' 'tests/README.md' 'doc/release.md' 'tests/fixtures/Library/Mobile Documents/com~apple~CloudDocs/_blank_.md' /home/ubuntu/.rvm/gems/ruby-1.9.3-p448/gems/mdl-0.3.0/lib/mdl/cli.rb:155:in `probe_config_file': uninitialized constant MarkdownLint::CLI::Pathname (NameError) from /home/ubuntu/.rvm/gems/ruby-1.9.3-p448/gems/mdl-0.3.0/lib/mdl/cli.rb:98:in `run' from /home/ubuntu/.rvm/gems/ruby-1.9.3-p448/gems/mdl-0.3.0/lib/mdl.rb:14:in `run' from /home/ubuntu/.rvm/gems/ruby-1.9.3-p448/gems/mdl-0.3.0/bin/mdl:10:in `' from /home/ubuntu/.rvm/gems/ruby-1.9.3-p448/bin/mdl:22:in `load' from /home/ubuntu/.rvm/gems/ruby-1.9.3-p448/bin/mdl:22:in `
' mdl returned exit code 1 It seems to come from a regression in v0.3.0, see https://github.com/mivok/markdownlint/pull/125 --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index efdfbcf73..b03d84cdf 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ dependencies: pre: - - gem install mdl + - gem install mdl -v0.2.1 test: override: From fcc64ca338791a438d1277e43d84daae3156a4ee Mon Sep 17 00:00:00 2001 From: Esteban Date: Mon, 21 Mar 2016 17:36:51 -0300 Subject: [PATCH 0583/1256] Removed Skype (see #768) See issue #768 --- CHANGELOG.md | 2 +- README.md | 1 - mackup/applications/skype.cfg | 7 ------- 3 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 mackup/applications/skype.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b39fa8db6..72a1034e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,7 +33,7 @@ - Improved support for R (via @wyf88) - Add support for Rhythmbox (via @orschiro) - Add support for MonoDevelop (via @jamessa) -- Fixed Skype Support (via @TCattd) +- Removed Skype Support. See [#768](https://github.com/lra/mackup/pull/768) (via @TCattd) - Add support for Name Mangler (via @ryanjbonnell) - Add support for Workrave (via @doubleloop) - Add support for gdb (via @doubleloop) diff --git a/README.md b/README.md index 912e9840f..2aee9de25 100644 --- a/README.md +++ b/README.md @@ -387,7 +387,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [SizeUp](http://www.irradiatedsoftware.com/sizeup/) - [Skim](http://skim-app.sourceforge.net/) - [Skitch](https://evernote.com/skitch/) -- [Skype](http://www.skype.com/) - [Slate](https://github.com/jigish/slate) - [Slogger](http://brettterpstra.com/projects/slogger/) - [Smooth Mouse](http://smoothmouse.com/) diff --git a/mackup/applications/skype.cfg b/mackup/applications/skype.cfg deleted file mode 100644 index d352f2da9..000000000 --- a/mackup/applications/skype.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[application] -name = Skype - -[configuration_files] -Library/Application Support/Skype/DataRv -Library/Application Support/Skype/shared_dynco -Library/Application Support/Skype/shared_httpfe From ce0110fdfd03227dc8d9d6b856d0aaa6f12b47c6 Mon Sep 17 00:00:00 2001 From: Esteban Date: Mon, 21 Mar 2016 17:48:02 -0300 Subject: [PATCH 0584/1256] No link in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72a1034e1..a1e2013b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,7 +33,7 @@ - Improved support for R (via @wyf88) - Add support for Rhythmbox (via @orschiro) - Add support for MonoDevelop (via @jamessa) -- Removed Skype Support. See [#768](https://github.com/lra/mackup/pull/768) (via @TCattd) +- Removed Skype Support. See #768 (via @TCattd) - Add support for Name Mangler (via @ryanjbonnell) - Add support for Workrave (via @doubleloop) - Add support for gdb (via @doubleloop) From d3980f0d6f67a860493b85b0628d03989efe5fec Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 21 Mar 2016 22:04:21 -0400 Subject: [PATCH 0585/1256] Missing changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b19555db5..f98a93f27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Add support for PhpStorm 2016.1 (via @driesvints) +- Added linux support for Audacious (via @doubleloop) ## Mackup 0.8.13 From f3b5a074f5c9d6a5cccd57f24f7a76b6f2e57234 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 21 Mar 2016 22:08:06 -0400 Subject: [PATCH 0586/1256] Let's not rewrite past changelogs ;) --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74af0e2da..262f7031b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Add support for PhpStorm 2016.1 (via @driesvints) - Added linux support for Audacious (via @doubleloop) - Add support for IntelliJ IDEA 2016.1 (via @jcgay) +- Removed Skype Support. See #768 (via @TCattd) ## Mackup 0.8.13 @@ -37,7 +38,7 @@ - Improved support for R (via @wyf88) - Add support for Rhythmbox (via @orschiro) - Add support for MonoDevelop (via @jamessa) -- Removed Skype Support. See #768 (via @TCattd) +- Fixed Skype Support (via @TCattd) - Add support for Name Mangler (via @ryanjbonnell) - Add support for Workrave (via @doubleloop) - Add support for gdb (via @doubleloop) From 3e946d722a8a93d2b227575378351d21646afa71 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 22 Mar 2016 10:11:26 -0400 Subject: [PATCH 0587/1256] Use latest upstream mdl Followup to #783 --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index b03d84cdf..efdfbcf73 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ dependencies: pre: - - gem install mdl -v0.2.1 + - gem install mdl test: override: From 33b5275cf192601874f8fc8e314c8fe25c13db7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=81uczy=C5=84ski?= Date: Tue, 22 Mar 2016 11:09:45 -0700 Subject: [PATCH 0588/1256] moved pycharm configs to single file --- mackup/applications/{pycharm40.cfg => pycharm.cfg} | 5 ++++- mackup/applications/pycharm50.cfg | 7 ------- 2 files changed, 4 insertions(+), 8 deletions(-) rename mackup/applications/{pycharm40.cfg => pycharm.cfg} (54%) delete mode 100644 mackup/applications/pycharm50.cfg diff --git a/mackup/applications/pycharm40.cfg b/mackup/applications/pycharm.cfg similarity index 54% rename from mackup/applications/pycharm40.cfg rename to mackup/applications/pycharm.cfg index f55bd2985..15bcf43a1 100644 --- a/mackup/applications/pycharm40.cfg +++ b/mackup/applications/pycharm.cfg @@ -1,7 +1,10 @@ [application] -name = PyCharm 4 +name = PyCharm [configuration_files] .PyCharm40/config Library/Application Support/PyCharm40 Library/Preferences/PyCharm40 +.PyCharm50/config +Library/Application Support/PyCharm50 +Library/Preferences/PyCharm50 diff --git a/mackup/applications/pycharm50.cfg b/mackup/applications/pycharm50.cfg deleted file mode 100644 index 09eebd115..000000000 --- a/mackup/applications/pycharm50.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[application] -name = PyCharm 5 - -[configuration_files] -.PyCharm50/config -Library/Application Support/PyCharm50 -Library/Preferences/PyCharm50 From 407a58848805fca901d8216042d6a3b96a258560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=81uczy=C5=84ski?= Date: Tue, 22 Mar 2016 11:11:54 -0700 Subject: [PATCH 0589/1256] updated README --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index ff8bac5f3..babba0629 100644 --- a/README.md +++ b/README.md @@ -323,8 +323,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [ProxyChains](http://proxychains.sourceforge.net) - [ProxyChains NG](http://sourceforge.net/projects/proxychains-ng/) - [Punto Switcher](https://punto.yandex.ru/) -- [PyCharm 4](https://www.jetbrains.com/pycharm/) -- [PyCharm 5](https://www.jetbrains.com/pycharm/) +- [PyCharm](https://www.jetbrains.com/pycharm/) - [PyPI](https://pypi.python.org/pypi) - [PyRadio](http://www.coderholic.com/pyradio/) - [Querious](http://www.araelium.com/querious/) From 2268fc3dd77f39397ed25d6fab6e4fe45e0d9c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=81uczy=C5=84ski?= Date: Tue, 29 Mar 2016 16:28:12 +0200 Subject: [PATCH 0590/1256] added support for pycharm 6.1 --- mackup/applications/pycharm.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mackup/applications/pycharm.cfg b/mackup/applications/pycharm.cfg index 15bcf43a1..8b589b36e 100644 --- a/mackup/applications/pycharm.cfg +++ b/mackup/applications/pycharm.cfg @@ -8,3 +8,6 @@ Library/Preferences/PyCharm40 .PyCharm50/config Library/Application Support/PyCharm50 Library/Preferences/PyCharm50 +.PyCharm2016.1/config +Library/Application Support/PyCharm2016.1 +Library/Preferences/PyCharm2016.1 From e5bdc839fe9d4377d9f85437fd50a00f24b6773e Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 29 Mar 2016 11:00:52 -0400 Subject: [PATCH 0591/1256] Changelog update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6a9bf4d0..99ee44847 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Add support for IntelliJ IDEA 2016.1 (via @jcgay) - Removed Skype Support. See #768 (via @TCattd) - Add support for PyCharm 5, Linux support (via @doubleloop) +- added support for pycharm 6.1 (@doubleloop) ## Mackup 0.8.13 From 1f3d8bd2faf075004db0c9fddec2e2cfd55de230 Mon Sep 17 00:00:00 2001 From: Nero Denney Date: Thu, 7 Apr 2016 16:08:42 +0100 Subject: [PATCH 0592/1256] Added support for Drush --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/drush.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/drush.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 99ee44847..14e594016 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Removed Skype Support. See #768 (via @TCattd) - Add support for PyCharm 5, Linux support (via @doubleloop) - added support for pycharm 6.1 (@doubleloop) +- Added support for Drush (@penance316) ## Mackup 0.8.13 diff --git a/README.md b/README.md index 88f222262..ac79abe66 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. - [Double Commander](http://doublecmd.sourceforge.net/) - [Doxie](http://www.getdoxie.com/) - [Droplr](https://droplr.com/) +- [Drush](http://www.drush.org/) - [Dropzone 3](https://aptonic.com/dropzone3/) - [EditorConfig](http://editorconfig.org/) - [Electrum](https://electrum.org/#home) diff --git a/mackup/applications/drush.cfg b/mackup/applications/drush.cfg new file mode 100644 index 000000000..0e193b196 --- /dev/null +++ b/mackup/applications/drush.cfg @@ -0,0 +1,5 @@ +[application] +name = Drush + +[configuration_files] +.drush \ No newline at end of file From 5626ff15e1deeeb84cfaa86c0c9c43172722703b Mon Sep 17 00:00:00 2001 From: Nero Date: Thu, 7 Apr 2016 19:29:47 +0100 Subject: [PATCH 0593/1256] add newline char to end --- mackup/applications/drush.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/drush.cfg b/mackup/applications/drush.cfg index 0e193b196..c7821a638 100644 --- a/mackup/applications/drush.cfg +++ b/mackup/applications/drush.cfg @@ -2,4 +2,4 @@ name = Drush [configuration_files] -.drush \ No newline at end of file +.drush From 30771bef5fb08502bf9f391a5f202d71afc47c59 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 7 Apr 2016 21:11:10 -0400 Subject: [PATCH 0594/1256] cfg files don't need to be executables --- mackup/applications/name-mangler.cfg | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 mackup/applications/name-mangler.cfg diff --git a/mackup/applications/name-mangler.cfg b/mackup/applications/name-mangler.cfg old mode 100755 new mode 100644 From 5894987dd99cc31c2f7a7b6fae11dd2358168b48 Mon Sep 17 00:00:00 2001 From: Felipe Date: Fri, 8 Apr 2016 16:12:56 +0200 Subject: [PATCH 0595/1256] Added MPS Youtube support (#790) * Added MPS Youtube support - Sync app configuration file - Sync app local playlists file * Fixed CHANGELOG.md * Added newline --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/mps-youtube.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/mps-youtube.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 14e594016..df9a42d8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Add support for PyCharm 5, Linux support (via @doubleloop) - added support for pycharm 6.1 (@doubleloop) - Added support for Drush (@penance316) +- Added support for MPS-Youtube (via @fmartingr) ## Mackup 0.8.13 diff --git a/README.md b/README.md index ac79abe66..8a9b8ce9c 100644 --- a/README.md +++ b/README.md @@ -309,6 +309,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [mpd](http://www.musicpd.org) - [MPlayerX](http://mplayerx.org) - [MPV](https://mpv.io/) +- [MPS Youtube](https://github.com/mps-youtube/mps-youtube) - [MusicBrainz Picard](https://picard.musicbrainz.org/) - [myrepos](https://github.com/joeyh/myrepos) - [MySQL](http://www.mysql.com/) diff --git a/mackup/applications/mps-youtube.cfg b/mackup/applications/mps-youtube.cfg new file mode 100644 index 000000000..3c73693e4 --- /dev/null +++ b/mackup/applications/mps-youtube.cfg @@ -0,0 +1,6 @@ +[application] +name = MPS Youtube + +[configuration_files] +.config/mps-youtube/config +.config/mps-youtube/playlist_v2 From 80c618b747e45768597b9c5d7d53396afdb0bdf3 Mon Sep 17 00:00:00 2001 From: ryanjbonnell Date: Sat, 9 Apr 2016 09:44:46 -0700 Subject: [PATCH 0596/1256] Add support for HandBrake (#795) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/handbrake.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/handbrake.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index df9a42d8b..25bb3b36c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - added support for pycharm 6.1 (@doubleloop) - Added support for Drush (@penance316) - Added support for MPS-Youtube (via @fmartingr) +- Add support for HandBrake (via @ryanjbonnell) ## Mackup 0.8.13 diff --git a/README.md b/README.md index 8a9b8ce9c..eeb90bbdf 100644 --- a/README.md +++ b/README.md @@ -249,6 +249,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Gradle](http://gradle.org) - [GrandTotal 3](http://www.mediaatelier.com/GrandTotal4/) - [Hammerspoon](http://www.hammerspoon.org/) +- [HandBrake](https://handbrake.fr/) - [Hands Off!](http://www.oneperiodic.com/products/handsoff/) - [Hazel](http://www.noodlesoft.com/hazel.php) - [Heroku](https://www.heroku.com/) diff --git a/mackup/applications/handbrake.cfg b/mackup/applications/handbrake.cfg new file mode 100644 index 000000000..b9e27dd09 --- /dev/null +++ b/mackup/applications/handbrake.cfg @@ -0,0 +1,5 @@ +[application] +name = HandBrake + +[configuration_files] +Library/Application Support/HandBrake/UserPresets.plist From 88f94291ea75899fec44e23e1a71c9f95036e720 Mon Sep 17 00:00:00 2001 From: "Ryan J. Bonnell" Date: Sat, 9 Apr 2016 10:42:05 -0700 Subject: [PATCH 0597/1256] Add support for WordPress WP-CLI --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/wp-cli.cfg | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/wp-cli.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 25bb3b36c..91c3338a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ - Added support for Drush (@penance316) - Added support for MPS-Youtube (via @fmartingr) - Add support for HandBrake (via @ryanjbonnell) +- Add support for WordPress WP-CLI (via @ryanjbonnell) + ## Mackup 0.8.13 diff --git a/README.md b/README.md index eeb90bbdf..9cbccfc7e 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. - [WebStorm](https://www.jetbrains.com/webstorm/) - [Wget](https://www.gnu.org/software/wget/) - [Witch](http://manytricks.com/witch/) +- [WordPress WP-CLI](http://wp-cli.org/) - [Workrave](http://www.workrave.org/) - [X11](http://www.x.org/) - [Xamarin Studio](https://xamarin.com/studio) diff --git a/mackup/applications/wp-cli.cfg b/mackup/applications/wp-cli.cfg new file mode 100644 index 000000000..7c75d4f4b --- /dev/null +++ b/mackup/applications/wp-cli.cfg @@ -0,0 +1,5 @@ +[application] +name = WP-CLI + +[configuration_files] +.wp-cli From 1dc524a20831a9481e23b39b190c8e517543a502 Mon Sep 17 00:00:00 2001 From: ryanjbonnell Date: Sat, 9 Apr 2016 23:27:06 -0700 Subject: [PATCH 0598/1256] Whitespace cleanup - Remove accidental consecutive line breaks --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91c3338a7..5de68618b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,6 @@ - Add support for HandBrake (via @ryanjbonnell) - Add support for WordPress WP-CLI (via @ryanjbonnell) - ## Mackup 0.8.13 - Add support for OpenEmu (via @fantattitude) From 748688e30d60d54a83e23d0753df5a2086ceaf37 Mon Sep 17 00:00:00 2001 From: cclauss Date: Sat, 16 Apr 2016 01:08:51 +0200 Subject: [PATCH 0599/1256] Simplify with or --- mackup/mackup.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/mackup/mackup.py b/mackup/mackup.py index 0f45146af..f0d5c1040 100644 --- a/mackup/mackup.py +++ b/mackup/mackup.py @@ -88,11 +88,8 @@ def get_apps_to_backup(self): app_db = appsdb.ApplicationsDatabase() # If a list of apps to sync is specify, we only allow those - if self._config.apps_to_sync: - apps_to_backup = self._config.apps_to_sync - else: - # We allow every supported app by default - apps_to_backup = app_db.get_app_names() + # Or we allow every supported app by default + apps_to_backup = self._config.apps_to_sync or app_db.get_app_names() # Remove the specified apps to ignore for app_name in self._config.apps_to_ignore: From c70cabb402451ae6dafb144036c66a76074933fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Desv=C3=A9?= Date: Mon, 25 Apr 2016 16:49:10 +0200 Subject: [PATCH 0600/1256] Add .docker authentication config (#802) --- mackup/applications/docker.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/docker.cfg b/mackup/applications/docker.cfg index f27502df6..4292a64a6 100644 --- a/mackup/applications/docker.cfg +++ b/mackup/applications/docker.cfg @@ -3,3 +3,4 @@ name = Docker [configuration_files] .dockercfg +.docker From d06aead781a2847215d48146f5721119e9b34ea1 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Mon, 25 Apr 2016 10:53:39 -0400 Subject: [PATCH 0601/1256] Adding HyperDock support (#798) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/hyperdock.cfg | 7 +++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/hyperdock.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 25bb3b36c..32d3c529e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Added support for Drush (@penance316) - Added support for MPS-Youtube (via @fmartingr) - Add support for HandBrake (via @ryanjbonnell) +- Add support for HyperDock (via @leek) ## Mackup 0.8.13 diff --git a/README.md b/README.md index eeb90bbdf..c98277aed 100644 --- a/README.md +++ b/README.md @@ -257,6 +257,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Hexels](http://hexraystudios.com/hexels/) - [Houdini](http://uglyapps.co.uk/houdini/) - [Htop](http://htop.sourceforge.net/) +- [HyperDock](https://bahoom.com/hyperdock) - [HyperSwitch](https://bahoom.com/hyperswitch) - [i2cssh](https://github.com/wouterdebie/i2cssh) - [i3](https://i3wm.org/) diff --git a/mackup/applications/hyperdock.cfg b/mackup/applications/hyperdock.cfg new file mode 100644 index 000000000..c19f5da08 --- /dev/null +++ b/mackup/applications/hyperdock.cfg @@ -0,0 +1,7 @@ +[application] +name = HyperDock + +[configuration_files] +Library/Application Support/HyperDock +Library/Preferences/de.bahoom.HyperDock.plist +Library/Preferences/de.bahoom.HyperDock.prefpane.plist From 61fe7882520e711d1a9011aa7e0e3ffbeb01184e Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 25 Apr 2016 10:59:45 -0400 Subject: [PATCH 0602/1256] Mackup 0.8.14 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46c8ba5a7..e29211bd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.14 + - Add support for PhpStorm 2016.1 (via @driesvints) - Added linux support for Audacious (via @doubleloop) - Add support for IntelliJ IDEA 2016.1 (via @jcgay) diff --git a/mackup/constants.py b/mackup/constants.py index c133257fc..bdda0caf4 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.13' +VERSION = '0.8.14' # Support platforms PLATFORM_DARWIN = 'Darwin' From 087d4fb54d02c7c74e29de1ef8a3bf63ea8de84f Mon Sep 17 00:00:00 2001 From: Alexander Ross Date: Tue, 26 Apr 2016 09:49:32 -0400 Subject: [PATCH 0603/1256] Fixing documentation of configuration_file paths. (#805) Fixing the documentation to reflect that configuration_file paths are relative to the user's home directory. --- doc/README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/README.md b/doc/README.md index 755975d22..a9732c1e5 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 @@ -13,9 +13,13 @@ Add personal files to sync by including the `configuration_files` header, e.g. ```ini [configuration_files] -~/.gitignore_global +.gitignore_global +.config/your-custom-file ``` +Note that Mackup assumes the file paths listed here are relative to your home +directory. + ## Storage ### Dropbox From 610d1bc3788523f7b0b538cdc99d21349a43f5ec Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 26 Apr 2016 12:05:04 -0400 Subject: [PATCH 0604/1256] PEP8 fixes --- mackup/application.py | 29 +++++++++++++++-------------- mackup/utils.py | 16 ++++++++-------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/mackup/application.py b/mackup/application.py index 4bec3be37..040066c93 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -65,12 +65,13 @@ 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 {} ..." @@ -149,12 +150,12 @@ 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: @@ -220,8 +221,8 @@ 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: diff --git a/mackup/utils.py b/mackup/utils.py index e20d33a72..dad9828fb 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -350,11 +350,11 @@ 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')): + 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')): + elif ((platform.system() == constants.PLATFORM_LINUX) and + os.path.isfile('/bin/setfacl')): subprocess.call(['/bin/setfacl', '-R', '-b', path]) @@ -371,11 +371,11 @@ 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')): + 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')): + elif (platform.system() == constants.PLATFORM_LINUX and + os.path.isfile('/usr/bin/chattr')): subprocess.call(['/usr/bin/chattr', '-R', '-i', path]) From 8982a4d4894efb8506cc8d15e4e13782cc87568d Mon Sep 17 00:00:00 2001 From: Anthony Somerset Date: Tue, 26 Apr 2016 21:51:42 +0200 Subject: [PATCH 0605/1256] Viscosity only needs the OpenVPN folder + plist Including the whole Application support folder includes the .Sparkle folder which seems to get very large over time with viscosity in particular as its not clearing out old versions like other apps seem to do thankfully Viscosity only seems to create one folder in here so if we capture that then everything still fine --- mackup/applications/viscosity.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/viscosity.cfg b/mackup/applications/viscosity.cfg index 34c5d1ebd..9099cf4d8 100644 --- a/mackup/applications/viscosity.cfg +++ b/mackup/applications/viscosity.cfg @@ -2,5 +2,5 @@ name = Viscosity [configuration_files] -Library/Application Support/Viscosity +Library/Application Support/Viscosity/OpenVPN Library/Preferences/com.viscosityvpn.Viscosity.plist From ca25f61ae59f6b16b3659ffb5d4b0ed316838eee Mon Sep 17 00:00:00 2001 From: Kristi Date: Wed, 11 May 2016 01:56:04 -0400 Subject: [PATCH 0606/1256] Add support for Sketch 3 --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/sketch.cfg | 6 ++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/sketch.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e29211bd7..299436fb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Add support for Sketch (via @enkia) + ## Mackup 0.8.14 - Add support for PhpStorm 2016.1 (via @driesvints) diff --git a/README.md b/README.md index fa65c3c22..b4b7f1552 100644 --- a/README.md +++ b/README.md @@ -390,6 +390,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/) +- [Sketch](http://sketchapp.com/) - [Skim](http://skim-app.sourceforge.net/) - [Skitch](https://evernote.com/skitch/) - [Slate](https://github.com/jigish/slate) diff --git a/mackup/applications/sketch.cfg b/mackup/applications/sketch.cfg new file mode 100644 index 000000000..86ad6b99b --- /dev/null +++ b/mackup/applications/sketch.cfg @@ -0,0 +1,6 @@ +[application] +name = Sketch + +[configuration_files] +Library/Application Support/com.bohemiancoding.sketch3 +Library/Preferences/com.bohemiancoding.sketch3.plist From df0df85ba89581f2d2762d0a0398061950b7a825 Mon Sep 17 00:00:00 2001 From: Sallar Kaboli Date: Fri, 13 May 2016 13:09:00 +0300 Subject: [PATCH 0607/1256] Added Fisherman --- mackup/applications/fisherman.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/fisherman.cfg diff --git a/mackup/applications/fisherman.cfg b/mackup/applications/fisherman.cfg new file mode 100644 index 000000000..8306142f1 --- /dev/null +++ b/mackup/applications/fisherman.cfg @@ -0,0 +1,6 @@ +[application] +name = Fisherman + +[configuration_files] +.config/fisherman +.config/fish/fishfile From cb13059337734e14e9a94e041a46ef894d7f80ab Mon Sep 17 00:00:00 2001 From: Sallar Kaboli Date: Fri, 13 May 2016 13:10:41 +0300 Subject: [PATCH 0608/1256] Updated README with Fisherman --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fa65c3c22..fb31722d5 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. - [Feeds](http://www.feedsapp.com/) - [Filezilla](https://filezilla-project.org/) - [Fish](http://ridiculousfish.com/shell/) +- [Fisherman](http://fisherman.sh/) - [Flux](https://justgetflux.com/) - [FontExplorer X](http://www.fontexplorerx.com/) - [ForkLift 2](http://www.binarynights.com/forklift/) From 95fdec88e9b83b4ed3080664b4b04429b5815a52 Mon Sep 17 00:00:00 2001 From: Morton Fox Date: Tue, 17 May 2016 12:14:03 -0400 Subject: [PATCH 0609/1256] Change Arara link to point to Github repo (#814) Arara website link returns a 404 error. Suggest changing it to point to the Arara Github repo. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fa65c3c22..ec6070d20 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. - [Ansible](http://www.ansible.com/) - [AppCleaner](http://freemacsoft.net/appcleaner/) - [AppCode](http://www.jetbrains.com/objc/) -- [Arara](http://cereda.github.io/arara/) +- [Arara](https://github.com/cereda/arara) - [aria2c](http://aria2.sourceforge.net/) - [Arm](https://www.atagar.com/arm/) - [Artistic Style](http://astyle.sourceforge.net) From e0cec01474a15a4862dbeda47a61a1ed08ea9c4d Mon Sep 17 00:00:00 2001 From: DrByte Date: Tue, 17 May 2016 22:49:43 -0400 Subject: [PATCH 0610/1256] Add support for other known variants of Navicat --- CHANGELOG.md | 2 ++ mackup/applications/navicat.cfg | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e29211bd7..d81f7ed20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Added additional Navicat products to existing support (via @drbyte) + ## Mackup 0.8.14 - Add support for PhpStorm 2016.1 (via @driesvints) diff --git a/mackup/applications/navicat.cfg b/mackup/applications/navicat.cfg index 48f5c76d6..9bbb1c560 100644 --- a/mackup/applications/navicat.cfg +++ b/mackup/applications/navicat.cfg @@ -3,4 +3,8 @@ name = Navicat [configuration_files] Library/Application Support/PremiumSoft CyberTech +Library/Application Support/Navicat for MySQL +Library/Application Support/Navicat Premium +Library/Preferences/com.prect.Navicat.plist +Library/Preferences/com.prect.NavicatPremium.plist Library/Preferences/com.prect.NavicatPremiumEssentials.plist From bc7128607000c99a9b6d40ef1530a4661fbbd628 Mon Sep 17 00:00:00 2001 From: DrByte Date: Wed, 18 May 2016 00:43:30 -0400 Subject: [PATCH 0611/1256] Fix errors in KeePassX entry --- mackup/applications/keepassx.cfg | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mackup/applications/keepassx.cfg b/mackup/applications/keepassx.cfg index d475b80ce..dd795bf10 100644 --- a/mackup/applications/keepassx.cfg +++ b/mackup/applications/keepassx.cfg @@ -3,5 +3,7 @@ name = KeePassX [configuration_files] .keepassx +.config/keepassx/keepassx2.ini Library/Preferences/org.keepassx.keepassx.plist -Library/Application Support/keepassxkeepassx2.ini +Library/Application Support/keepassx/keepassx2.ini + From c2ac7ea506c0c5f35c780393e91b6ef394452b80 Mon Sep 17 00:00:00 2001 From: ericpedia Date: Sun, 22 May 2016 04:39:00 -0400 Subject: [PATCH 0612/1256] Add Typinator config file --- mackup/applications/typinator.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/typinator.cfg diff --git a/mackup/applications/typinator.cfg b/mackup/applications/typinator.cfg new file mode 100644 index 000000000..d409d8bf9 --- /dev/null +++ b/mackup/applications/typinator.cfg @@ -0,0 +1,6 @@ +[application] +name = Typinator + +[configuration_files] +Library/Application Support/Typinator +Library/Preferences/com.macility.typinator2.plist From cb5964e6899f0613ceffcc7aaf5b4f956fc62f17 Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 22 May 2016 05:01:35 -0400 Subject: [PATCH 0613/1256] Add Typinator to Readme and Changelog --- CHANGELOG.md | 2 ++ README.md | 1 + 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e29211bd7..430a99884 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Add support for Typinator (via @ericpedia) + ## Mackup 0.8.14 - Add support for PhpStorm 2016.1 (via @driesvints) diff --git a/README.md b/README.md index ec6070d20..eac40f2ea 100644 --- a/README.md +++ b/README.md @@ -427,6 +427,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Tunnelblick](https://tunnelblick.net) - [tvnamer](https://github.com/dbr/tvnamer) - [Twitterrific](http://twitterrific.com/) +- [Typinator](http://www.ergonis.com/products/typinator/) - [Übersicht](http://tracesof.net/uebersicht/) - [uTorrent](http://www.utorrent.com/) - [Ventrilo](http://www.ventrilo.com/) From 9e0f0b8b95034678ede3a37a7cbfd566de60def1 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Fri, 3 Jun 2016 10:32:25 -0400 Subject: [PATCH 0614/1256] Update codecov.yml --- codecov.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 codecov.yml diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 000000000..651ace8f3 --- /dev/null +++ b/codecov.yml @@ -0,0 +1 @@ +comments: false From 550211cda20392753918df0f2255b3f45028e361 Mon Sep 17 00:00:00 2001 From: Josh Medeski Date: Tue, 7 Jun 2016 15:23:25 -0500 Subject: [PATCH 0615/1256] Add Wakatime Application (#827) * Add Wakatime Application * Update changelog * Add wakatime to README --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/wakatime.cfg | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/wakatime.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e29211bd7..e2b3d3290 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Add support for Wakatime (via @joshmedeski) + ## Mackup 0.8.14 - Add support for PhpStorm 2016.1 (via @driesvints) diff --git a/README.md b/README.md index ec6070d20..5b3aa9958 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. - [Viscosity](http://www.sparklabs.com/viscosity/) - [Visual Studio Code](https://code.visualstudio.com) - [VLC](http://www.videolan.org/) +- [Wakatime](https://wakatime.com/) - [WebStorm](https://www.jetbrains.com/webstorm/) - [Wget](https://www.gnu.org/software/wget/) - [Witch](http://manytricks.com/witch/) diff --git a/mackup/applications/wakatime.cfg b/mackup/applications/wakatime.cfg new file mode 100644 index 000000000..74d70ad14 --- /dev/null +++ b/mackup/applications/wakatime.cfg @@ -0,0 +1,5 @@ +[application] +name = Wakatime + +[configuration_files] +.wakatime.cfg From 60e61159aa1c7631900e23515c88931562f1493b Mon Sep 17 00:00:00 2001 From: Damien Erambert Date: Wed, 8 Jun 2016 09:43:33 -0700 Subject: [PATCH 0616/1256] Add support for Swinsian.app --- mackup/applications/swinsian.cfg | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 mackup/applications/swinsian.cfg diff --git a/mackup/applications/swinsian.cfg b/mackup/applications/swinsian.cfg new file mode 100644 index 000000000..83e7247d8 --- /dev/null +++ b/mackup/applications/swinsian.cfg @@ -0,0 +1,8 @@ +[application] +name = Swinsian + +[configuration_files] +Library/Application Support/Swinsian/Library.sqlite +Library/Application Support/Swinsian/License.swinsianlicense +Library/Preferences/com.swinsian.Swinsian.plist +Library/Preferences/com.swinsian.SwinsianDesktopWindow.plist From 529b6186a74e77cef57ed238b1962a5c91afdbef Mon Sep 17 00:00:00 2001 From: Damien Erambert Date: Wed, 8 Jun 2016 09:44:50 -0700 Subject: [PATCH 0617/1256] Add Swinsian link in README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5b3aa9958..e0c73d84f 100644 --- a/README.md +++ b/README.md @@ -408,6 +408,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Sublime Text](http://www.sublimetext.com/) - [Subversion](http://subversion.apache.org/) - [SuperDuper!](http://www.shirt-pocket.com/SuperDuper/SuperDuperDescription.html) +- [Swinsian](http://swinsian.com/) - [TaskPaper](http://www.hogbaysoftware.com/products/taskpaper) - [Taskwarrior](http://taskwarrior.org/) - [Teamocil](http://remiprev.github.io/teamocil/) From c5661a66314bc666ef34b3a65d0297b0a9977daf Mon Sep 17 00:00:00 2001 From: Damien Erambert Date: Wed, 8 Jun 2016 09:45:34 -0700 Subject: [PATCH 0618/1256] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2b3d3290..c2f74ab41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Add support for Wakatime (via @joshmedeski) +- Add support for Swinsian (via @eramdam) ## Mackup 0.8.14 From 9b835673b2cea1dc7da03d01e07ceb7f0244ad3e Mon Sep 17 00:00:00 2001 From: Chris Chamberlain Date: Sat, 18 Jun 2016 07:26:46 +1000 Subject: [PATCH 0619/1256] Added support for kwm (#834) * Create kwm.cfg * Update README.md * Added Kwm support to changelog --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/kwm.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/kwm.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e2b3d3290..5ff6492d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Add support for Wakatime (via @joshmedeski) +- Add support for Kwm (via @neon64) ## Mackup 0.8.14 diff --git a/README.md b/README.md index 5b3aa9958..eb140df1b 100644 --- a/README.md +++ b/README.md @@ -279,6 +279,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Keybase](https://keybase.io/) - [Keymo](http://manytricks.com/keymo/) - [KeyRemap4MacBook](https://pqrs.org/osx/karabiner/) +- [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) - [Liftoff](https://github.com/thoughtbot/liftoff) diff --git a/mackup/applications/kwm.cfg b/mackup/applications/kwm.cfg new file mode 100644 index 000000000..64364fab1 --- /dev/null +++ b/mackup/applications/kwm.cfg @@ -0,0 +1,5 @@ +[application] +name = Kwm + +[configuration_files] +.kwm/ From 7b5c8f4f937ab31afbd307fcf4debcf4a763bea9 Mon Sep 17 00:00:00 2001 From: Simon Paarlberg Date: Tue, 21 Jun 2016 23:41:12 +0200 Subject: [PATCH 0620/1256] Add Slic3r application --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/slic3r.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/slic3r.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ff6492d7..cebf1f904 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Add support for Wakatime (via @joshmedeski) - Add support for Kwm (via @neon64) +- Add support for Slic3r (via @blamh) ## Mackup 0.8.14 diff --git a/README.md b/README.md index eb140df1b..7c5800959 100644 --- a/README.md +++ b/README.md @@ -394,6 +394,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Skim](http://skim-app.sourceforge.net/) - [Skitch](https://evernote.com/skitch/) - [Slate](https://github.com/jigish/slate) +- [Slic3r](http://slic3r.org) - [Slogger](http://brettterpstra.com/projects/slogger/) - [Smooth Mouse](http://smoothmouse.com/) - [Soulver](http://www.acqualia.com/soulver/) diff --git a/mackup/applications/slic3r.cfg b/mackup/applications/slic3r.cfg new file mode 100644 index 000000000..897bf40ca --- /dev/null +++ b/mackup/applications/slic3r.cfg @@ -0,0 +1,5 @@ +[application] +name = Slic3r + +[configuration_files] +Library/Application Support/Slic3r From cd018f2d45ffaff03a142635cc3ec43e37e23575 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Wed, 22 Jun 2016 16:39:59 +0800 Subject: [PATCH 0621/1256] Backup Transmit favorites --- mackup/applications/transmit.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/transmit.cfg b/mackup/applications/transmit.cfg index c344acec4..8734390bf 100644 --- a/mackup/applications/transmit.cfg +++ b/mackup/applications/transmit.cfg @@ -4,3 +4,4 @@ name = Transmit [configuration_files] Library/Preferences/com.panic.Transmit.plist Library/Application Support/Transmit/Metadata +Library/Application Support/Transmit/Favorites From b8e09c427e60b55a1b790ee372b4c2b1dfd79fbb Mon Sep 17 00:00:00 2001 From: Altynai Date: Fri, 24 Jun 2016 13:31:58 +0800 Subject: [PATCH 0622/1256] Add support for Surge Mac --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/surge.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/surge.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ff6492d7..7d345829a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Add support for Wakatime (via @joshmedeski) - Add support for Kwm (via @neon64) +- Add support for Surge (via @Altynai) ## Mackup 0.8.14 diff --git a/README.md b/README.md index eb140df1b..8af151c57 100644 --- a/README.md +++ b/README.md @@ -409,6 +409,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Sublime Text](http://www.sublimetext.com/) - [Subversion](http://subversion.apache.org/) - [SuperDuper!](http://www.shirt-pocket.com/SuperDuper/SuperDuperDescription.html) +- [Surge](http://surge.run/manual/) - [TaskPaper](http://www.hogbaysoftware.com/products/taskpaper) - [Taskwarrior](http://taskwarrior.org/) - [Teamocil](http://remiprev.github.io/teamocil/) diff --git a/mackup/applications/surge.cfg b/mackup/applications/surge.cfg new file mode 100644 index 000000000..565996bd8 --- /dev/null +++ b/mackup/applications/surge.cfg @@ -0,0 +1,5 @@ +[application] +name = Surge + +[configuration_files] +.surge.conf From 175c90f32651fd39b88526b17a161c4d7f31a665 Mon Sep 17 00:00:00 2001 From: Iulian Onofrei Date: Wed, 29 Jun 2016 12:20:59 +0300 Subject: [PATCH 0623/1256] Add support for SmartGitHg --- mackup/applications/smartgithg.cfg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mackup/applications/smartgithg.cfg diff --git a/mackup/applications/smartgithg.cfg b/mackup/applications/smartgithg.cfg new file mode 100644 index 000000000..801d5655d --- /dev/null +++ b/mackup/applications/smartgithg.cfg @@ -0,0 +1,5 @@ +[application] +name = SmartGitHg + +[configuration_files] +Library/Preferences/SmartGit/smartgit.vmoptions From dbea09d67e09d57c8edec4beeeff41a383e8d154 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Tue, 5 Jul 2016 10:49:03 -0400 Subject: [PATCH 0624/1256] Updating Oh My Zsh config to be more specific (#841) --- mackup/applications/oh-my-zsh.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/oh-my-zsh.cfg b/mackup/applications/oh-my-zsh.cfg index 750995567..43fcf8733 100644 --- a/mackup/applications/oh-my-zsh.cfg +++ b/mackup/applications/oh-my-zsh.cfg @@ -2,4 +2,4 @@ name = Oh My Zsh [configuration_files] -.oh-my-zsh +.oh-my-zsh/custom From a25bc6dca009427c8b27614cdcbffe77112dc67e Mon Sep 17 00:00:00 2001 From: Hal Henke Date: Wed, 6 Jul 2016 00:50:14 +1000 Subject: [PATCH 0625/1256] Add application config file for Webstorm 2016.1 (#837) * Add application config file for Webstorm 2016.1 * Replace all existing Webstorm Configuration files with a single file --- CHANGELOG.md | 1 + mackup/applications/webstorm-10.cfg | 6 ------ mackup/applications/webstorm-11.cfg | 6 ------ mackup/applications/webstorm-8.cfg | 6 ------ mackup/applications/webstorm-9.cfg | 6 ------ mackup/applications/webstorm.cfg | 14 ++++++++++++++ 6 files changed, 15 insertions(+), 24 deletions(-) delete mode 100644 mackup/applications/webstorm-10.cfg delete mode 100644 mackup/applications/webstorm-11.cfg delete mode 100644 mackup/applications/webstorm-8.cfg delete mode 100644 mackup/applications/webstorm-9.cfg create mode 100644 mackup/applications/webstorm.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ff6492d7..b1cfbdd24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for WebStorm 2016.1 (via @halhenke) - Add support for Wakatime (via @joshmedeski) - Add support for Kwm (via @neon64) diff --git a/mackup/applications/webstorm-10.cfg b/mackup/applications/webstorm-10.cfg deleted file mode 100644 index e6dae177a..000000000 --- a/mackup/applications/webstorm-10.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[application] -name = WebStorm 10 - -[configuration_files] -Library/Application Support/WebStorm10 -Library/Preferences/WebStorm10 diff --git a/mackup/applications/webstorm-11.cfg b/mackup/applications/webstorm-11.cfg deleted file mode 100644 index 0b3df3e2d..000000000 --- a/mackup/applications/webstorm-11.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[application] -name = WebStorm 11 - -[configuration_files] -Library/Application Support/WebStorm11 -Library/Preferences/WebStorm11 diff --git a/mackup/applications/webstorm-8.cfg b/mackup/applications/webstorm-8.cfg deleted file mode 100644 index c03580e8f..000000000 --- a/mackup/applications/webstorm-8.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[application] -name = WebStorm 8 - -[configuration_files] -Library/Application Support/WebStorm8 -Library/Preferences/WebStorm8 diff --git a/mackup/applications/webstorm-9.cfg b/mackup/applications/webstorm-9.cfg deleted file mode 100644 index 105ebee88..000000000 --- a/mackup/applications/webstorm-9.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[application] -name = WebStorm 9 - -[configuration_files] -Library/Application Support/WebStorm9 -Library/Preferences/WebStorm9 diff --git a/mackup/applications/webstorm.cfg b/mackup/applications/webstorm.cfg new file mode 100644 index 000000000..985ef0180 --- /dev/null +++ b/mackup/applications/webstorm.cfg @@ -0,0 +1,14 @@ +[application] +name = WebStorm + +[configuration_files] +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 From 21bb39be0ca2c800573f03a46b88a271ab86d2e4 Mon Sep 17 00:00:00 2001 From: Alexander Ross Date: Wed, 20 Jul 2016 11:34:11 -0400 Subject: [PATCH 0626/1256] Adding Fantastical2 support (#846) --- mackup/applications/fantastical.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mackup/applications/fantastical.cfg b/mackup/applications/fantastical.cfg index a9bdc55b0..c942ccf16 100644 --- a/mackup/applications/fantastical.cfg +++ b/mackup/applications/fantastical.cfg @@ -2,4 +2,7 @@ name = Fantastical [configuration_files] +# Used by Fantastical 1 only. Library/Preferences/com.flexibits.fantastical.plist +# Used by Fantastical 2 only. +Library/Containers/com.flexibits.fantastical2.mac/Container.plist From 6a687912988147e34a14928856223e375d472885 Mon Sep 17 00:00:00 2001 From: Daniel Suo Date: Wed, 20 Jul 2016 11:44:48 -0400 Subject: [PATCH 0627/1256] Add support for IntelliJ IDEA 2016.2 (#847) * Update intellij for version 2016.2 * Update CHANGELOG.md * Update CHANGELOG.md --- CHANGELOG.md | 1 + mackup/applications/intellijidea.cfg | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a2f51566..f585d0324 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for IntelliJ IDEA 2016.2 (via @danielsuo) - Add support for WebStorm 2016.1 (via @halhenke) - Add support for Wakatime (via @joshmedeski) - Add support for Kwm (via @neon64) diff --git a/mackup/applications/intellijidea.cfg b/mackup/applications/intellijidea.cfg index 4fd8e845d..381fceb41 100644 --- a/mackup/applications/intellijidea.cfg +++ b/mackup/applications/intellijidea.cfg @@ -18,3 +18,5 @@ 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 From 822315431c3ac8d761f497594eac97345366ec12 Mon Sep 17 00:00:00 2001 From: bleen Date: Thu, 21 Jul 2016 12:26:32 -0400 Subject: [PATCH 0628/1256] Adding Airmail support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/airmail.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/airmail.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index f585d0324..0087910c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Add support for Wakatime (via @joshmedeski) - Add support for Kwm (via @neon64) - Add support for Surge (via @Altynai) +- Add support for Airmail (via @bleen) ## Mackup 0.8.14 diff --git a/README.md b/README.md index 8af151c57..5a69cf5ee 100644 --- a/README.md +++ b/README.md @@ -152,6 +152,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adium](https://adium.im/) - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - [Adobe Photoshop CC](http://www.adobe.com/products/photoshop.html) +- [Airmail](http://airmailapp.com/) - [Android Studio](https://developer.android.com/sdk/) - [Ansible](http://www.ansible.com/) - [AppCleaner](http://freemacsoft.net/appcleaner/) diff --git a/mackup/applications/airmail.cfg b/mackup/applications/airmail.cfg new file mode 100644 index 000000000..f34fbdf9e --- /dev/null +++ b/mackup/applications/airmail.cfg @@ -0,0 +1,5 @@ +[application] +name = Airmail + +[configuration_files] +Library/Containers/it.bloop.airmail2/Container.plist From b9bbb377771f994b08c3582ef738233f5b086767 Mon Sep 17 00:00:00 2001 From: Domenic Brosh Date: Mon, 25 Jul 2016 10:29:34 -0500 Subject: [PATCH 0629/1256] Added support for Paintbrush 2.1.2 (#850) * Added support for Paintbrush * Added support for Paintbrush 2.1.2 * Added support for Paintbrush --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/paintbrush.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/paintbrush.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index f585d0324..120e8c69a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for Paintbrush 2.1.2 (via @domenicbrosh) - Add support for IntelliJ IDEA 2016.2 (via @danielsuo) - Add support for WebStorm 2016.1 (via @halhenke) - Add support for Wakatime (via @joshmedeski) diff --git a/README.md b/README.md index 8af151c57..6f9fac0d7 100644 --- a/README.md +++ b/README.md @@ -333,6 +333,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [OmniGraffle](https://www.omnigroup.com/omnigraffle/) - [OpenEmu](http://openemu.org) - [OpenSSH](http://www.openssh.com/) (NOTE: includes private keys) +- [Paintbrush](http://paintbrush.sourceforge.net/) - [Pandoc](http://pandoc.org) - [Pass](http://www.passwordstore.org/) - [Pastebot](http://tapbots.com/software/pastebot/) diff --git a/mackup/applications/paintbrush.cfg b/mackup/applications/paintbrush.cfg new file mode 100644 index 000000000..c9483a1c8 --- /dev/null +++ b/mackup/applications/paintbrush.cfg @@ -0,0 +1,5 @@ +[application] +name = Paintbrush + +[configuration_files] +Library/Preferences/com.soggywaffles.Paintbrush.plist From be28b8c215d5e098ae30838a1b337730b024d1e9 Mon Sep 17 00:00:00 2001 From: Alexander Tipugin Date: Thu, 28 Jul 2016 19:33:27 +0300 Subject: [PATCH 0630/1256] Add support for hyperterm (#848) * Add support for hyperterm * Update CHANGELOG and README --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/hyperterm.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/hyperterm.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 120e8c69a..9f53f5e36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Add support for Wakatime (via @joshmedeski) - Add support for Kwm (via @neon64) - Add support for Surge (via @Altynai) +- Add support for HyperTerm (via @atipugin) ## Mackup 0.8.14 diff --git a/README.md b/README.md index 6f9fac0d7..deec3969c 100644 --- a/README.md +++ b/README.md @@ -259,6 +259,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Htop](http://htop.sourceforge.net/) - [HyperDock](https://bahoom.com/hyperdock) - [HyperSwitch](https://bahoom.com/hyperswitch) +- [HyperTerm](https://hyperterm.org) - [i2cssh](https://github.com/wouterdebie/i2cssh) - [i3](https://i3wm.org/) - [i3wm](http://i3wm.org/) diff --git a/mackup/applications/hyperterm.cfg b/mackup/applications/hyperterm.cfg new file mode 100644 index 000000000..7e2bd2a01 --- /dev/null +++ b/mackup/applications/hyperterm.cfg @@ -0,0 +1,5 @@ +[application] +name = HyperTerm + +[configuration_files] +.hyperterm.js From 738bec034bdb9b1ce767940d73809d91f06022a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Desv=C3=A9?= Date: Thu, 28 Jul 2016 18:38:40 +0200 Subject: [PATCH 0631/1256] Avoid backup on whole .docker folder (that could contain docker machines) (#822) --- 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 4292a64a6..d4fc84ce9 100644 --- a/mackup/applications/docker.cfg +++ b/mackup/applications/docker.cfg @@ -3,4 +3,4 @@ name = Docker [configuration_files] .dockercfg -.docker +.docker/config.json From 27533a6360272dc0c52c11015edd40a0f5bacbac Mon Sep 17 00:00:00 2001 From: Josh Medeski Date: Tue, 7 Jun 2016 13:58:46 -0500 Subject: [PATCH 0632/1256] Add support for Ctags --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/ctags.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/ctags.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f53f5e36..6d5ef710e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Add support for Kwm (via @neon64) - Add support for Surge (via @Altynai) - Add support for HyperTerm (via @atipugin) +- Add support for Ctags (via @joshmedeski) ## Mackup 0.8.14 diff --git a/README.md b/README.md index deec3969c..c6a3ecbef 100644 --- a/README.md +++ b/README.md @@ -204,6 +204,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [CopyQ](https://github.com/hluk/CopyQ) - [CoRD](http://cord.sourceforge.net/) - [CotEditor](http://coteditor.com/) +- [Ctags](http://ctags.sourceforge.net/) - [Cyberduck](https://cyberduck.io/) - [Dash](https://kapeli.com/dash) - [Day-O](http://www.shauninman.com/archive/2011/10/20/day_o_mac_menu_bar_clock) diff --git a/mackup/applications/ctags.cfg b/mackup/applications/ctags.cfg new file mode 100644 index 000000000..d2727d579 --- /dev/null +++ b/mackup/applications/ctags.cfg @@ -0,0 +1,5 @@ +[application] +name = Ctags + +[configuration_files] +.ctags From fdf09354a5818e8c58ed18c2c5e70cd8f6b3e8c6 Mon Sep 17 00:00:00 2001 From: Bennett Blodinger Date: Thu, 28 Jul 2016 21:32:16 -0400 Subject: [PATCH 0633/1256] Add FlexGet (#854) * Add FlexGet http://flexget.com/Configuration#location * Update documentation --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/flexget.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/flexget.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f53f5e36..2009f10fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Add support for Kwm (via @neon64) - Add support for Surge (via @Altynai) - Add support for HyperTerm (via @atipugin) +- Add support for FlexGet (via @benwa) ## Mackup 0.8.14 diff --git a/README.md b/README.md index deec3969c..55a9e51ab 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. - [Feeds](http://www.feedsapp.com/) - [Filezilla](https://filezilla-project.org/) - [Fish](http://ridiculousfish.com/shell/) +- [FlexGet](http://flexget.com/) - [Flux](https://justgetflux.com/) - [FontExplorer X](http://www.fontexplorerx.com/) - [ForkLift 2](http://www.binarynights.com/forklift/) diff --git a/mackup/applications/flexget.cfg b/mackup/applications/flexget.cfg new file mode 100644 index 000000000..1d8a42875 --- /dev/null +++ b/mackup/applications/flexget.cfg @@ -0,0 +1,6 @@ +[application] +name = FlexGet + +[configuration_files] +.config/flexget/config.yml +.flexget/config.yml From 3f74f82a00f1b5108ee6dc19c054bc80eab37979 Mon Sep 17 00:00:00 2001 From: zharmany Date: Wed, 3 Aug 2016 18:23:41 -0700 Subject: [PATCH 0634/1256] KeepingYouAwake Support (#856) * Added support for KeepingYouAwake, an open-source Caffeine clone: https://github.com/newmarcel/KeepingYouAwake * Updated CHANGELOG.md and README.md to add KeepingYouAwake to list of supported applications. * End keepingyouawake.cfg with a newline. --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/keepingyouawake.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/keepingyouawake.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ff894cffe..985e6f676 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Add support for HyperTerm (via @atipugin) - Add support for FlexGet (via @benwa) - Add support for Ctags (via @joshmedeski) +- Add support for KeepingYouAwake (via @zharmany) ## Mackup 0.8.14 diff --git a/README.md b/README.md index 22c6d46b6..f62808bae 100644 --- a/README.md +++ b/README.md @@ -278,6 +278,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Kaleidoscope](http://www.kaleidoscopeapp.com/) - [Karabiner](https://pqrs.org/osx/karabiner/) - [KeePassX](http://www.keepassx.org/) +- [KeepingYouAwake](https://github.com/newmarcel/KeepingYouAwake) - [Keka](http://www.kekaosx.com/en/) - [Keybase](https://keybase.io/) - [Keymo](http://manytricks.com/keymo/) diff --git a/mackup/applications/keepingyouawake.cfg b/mackup/applications/keepingyouawake.cfg new file mode 100644 index 000000000..4d0590f7e --- /dev/null +++ b/mackup/applications/keepingyouawake.cfg @@ -0,0 +1,5 @@ +[application] +name = KeepingYouAwake + +[configuration_files] +Library/Preferences/info.marcel-dierkes.KeepingYouAwake.plist From 8dc9b591966b0d73cef92da6a5815c2934b8ea7e Mon Sep 17 00:00:00 2001 From: Jamie Rolfs Date: Thu, 11 Aug 2016 15:34:34 -0700 Subject: [PATCH 0635/1256] Add support for RubyMine 2016.(1|2) (#860) --- mackup/applications/rubymine.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mackup/applications/rubymine.cfg b/mackup/applications/rubymine.cfg index 3789a0e31..239f44fe6 100644 --- a/mackup/applications/rubymine.cfg +++ b/mackup/applications/rubymine.cfg @@ -12,3 +12,7 @@ Library/Application Support/RubyMine70 Library/Preferences/RubyMine70 Library/Application Support/RubyMine80 Library/Preferences/RubyMine80 +Library/Application Support/RubyMine2016.1 +Library/Preferences/RubyMine2016.1 +Library/Application Support/RubyMine2016.2 +Library/Preferences/RubyMine2016.2 From 2cb07b0662197a669a63a162d334b57bafc4e4ac Mon Sep 17 00:00:00 2001 From: Matti Paksula Date: Mon, 15 Aug 2016 16:50:10 +0300 Subject: [PATCH 0636/1256] Add Telegram for macOS (#862) * Add support for Telegram for macOS. * Updates README.md, CHANGELOG.md --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/telegram_macos.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/telegram_macos.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 985e6f676..b1aef2257 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for Telegram for macOS (via @matti) - Add support for Paintbrush 2.1.2 (via @domenicbrosh) - Add support for IntelliJ IDEA 2016.2 (via @danielsuo) - Add support for WebStorm 2016.1 (via @halhenke) diff --git a/README.md b/README.md index f62808bae..5380da973 100644 --- a/README.md +++ b/README.md @@ -418,6 +418,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [TaskPaper](http://www.hogbaysoftware.com/products/taskpaper) - [Taskwarrior](http://taskwarrior.org/) - [Teamocil](http://remiprev.github.io/teamocil/) +- [Telegram for macOS](https://macos.telegram.org) - [Terminator](https://launchpad.net/terminator/) - [TextExpander](https://smilesoftware.com/textexpander) - [TextMate](http://macromates.com/) diff --git a/mackup/applications/telegram_macos.cfg b/mackup/applications/telegram_macos.cfg new file mode 100644 index 000000000..d210ae434 --- /dev/null +++ b/mackup/applications/telegram_macos.cfg @@ -0,0 +1,5 @@ +[application] +name = Telegram for macOS + +[configuration_files] +Library/Preferences/ru.keepcoder.Telegram.plist From 2cc980d2e8eb31a29ddc4d4f401079f80b48d17e Mon Sep 17 00:00:00 2001 From: Florin Motoc Date: Tue, 16 Aug 2016 17:30:47 +0300 Subject: [PATCH 0637/1256] Updated phpstorm.cfg to support version 2016.2 (#864) --- mackup/applications/phpstorm.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg index de876877a..31b62cec7 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/PhpStorm2016.2 +Library/Preferences/PhpStorm2016.2 Library/Application Support/PhpStorm2016.1 Library/Preferences/PhpStorm2016.1 Library/Application Support/WebIde100 From dd6f379b37648c46f0bb6faeb0193ae25a7863d9 Mon Sep 17 00:00:00 2001 From: Florin Motoc Date: Tue, 16 Aug 2016 17:31:04 +0300 Subject: [PATCH 0638/1256] Updated ngrok.cfg to support version 2 (#865) Added new config dir. --- mackup/applications/ngrok.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/ngrok.cfg b/mackup/applications/ngrok.cfg index 8ec257afb..931a054bb 100644 --- a/mackup/applications/ngrok.cfg +++ b/mackup/applications/ngrok.cfg @@ -3,3 +3,4 @@ name = ngrok [configuration_files] .ngrok +.ngrok2 From e0f3bd2e8fd558b2b434ab558e4dc19ed6d85715 Mon Sep 17 00:00:00 2001 From: Daniel Suo Date: Fri, 19 Aug 2016 10:08:03 -0400 Subject: [PATCH 0639/1256] Add support for PyCharm 2016.2 (#866) --- CHANGELOG.md | 1 + mackup/applications/pycharm.cfg | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 608e5ddc1..ac466ccc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for PyCharm 2016.2 (via @danielsuo) - Add support for Telegram for macOS (via @matti) - Add support for Paintbrush 2.1.2 (via @domenicbrosh) - Add support for IntelliJ IDEA 2016.2 (via @danielsuo) diff --git a/mackup/applications/pycharm.cfg b/mackup/applications/pycharm.cfg index 8b589b36e..25c531653 100644 --- a/mackup/applications/pycharm.cfg +++ b/mackup/applications/pycharm.cfg @@ -10,4 +10,6 @@ Library/Application Support/PyCharm50 Library/Preferences/PyCharm50 .PyCharm2016.1/config Library/Application Support/PyCharm2016.1 +Library/Application Support/PyCharm2016.2 Library/Preferences/PyCharm2016.1 +Library/Preferences/PyCharm2016.2 From 548b34c0f95179199929b501658e3bd947015080 Mon Sep 17 00:00:00 2001 From: Troy Murray Date: Mon, 29 Aug 2016 15:46:00 -0400 Subject: [PATCH 0640/1256] Add support for Wireshark 2 --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/wireshark.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/wireshark.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ac466ccc9..c66eb7956 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Add support for Ctags (via @joshmedeski) - Add support for KeepingYouAwake (via @zharmany) - Add support for Terminal (via @ryanjbonnell) +- Add support for Wireshark 2 (via @tdm00) ## Mackup 0.8.14 diff --git a/README.md b/README.md index 2250168d8..f3b3bed97 100644 --- a/README.md +++ b/README.md @@ -448,6 +448,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Wakatime](https://wakatime.com/) - [WebStorm](https://www.jetbrains.com/webstorm/) - [Wget](https://www.gnu.org/software/wget/) +- [Wireshark 2](https://www.wireshark.org) - [Witch](http://manytricks.com/witch/) - [WordPress WP-CLI](http://wp-cli.org/) - [Workrave](http://www.workrave.org/) diff --git a/mackup/applications/wireshark.cfg b/mackup/applications/wireshark.cfg new file mode 100644 index 000000000..fa8fb1479 --- /dev/null +++ b/mackup/applications/wireshark.cfg @@ -0,0 +1,5 @@ +[application] +name = Wireshark 2 + +[configuration_files] +.config/wireshark From 0bc8c183a8e70104f5e00941c3d376d9fe3866c1 Mon Sep 17 00:00:00 2001 From: Ian Copp Date: Fri, 9 Sep 2016 11:36:17 -0700 Subject: [PATCH 0641/1256] Add Ancient Domains of Mystery --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/ancient-domains-of-mystery.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/ancient-domains-of-mystery.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ac466ccc9..53d830619 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Add support for Ctags (via @joshmedeski) - Add support for KeepingYouAwake (via @zharmany) - Add support for Terminal (via @ryanjbonnell) +- Add support for Ancient Domains of Mystery (via @icopp) ## Mackup 0.8.14 diff --git a/README.md b/README.md index 2250168d8..198075397 100644 --- a/README.md +++ b/README.md @@ -152,6 +152,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adium](https://adium.im/) - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - [Adobe Photoshop CC](http://www.adobe.com/products/photoshop.html) +- [Ancient Domains of Mystery](http://www.adom.de/home/index.html) - [Android Studio](https://developer.android.com/sdk/) - [Ansible](http://www.ansible.com/) - [AppCleaner](http://freemacsoft.net/appcleaner/) diff --git a/mackup/applications/ancient-domains-of-mystery.cfg b/mackup/applications/ancient-domains-of-mystery.cfg new file mode 100644 index 000000000..16be5149c --- /dev/null +++ b/mackup/applications/ancient-domains-of-mystery.cfg @@ -0,0 +1,5 @@ +[application] +name = Ancient Domains of Mystery + +[configuration_files] +.adom.data From 5d5b9b9407d4f16678207f3e469e1ee2426e3328 Mon Sep 17 00:00:00 2001 From: Ian Copp Date: Fri, 9 Sep 2016 11:40:38 -0700 Subject: [PATCH 0642/1256] Add Atlantis --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/atlantis.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/atlantis.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ac466ccc9..6359f041a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Add support for Ctags (via @joshmedeski) - Add support for KeepingYouAwake (via @zharmany) - Add support for Terminal (via @ryanjbonnell) +- Add support for Atlantis (via @icopp) ## Mackup 0.8.14 diff --git a/README.md b/README.md index 2250168d8..d37f215e1 100644 --- a/README.md +++ b/README.md @@ -162,6 +162,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Artistic Style](http://astyle.sourceforge.net) - [asciinema](https://asciinema.org/) - [Aspell](http://aspell.net/) +- [Atlantis](http://www.riverdark.net/atlantis/) - [Atom](https://atom.io/) - [Audacious](http://audacious-media-player.org/) - [AusKey](https://abr.gov.au/AUSkey/) diff --git a/mackup/applications/atlantis.cfg b/mackup/applications/atlantis.cfg new file mode 100644 index 000000000..7203f1aa4 --- /dev/null +++ b/mackup/applications/atlantis.cfg @@ -0,0 +1,5 @@ +[application] +name = Atlantis + +[configuration_files] +Library/Application Support/Atlantis From 46964c35eb6ac7aeb6b15f74e9e12cb2107ae9ef Mon Sep 17 00:00:00 2001 From: Ian Copp Date: Fri, 9 Sep 2016 11:53:37 -0700 Subject: [PATCH 0643/1256] Add Environmental Station Alpha --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/environmental-station-alpha.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/environmental-station-alpha.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ac466ccc9..6f5f45e2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Add support for Ctags (via @joshmedeski) - Add support for KeepingYouAwake (via @zharmany) - Add support for Terminal (via @ryanjbonnell) +- Add support for Environmental Station Alpha (via @icopp) ## Mackup 0.8.14 diff --git a/README.md b/README.md index 2250168d8..fe2b50eb2 100644 --- a/README.md +++ b/README.md @@ -224,6 +224,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Electrum](https://electrum.org/#home) - [Emacs](http://www.gnu.org/software/emacs/) - [Enjoyable](https://yukkurigames.com/enjoyable/) +- [Environmental Station Alpha](http://www.hempuli.com/esa/) - [Exercism](http://exercism.io/) - [ExpanDrive](http://www.expandrive.com/) - [Fantastical](http://flexibits.com/fantastical) diff --git a/mackup/applications/environmental-station-alpha.cfg b/mackup/applications/environmental-station-alpha.cfg new file mode 100644 index 000000000..8c3d9f583 --- /dev/null +++ b/mackup/applications/environmental-station-alpha.cfg @@ -0,0 +1,5 @@ +[application] +name = Environmental Station Alpha + +[configuration_files] +Library/Application Support/MMFApplications From d1f56a300401261740f43a2da5b5301859c9e572 Mon Sep 17 00:00:00 2001 From: Ian Copp Date: Fri, 9 Sep 2016 11:56:36 -0700 Subject: [PATCH 0644/1256] Add Factorio --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/factorio.cfg | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 mackup/applications/factorio.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ac466ccc9..abb2b720b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Add support for Ctags (via @joshmedeski) - Add support for KeepingYouAwake (via @zharmany) - Add support for Terminal (via @ryanjbonnell) +- Add support for Factorio (via @icopp) ## Mackup 0.8.14 diff --git a/README.md b/README.md index 2250168d8..d453ea5c8 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. - [Enjoyable](https://yukkurigames.com/enjoyable/) - [Exercism](http://exercism.io/) - [ExpanDrive](http://www.expandrive.com/) +- [Factorio](https://www.factorio.com) - [Fantastical](http://flexibits.com/fantastical) - [fasd](https://github.com/clvv/fasd) - [Feeds](http://www.feedsapp.com/) diff --git a/mackup/applications/factorio.cfg b/mackup/applications/factorio.cfg new file mode 100644 index 000000000..14536bcb2 --- /dev/null +++ b/mackup/applications/factorio.cfg @@ -0,0 +1,8 @@ +[application] +name = Factorio + +[configuration_files] +Library/Application Support/factorio/config +Library/Application Support/factorio/mods +Library/Application Support/factorio/saves +Library/Application Support/factorio/player-data.json From c4d5532a0346b04991ebd2a4833b1b630a5787c4 Mon Sep 17 00:00:00 2001 From: Ian Copp Date: Fri, 9 Sep 2016 12:08:17 -0700 Subject: [PATCH 0645/1256] Add Forge --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/forge.cfg | 10 ++++++++++ 3 files changed, 12 insertions(+) create mode 100644 mackup/applications/forge.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ac466ccc9..ff6e71581 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Add support for Ctags (via @joshmedeski) - Add support for KeepingYouAwake (via @zharmany) - Add support for Terminal (via @ryanjbonnell) +- Add support for Forge (via @icopp) ## Mackup 0.8.14 diff --git a/README.md b/README.md index 2250168d8..be75bc9df 100644 --- a/README.md +++ b/README.md @@ -234,6 +234,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [FlexGet](http://flexget.com/) - [Flux](https://justgetflux.com/) - [FontExplorer X](http://www.fontexplorerx.com/) +- [Forge](http://www.slightlymagic.net/wiki/Forge) - [ForkLift 2](http://www.binarynights.com/forklift/) - [Gas Mask](https://github.com/2ndalpha/gasmask/) - [gdb](https://www.gnu.org/software/gdb/) diff --git a/mackup/applications/forge.cfg b/mackup/applications/forge.cfg new file mode 100644 index 000000000..030dd8e77 --- /dev/null +++ b/mackup/applications/forge.cfg @@ -0,0 +1,10 @@ +[application] +name = Forge + +[configuration_files] +Library/Application Support/Forge/achievements +Library/Application Support/Forge/decks +Library/Application Support/Forge/games +Library/Application Support/Forge/gauntlet +Library/Application Support/Forge/preferences +Library/Application Support/Forge/quest From faaf7ed5dbafe8e0660022b18fb2e73bef102e94 Mon Sep 17 00:00:00 2001 From: Ian Copp Date: Fri, 9 Sep 2016 12:14:59 -0700 Subject: [PATCH 0646/1256] Add Homebridge --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/homebridge.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/homebridge.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ac466ccc9..c893f822e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Add support for Ctags (via @joshmedeski) - Add support for KeepingYouAwake (via @zharmany) - Add support for Terminal (via @ryanjbonnell) +- Add support for Homebridge (via @icopp) ## Mackup 0.8.14 diff --git a/README.md b/README.md index 2250168d8..91780cd93 100644 --- a/README.md +++ b/README.md @@ -257,6 +257,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/) +- [Homebridge](https://github.com/nfarina/homebridge) - [Houdini](http://uglyapps.co.uk/houdini/) - [Htop](http://htop.sourceforge.net/) - [HyperDock](https://bahoom.com/hyperdock) diff --git a/mackup/applications/homebridge.cfg b/mackup/applications/homebridge.cfg new file mode 100644 index 000000000..f6df69097 --- /dev/null +++ b/mackup/applications/homebridge.cfg @@ -0,0 +1,5 @@ +[application] +name = Homebridge + +[configuration_files] +.homebridge From 94466fcae288d6857853b7aa476913a8a54a21f3 Mon Sep 17 00:00:00 2001 From: Ian Copp Date: Fri, 9 Sep 2016 12:18:54 -0700 Subject: [PATCH 0647/1256] Add Luftrausers --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/luftrausers.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/luftrausers.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ac466ccc9..063fd325f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Add support for Ctags (via @joshmedeski) - Add support for KeepingYouAwake (via @zharmany) - Add support for Terminal (via @ryanjbonnell) +- Add support for Luftrausers (via @icopp) ## Mackup 0.8.14 diff --git a/README.md b/README.md index 2250168d8..cc7666624 100644 --- a/README.md +++ b/README.md @@ -292,6 +292,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/) +- [Luftrausers](http://luftrausers.com) - [MacDive](http://www.mac-dive.com/) - [MacDown](http://macdown.uranusjr.com/) - [MacOSX](http://www.apple.com/osx/) diff --git a/mackup/applications/luftrausers.cfg b/mackup/applications/luftrausers.cfg new file mode 100644 index 000000000..ff1ce6b40 --- /dev/null +++ b/mackup/applications/luftrausers.cfg @@ -0,0 +1,5 @@ +[application] +name = Luftrausers + +[configuration_files] +.LUFTRAUSERS From 3e78f5d03ae137da409851a598b8a0c1ca8f0d3c Mon Sep 17 00:00:00 2001 From: Ian Copp Date: Fri, 9 Sep 2016 12:21:48 -0700 Subject: [PATCH 0648/1256] Add Nethack --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/nethack.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/nethack.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ac466ccc9..a38ca41ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Add support for Ctags (via @joshmedeski) - Add support for KeepingYouAwake (via @zharmany) - Add support for Terminal (via @ryanjbonnell) +- Add support for Nethack (via @icopp) ## Mackup 0.8.14 diff --git a/README.md b/README.md index 2250168d8..9b9b98d2d 100644 --- a/README.md +++ b/README.md @@ -325,6 +325,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Navicat](http://navicat.com/) - [ncmpcpp](http://rybczak.net/ncmpcpp/) - [neovim](https://github.com/neovim/neovim) +- [Nethack](http://www.nethack.org) - [newsbeuter](http://newsbeuter.org/) - [ngrok](https://ngrok.com/) - [Nomacs](http://nomacs.org/) diff --git a/mackup/applications/nethack.cfg b/mackup/applications/nethack.cfg new file mode 100644 index 000000000..8b5fe577f --- /dev/null +++ b/mackup/applications/nethack.cfg @@ -0,0 +1,5 @@ +[application] +name = Nethack + +[configuration_files] +.nethackrc From c9c5f0b67b43806cf337c996f01840b68bb3fcad Mon Sep 17 00:00:00 2001 From: Ian Copp Date: Fri, 9 Sep 2016 12:27:40 -0700 Subject: [PATCH 0649/1256] Just sync the folder instead of subitems --- mackup/applications/forge.cfg | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mackup/applications/forge.cfg b/mackup/applications/forge.cfg index 030dd8e77..ef88e4fef 100644 --- a/mackup/applications/forge.cfg +++ b/mackup/applications/forge.cfg @@ -2,9 +2,4 @@ name = Forge [configuration_files] -Library/Application Support/Forge/achievements -Library/Application Support/Forge/decks -Library/Application Support/Forge/games -Library/Application Support/Forge/gauntlet -Library/Application Support/Forge/preferences -Library/Application Support/Forge/quest +Library/Application Support/Forge From c458d2ca16998f11a78953921192798c65216e83 Mon Sep 17 00:00:00 2001 From: dpgowan Date: Mon, 26 Sep 2016 23:44:21 -0400 Subject: [PATCH 0650/1256] Add Support for Adobe Photoshop Lightroom CC --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/Lightroom.cfg | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 mackup/applications/Lightroom.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ac466ccc9..a632cbcbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Add support for Ctags (via @joshmedeski) - Add support for KeepingYouAwake (via @zharmany) - Add support for Terminal (via @ryanjbonnell) +- Add Support for Adobe Photoshop Lightroom CC (via @dpgowan) ## Mackup 0.8.14 diff --git a/README.md b/README.md index 2250168d8..21c0f293f 100644 --- a/README.md +++ b/README.md @@ -152,6 +152,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adium](https://adium.im/) - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - [Adobe Photoshop CC](http://www.adobe.com/products/photoshop.html) +- [Adobe Photoshop Lightroom CC](https://www.adobe.com/products/photoshop-lightroom.html) - [Android Studio](https://developer.android.com/sdk/) - [Ansible](http://www.ansible.com/) - [AppCleaner](http://freemacsoft.net/appcleaner/) diff --git a/mackup/applications/Lightroom.cfg b/mackup/applications/Lightroom.cfg new file mode 100644 index 000000000..e1b5cc065 --- /dev/null +++ b/mackup/applications/Lightroom.cfg @@ -0,0 +1,8 @@ +[application] +name = Adobe Lightroom + +[configuration_files] +Library/Application Support/Adobe/Lightroom +Library/Preferences/com.adobe.Lightroom4.plist +Library/Preferences/com.adobe.Lightroom5.plist +Library/Preferences/com.adobe.Lightroom6.plist From 2e547d371048e2b6024b26017ddcdfafc9a31f67 Mon Sep 17 00:00:00 2001 From: Drew Parrish Gowan Date: Mon, 26 Sep 2016 23:50:38 -0400 Subject: [PATCH 0651/1256] Revert "Add Support for Adobe Photoshop Lightroom CC" This reverts commit c458d2ca16998f11a78953921192798c65216e83. --- CHANGELOG.md | 1 - README.md | 1 - mackup/applications/Lightroom.cfg | 8 -------- 3 files changed, 10 deletions(-) delete mode 100644 mackup/applications/Lightroom.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index a632cbcbd..ac466ccc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,6 @@ - Add support for Ctags (via @joshmedeski) - Add support for KeepingYouAwake (via @zharmany) - Add support for Terminal (via @ryanjbonnell) -- Add Support for Adobe Photoshop Lightroom CC (via @dpgowan) ## Mackup 0.8.14 diff --git a/README.md b/README.md index 21c0f293f..2250168d8 100644 --- a/README.md +++ b/README.md @@ -152,7 +152,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adium](https://adium.im/) - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - [Adobe Photoshop CC](http://www.adobe.com/products/photoshop.html) -- [Adobe Photoshop Lightroom CC](https://www.adobe.com/products/photoshop-lightroom.html) - [Android Studio](https://developer.android.com/sdk/) - [Ansible](http://www.ansible.com/) - [AppCleaner](http://freemacsoft.net/appcleaner/) diff --git a/mackup/applications/Lightroom.cfg b/mackup/applications/Lightroom.cfg deleted file mode 100644 index e1b5cc065..000000000 --- a/mackup/applications/Lightroom.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[application] -name = Adobe Lightroom - -[configuration_files] -Library/Application Support/Adobe/Lightroom -Library/Preferences/com.adobe.Lightroom4.plist -Library/Preferences/com.adobe.Lightroom5.plist -Library/Preferences/com.adobe.Lightroom6.plist From b3109a1533c2ea6afed105764f12487fae920013 Mon Sep 17 00:00:00 2001 From: Drew Parrish Gowan Date: Tue, 27 Sep 2016 00:02:52 -0400 Subject: [PATCH 0652/1256] Add Support for Adobe Photoshop Lightroom CC --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/lightroom.cfg | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 mackup/applications/lightroom.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ac466ccc9..04ee70ba8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Add support for Ctags (via @joshmedeski) - Add support for KeepingYouAwake (via @zharmany) - Add support for Terminal (via @ryanjbonnell) +- Add support for Adobe Lightroom CC (via @dpgowan) ## Mackup 0.8.14 diff --git a/README.md b/README.md index 2250168d8..21c0f293f 100644 --- a/README.md +++ b/README.md @@ -152,6 +152,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adium](https://adium.im/) - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - [Adobe Photoshop CC](http://www.adobe.com/products/photoshop.html) +- [Adobe Photoshop Lightroom CC](https://www.adobe.com/products/photoshop-lightroom.html) - [Android Studio](https://developer.android.com/sdk/) - [Ansible](http://www.ansible.com/) - [AppCleaner](http://freemacsoft.net/appcleaner/) diff --git a/mackup/applications/lightroom.cfg b/mackup/applications/lightroom.cfg new file mode 100644 index 000000000..e1b5cc065 --- /dev/null +++ b/mackup/applications/lightroom.cfg @@ -0,0 +1,8 @@ +[application] +name = Adobe Lightroom + +[configuration_files] +Library/Application Support/Adobe/Lightroom +Library/Preferences/com.adobe.Lightroom4.plist +Library/Preferences/com.adobe.Lightroom5.plist +Library/Preferences/com.adobe.Lightroom6.plist From 780c1abe16f9ac368b5a34481179af2e08e91c15 Mon Sep 17 00:00:00 2001 From: Drew Parrish Gowan Date: Tue, 27 Sep 2016 00:19:43 -0400 Subject: [PATCH 0653/1256] Add Support for Adobe Illustrator CC --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/illustrator.cfg | 13 +++++++++++++ 3 files changed, 15 insertions(+) create mode 100644 mackup/applications/illustrator.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 04ee70ba8..08c83f727 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Add support for KeepingYouAwake (via @zharmany) - Add support for Terminal (via @ryanjbonnell) - Add support for Adobe Lightroom CC (via @dpgowan) +- Add Support for Adobe Illustrator CC (via @dpgowan) ## Mackup 0.8.14 diff --git a/README.md b/README.md index 21c0f293f..2fb411c08 100644 --- a/README.md +++ b/README.md @@ -151,6 +151,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Ack](http://beyondgrep.com/) - [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) - [Adobe Photoshop CC](http://www.adobe.com/products/photoshop.html) - [Adobe Photoshop Lightroom CC](https://www.adobe.com/products/photoshop-lightroom.html) - [Android Studio](https://developer.android.com/sdk/) diff --git a/mackup/applications/illustrator.cfg b/mackup/applications/illustrator.cfg new file mode 100644 index 000000000..a15cbbc85 --- /dev/null +++ b/mackup/applications/illustrator.cfg @@ -0,0 +1,13 @@ +[application] +name = Adobe Illustrator + +[configuration_files] +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/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 From 3f240c52c5993eacd851f7ade2bce6f385d81800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Mart=C3=ADn?= Date: Mon, 3 Oct 2016 15:37:00 +0200 Subject: [PATCH 0654/1256] Added goshare support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/goshare.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/goshare.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 14e594016..6177f3001 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Add support for PyCharm 5, Linux support (via @doubleloop) - added support for pycharm 6.1 (@doubleloop) - Added support for Drush (@penance316) +- Added support for GoShare (@fmartingr) ## Mackup 0.8.13 diff --git a/README.md b/README.md index ac79abe66..f6e0e0332 100644 --- a/README.md +++ b/README.md @@ -246,6 +246,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/) (NOTE: includes private keys) - [Go2Shell](http://zipzapmac.com/Go2Shell) +- [GoShare](https://github.com/dictget/goshare) - [Gradle](http://gradle.org) - [GrandTotal 3](http://www.mediaatelier.com/GrandTotal4/) - [Hammerspoon](http://www.hammerspoon.org/) diff --git a/mackup/applications/goshare.cfg b/mackup/applications/goshare.cfg new file mode 100644 index 000000000..31db0a055 --- /dev/null +++ b/mackup/applications/goshare.cfg @@ -0,0 +1,5 @@ +[application] +name = GoShare + +[configuration_files] +.config/dictget/goshare From 813b03628f15baa624ef033a3bf4680cf4b15831 Mon Sep 17 00:00:00 2001 From: Julian Norton Date: Thu, 6 Oct 2016 15:49:41 -0400 Subject: [PATCH 0655/1256] HyperTerm has rebranded to HyperApp --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2250168d8..eba5ca97b 100644 --- a/README.md +++ b/README.md @@ -261,7 +261,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Htop](http://htop.sourceforge.net/) - [HyperDock](https://bahoom.com/hyperdock) - [HyperSwitch](https://bahoom.com/hyperswitch) -- [HyperTerm](https://hyperterm.org) +- [HyperApp](https://hyper.is/) - [i2cssh](https://github.com/wouterdebie/i2cssh) - [i3](https://i3wm.org/) - [i3wm](http://i3wm.org/) From a99a234d5bdeaf60a3adfb2b4e4392f86f19a68a Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 8 Oct 2016 08:50:19 +0300 Subject: [PATCH 0656/1256] Add path to WebStorm2016.2 setings --- mackup/applications/webstorm.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/webstorm.cfg b/mackup/applications/webstorm.cfg index 985ef0180..d5f7dd552 100644 --- a/mackup/applications/webstorm.cfg +++ b/mackup/applications/webstorm.cfg @@ -12,3 +12,4 @@ Library/Application Support/WebStorm11 Library/Preferences/WebStorm11 Library/Application Support/WebStorm2016.1 Library/Preferences/WebStorm2016.1 +Library/Preferences/WebStorm2016.2 From 36d3c8fb07fc7241da24b10db5027a232a68c898 Mon Sep 17 00:00:00 2001 From: Adolfo Jayme-Barrientos Date: Mon, 10 Oct 2016 02:07:08 -0500 Subject: [PATCH 0657/1256] README: Tiny grammar fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2250168d8..a8acaed1f 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ pip install mackup mackup backup ``` -You're all set and constantly backuped from now on. +You're all set and constantly backed up from now on. Next, on any new workstation, do: From bf0fe0de689d3bbd9f6436203885704c9ce053e9 Mon Sep 17 00:00:00 2001 From: Danny Amey Date: Sat, 21 May 2016 14:31:16 +0100 Subject: [PATCH 0658/1256] Add Visual Studio Code - Insiders support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/vscode-insiders.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/vscode-insiders.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ac466ccc9..026e67212 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Add support for Ctags (via @joshmedeski) - Add support for KeepingYouAwake (via @zharmany) - Add support for Terminal (via @ryanjbonnell) +- Add support for Visual Studio Code - Insiders (via @dannyamey) ## Mackup 0.8.14 diff --git a/README.md b/README.md index a8acaed1f..05b9560e1 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. - [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) - [VLC](http://www.videolan.org/) - [Wakatime](https://wakatime.com/) - [WebStorm](https://www.jetbrains.com/webstorm/) diff --git a/mackup/applications/vscode-insiders.cfg b/mackup/applications/vscode-insiders.cfg new file mode 100644 index 000000000..7bdc5f0e4 --- /dev/null +++ b/mackup/applications/vscode-insiders.cfg @@ -0,0 +1,5 @@ +[application] +name = Visual Studio Code - Insiders + +[configuration_files] +Library/Application Support/Code - Insiders/User From 829b95bc7289eaa36f204b6bf28371b1e4a6fa0b Mon Sep 17 00:00:00 2001 From: Sankichi Date: Tue, 18 Oct 2016 14:18:04 +0900 Subject: [PATCH 0659/1256] Add support for Jupyter --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/jupyter.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/jupyter.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ac466ccc9..06e86bcaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for Jupyter (via @sankichi92) - Add support for PyCharm 2016.2 (via @danielsuo) - Add support for Telegram for macOS (via @matti) - Add support for Paintbrush 2.1.2 (via @domenicbrosh) diff --git a/README.md b/README.md index a8acaed1f..60bda708b 100644 --- a/README.md +++ b/README.md @@ -275,6 +275,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [JSHint](http://jshint.com/) - [Julia](http://julialang.org) - [Jumpcut](http://jumpcut.sourceforge.net/) +- [Jupyter](http://jupyter.org/) - [Kaleidoscope](http://www.kaleidoscopeapp.com/) - [Karabiner](https://pqrs.org/osx/karabiner/) - [KeePassX](http://www.keepassx.org/) diff --git a/mackup/applications/jupyter.cfg b/mackup/applications/jupyter.cfg new file mode 100644 index 000000000..291dff8dc --- /dev/null +++ b/mackup/applications/jupyter.cfg @@ -0,0 +1,5 @@ +[application] +name = Jupyter + +[configuration_files] +.jupyter From 780c5325d2c0a05565daa315acbc27a2bcc93c9c Mon Sep 17 00:00:00 2001 From: Robert Orzanna Date: Sat, 29 Oct 2016 10:52:57 +0200 Subject: [PATCH 0660/1256] Devil's Pie https://en.wikipedia.org/wiki/Devil's_Pie_(software) --- mackup/applications/devilspie.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/devilspie.cfg diff --git a/mackup/applications/devilspie.cfg b/mackup/applications/devilspie.cfg new file mode 100644 index 000000000..8114555f2 --- /dev/null +++ b/mackup/applications/devilspie.cfg @@ -0,0 +1,6 @@ +[application] +name = Devil's Pie + +[configuration_files] + +.devilspie From 6f9fc96ca2e8b9e42561dd339cdcf1ab667485bf Mon Sep 17 00:00:00 2001 From: Robert Orzanna Date: Sat, 29 Oct 2016 10:54:15 +0200 Subject: [PATCH 0661/1256] Devil's Pie https://en.wikipedia.org/wiki/Devil's_Pie_(software) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a8acaed1f..9e4d548f6 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. - [DbVisualizer](https://www.dbvis.com/) - [Deal Alert](http://dealalertapp.com/) - [Default Folder X](http://www.stclairsoft.com/DefaultFolderX/) +- [Devil's Pie](https://en.wikipedia.org/wiki/Devil's_Pie_(software)) - [dig](http://en.wikipedia.org/wiki/Dig_(command)) - [Divvy](http://mizage.com/divvy/) - [Docker](https://www.docker.com/) From bde3ae8a7289a5713c4ece86ee5c5ce226fa19df Mon Sep 17 00:00:00 2001 From: Riccardo Bartoli Date: Sun, 20 Nov 2016 05:26:02 +0000 Subject: [PATCH 0662/1256] Remove trailing slash from kwm.cfg (#914) --- mackup/applications/kwm.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/kwm.cfg b/mackup/applications/kwm.cfg index 64364fab1..952af72b9 100644 --- a/mackup/applications/kwm.cfg +++ b/mackup/applications/kwm.cfg @@ -2,4 +2,4 @@ name = Kwm [configuration_files] -.kwm/ +.kwm From 96297acebe5996a7bd4f262d3434f898a95ef72b Mon Sep 17 00:00:00 2001 From: Riccardo Bartoli Date: Tue, 22 Nov 2016 08:42:38 +0000 Subject: [PATCH 0663/1256] Rename HyperTerm to Hyper (#916) --- README.md | 2 +- mackup/applications/{hyperterm.cfg => hyper.cfg} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename mackup/applications/{hyperterm.cfg => hyper.cfg} (54%) diff --git a/README.md b/README.md index a8acaed1f..fb7804614 100644 --- a/README.md +++ b/README.md @@ -261,7 +261,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Htop](http://htop.sourceforge.net/) - [HyperDock](https://bahoom.com/hyperdock) - [HyperSwitch](https://bahoom.com/hyperswitch) -- [HyperTerm](https://hyperterm.org) +- [Hyper](https://hyper.is) - [i2cssh](https://github.com/wouterdebie/i2cssh) - [i3](https://i3wm.org/) - [i3wm](http://i3wm.org/) diff --git a/mackup/applications/hyperterm.cfg b/mackup/applications/hyper.cfg similarity index 54% rename from mackup/applications/hyperterm.cfg rename to mackup/applications/hyper.cfg index 7e2bd2a01..48a048086 100644 --- a/mackup/applications/hyperterm.cfg +++ b/mackup/applications/hyper.cfg @@ -1,5 +1,5 @@ [application] -name = HyperTerm +name = Hyper [configuration_files] -.hyperterm.js +.hyper.js From 066a34d5704c65ac487e43a5cb140d9a41af0cfc Mon Sep 17 00:00:00 2001 From: Florin Motoc Date: Tue, 22 Nov 2016 10:44:20 +0200 Subject: [PATCH 0664/1256] Updated phpstorm.cfg to support version 2016.3 (#911) --- mackup/applications/phpstorm.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg index 31b62cec7..efa6e30d1 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/PhpStorm2016.3 +Library/Preferences/PhpStorm2016.3 Library/Application Support/PhpStorm2016.2 Library/Preferences/PhpStorm2016.2 Library/Application Support/PhpStorm2016.1 From e96189709a968a5794f83a366854b00562a81998 Mon Sep 17 00:00:00 2001 From: Robert Orzanna Date: Tue, 22 Nov 2016 09:47:29 +0100 Subject: [PATCH 0665/1256] Added support for Devilspie2 (#907) * Added Devilspie2 * Added Devilspie2 * point to the homepage --- README.md | 1 + mackup/applications/devilspie2.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/devilspie2.cfg diff --git a/README.md b/README.md index fb7804614..bb303f0b4 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. - [DbVisualizer](https://www.dbvis.com/) - [Deal Alert](http://dealalertapp.com/) - [Default Folder X](http://www.stclairsoft.com/DefaultFolderX/) +- [Devilspie2](http://www.gusnan.se/devilspie2/) - [dig](http://en.wikipedia.org/wiki/Dig_(command)) - [Divvy](http://mizage.com/divvy/) - [Docker](https://www.docker.com/) diff --git a/mackup/applications/devilspie2.cfg b/mackup/applications/devilspie2.cfg new file mode 100644 index 000000000..5d2484f44 --- /dev/null +++ b/mackup/applications/devilspie2.cfg @@ -0,0 +1,5 @@ +[application] +name = Devilspie2 + +[configuration_files] +.config/devilspie2 From a695ac98deef8ec318465b172ab561da82c64015 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 22 Nov 2016 00:56:42 -0800 Subject: [PATCH 0666/1256] remove extra newline --- mackup/applications/keepassx.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/mackup/applications/keepassx.cfg b/mackup/applications/keepassx.cfg index dd795bf10..387be3e0b 100644 --- a/mackup/applications/keepassx.cfg +++ b/mackup/applications/keepassx.cfg @@ -6,4 +6,3 @@ name = KeePassX .config/keepassx/keepassx2.ini Library/Preferences/org.keepassx.keepassx.plist Library/Application Support/keepassx/keepassx2.ini - From aa64166041fde3f69906898daf26307963bc9d0a Mon Sep 17 00:00:00 2001 From: Robert Orzanna Date: Tue, 22 Nov 2016 10:04:46 +0100 Subject: [PATCH 0667/1256] Update README.md to provide information on upgrade with PIP (#829) * Update README.md * Update README.md * Update README.md * Update README.md --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 01badcdf3..4f782e12a 100644 --- a/README.md +++ b/README.md @@ -35,11 +35,15 @@ 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 OS X, 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. +> If this is the case, it will be upgraded to the latest version. ```bash # Install Mackup with PIP -pip install mackup +pip install --upgrade mackup # Launch it and back up your files mackup backup From 70bf9455f36720c40805d31c9954813dce2d0e09 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Tue, 22 Nov 2016 04:07:26 -0500 Subject: [PATCH 0668/1256] Updating support for FileZilla (#833) --- README.md | 2 +- mackup/applications/filezilla.cfg | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 679751570..a8850157a 100644 --- a/README.md +++ b/README.md @@ -234,7 +234,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) - [Feeds](http://www.feedsapp.com/) -- [Filezilla](https://filezilla-project.org/) +- [FileZilla](https://filezilla-project.org/) - [Fish](http://ridiculousfish.com/shell/) - [Fisherman](http://fisherman.sh/) - [FlexGet](http://flexget.com/) diff --git a/mackup/applications/filezilla.cfg b/mackup/applications/filezilla.cfg index e267bf0b9..8f90024cd 100644 --- a/mackup/applications/filezilla.cfg +++ b/mackup/applications/filezilla.cfg @@ -1,5 +1,8 @@ [application] -name = Filezilla +name = FileZilla [configuration_files] +.config/filezilla/filezilla.xml +.config/filezilla/layout.xml +.config/filezilla/sitemanager.xml .filezilla From 69de5bf9304ce3f6dbef2a8a803df70da6baa4dd Mon Sep 17 00:00:00 2001 From: jaredsampson Date: Tue, 22 Nov 2016 04:27:54 -0500 Subject: [PATCH 0669/1256] Fix typo and pronoun. (#884) --- doc/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README.md b/doc/README.md index a9732c1e5..5662c0a75 100644 --- a/doc/README.md +++ b/doc/README.md @@ -67,7 +67,7 @@ engine = copy If you want to specify another directory, you can use the `file_system` engine and Mackup won't try to detect any path for you: it will store your files where -you explicitely told him to, using the `path` setting. +you explicitly told it to, using the `path` setting. The `path` can be absolute (from the `/` of your drive) or relative to your home directory. The `path` setting is mandatory when using the `file_system` engine. From 39f91996ff98b9428a15ebf32f6a2b3d222c283d Mon Sep 17 00:00:00 2001 From: octa Date: Tue, 22 Nov 2016 10:30:01 +0100 Subject: [PATCH 0670/1256] Update keepassx.cfg (#885) From d5a2f17c715cda993ae4fbad59275d9701d53e41 Mon Sep 17 00:00:00 2001 From: Drew Parrish Gowan Date: Tue, 22 Nov 2016 04:32:52 -0500 Subject: [PATCH 0671/1256] Add Support for Adobe Photoshop CC 2015.5 (#887) --- mackup/applications/photoshop.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/photoshop.cfg b/mackup/applications/photoshop.cfg index 978e3690c..e596e10f7 100644 --- a/mackup/applications/photoshop.cfg +++ b/mackup/applications/photoshop.cfg @@ -5,7 +5,9 @@ name = Adobe Photoshop 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/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/com.adobe.Photoshop.plist From b2c0f20f74e9c72dd86e6d232610ac30afca978a Mon Sep 17 00:00:00 2001 From: Drew Parrish Gowan Date: Tue, 22 Nov 2016 04:36:32 -0500 Subject: [PATCH 0672/1256] Rename colorschemer-studio-2.cnf to colorschemer-studio-2.cfg (#888) --- .../{colorschemer-studio-2.cnf => colorschemer-studio-2.cfg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mackup/applications/{colorschemer-studio-2.cnf => colorschemer-studio-2.cfg} (100%) diff --git a/mackup/applications/colorschemer-studio-2.cnf b/mackup/applications/colorschemer-studio-2.cfg similarity index 100% rename from mackup/applications/colorschemer-studio-2.cnf rename to mackup/applications/colorschemer-studio-2.cfg From 4653f37d7db915ad170448864ee8931ca175ca26 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 22 Nov 2016 01:42:07 -0800 Subject: [PATCH 0673/1256] Add more version of webstorm --- mackup/applications/webstorm.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mackup/applications/webstorm.cfg b/mackup/applications/webstorm.cfg index d5f7dd552..f2991dd5e 100644 --- a/mackup/applications/webstorm.cfg +++ b/mackup/applications/webstorm.cfg @@ -12,4 +12,7 @@ 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 From 64b9786888d6b69a6f058076862e109897dec9b3 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Tue, 22 Nov 2016 17:44:32 +0800 Subject: [PATCH 0674/1256] Fix with including TextMate bundles path. (#897) Because in Bundles path, it may be have a lot of custom changes. For example: Snippets, KeyMap changes. --- mackup/applications/textmate.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/textmate.cfg b/mackup/applications/textmate.cfg index 5176b0d63..ec46554c6 100644 --- a/mackup/applications/textmate.cfg +++ b/mackup/applications/textmate.cfg @@ -2,5 +2,6 @@ name = TextMate [configuration_files] +Library/Application Support/TextMate/Managed/Bundles Library/Preferences/com.macromates.textmate.plist Library/Preferences/com.macromates.textmate.latex_config.plist From 37b4e0750aeb227c433d4153986311cab570d4b1 Mon Sep 17 00:00:00 2001 From: Daniel Suo Date: Tue, 22 Nov 2016 04:45:11 -0500 Subject: [PATCH 0675/1256] Add support for Karabiner Elements (#899) * Add support for PyCharm 2016.2 * Add support for Karabiner Elements * Add support for Keyboard Maestro * Add support for CLion --- CHANGELOG.md | 3 +++ README.md | 3 +++ mackup/applications/clion.cfg | 6 ++++++ mackup/applications/karabiner-elements.cfg | 5 +++++ mackup/applications/keyboard-maestro.cfg | 5 +++++ 5 files changed, 22 insertions(+) create mode 100644 mackup/applications/clion.cfg create mode 100644 mackup/applications/karabiner-elements.cfg create mode 100644 mackup/applications/keyboard-maestro.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index eed56e204..287ce9dfd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## WIP +- Add support for CLion 2016.2 (via @danielsuo) +- Add support for Keyboard Maestro (via @danielsuo) +- Add support for Karabiner Elements (via @danielsuo) - Add support for PyCharm 2016.2 (via @danielsuo) - Add support for Telegram for macOS (via @matti) - Add support for Paintbrush 2.1.2 (via @domenicbrosh) diff --git a/README.md b/README.md index bab7d63f7..3dad4c8a2 100644 --- a/README.md +++ b/README.md @@ -198,6 +198,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Chef](https://www.chef.io/chef/) - [Chicken](http://sourceforge.net/projects/chicken/) - [Clementine](https://www.clementine-player.org/) +- [CLion](https://www.jetbrains.com/clion/) - [ClipMenu](http://www.clipmenu.com/) - [Clipy](https://clipy-app.com/) - [CloudApp](http://getcloudapp.com/) @@ -293,10 +294,12 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Jumpcut](http://jumpcut.sourceforge.net/) - [Kaleidoscope](http://www.kaleidoscopeapp.com/) - [Karabiner](https://pqrs.org/osx/karabiner/) +- [Karabiner Elements](https://github.com/tekezo/Karabiner-Elements) - [KeePassX](http://www.keepassx.org/) - [KeepingYouAwake](https://github.com/newmarcel/KeepingYouAwake) - [Keka](http://www.kekaosx.com/en/) - [Keybase](https://keybase.io/) +- [Keyboard Maestro](http://www.keyboardmaestro.com) - [Keymo](http://manytricks.com/keymo/) - [KeyRemap4MacBook](https://pqrs.org/osx/karabiner/) - [Kwm](https://koekeishiya.github.io/kwm/) diff --git a/mackup/applications/clion.cfg b/mackup/applications/clion.cfg new file mode 100644 index 000000000..88e256af5 --- /dev/null +++ b/mackup/applications/clion.cfg @@ -0,0 +1,6 @@ +[application] +name = CLion + +[configuration_files] +Library/Preferences/CLion2016.2 +Library/Application Support/CLion2016.2 diff --git a/mackup/applications/karabiner-elements.cfg b/mackup/applications/karabiner-elements.cfg new file mode 100644 index 000000000..3ba6f9252 --- /dev/null +++ b/mackup/applications/karabiner-elements.cfg @@ -0,0 +1,5 @@ +[application] +name = Karabiner Elements + +[configuration_files] +.karabiner.d diff --git a/mackup/applications/keyboard-maestro.cfg b/mackup/applications/keyboard-maestro.cfg new file mode 100644 index 000000000..00aa54fe7 --- /dev/null +++ b/mackup/applications/keyboard-maestro.cfg @@ -0,0 +1,5 @@ +[application] +name = Keyboard Maestro + +[configuration_files] +Library/Application Support/Keyboard Maestro From a58b767022c05a4add0150f926c0fb7d7fa21d0a Mon Sep 17 00:00:00 2001 From: Care-Bear Date: Tue, 22 Nov 2016 09:46:27 +0000 Subject: [PATCH 0676/1256] Add Linux support for Pycharm 2016.2 (#901) Add Linux support for Pycharm 2016.2 & Visual Studio Code --- mackup/applications/pycharm.cfg | 1 + mackup/applications/vscode.cfg | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/mackup/applications/pycharm.cfg b/mackup/applications/pycharm.cfg index 25c531653..edd315e5d 100644 --- a/mackup/applications/pycharm.cfg +++ b/mackup/applications/pycharm.cfg @@ -9,6 +9,7 @@ Library/Preferences/PyCharm40 Library/Application Support/PyCharm50 Library/Preferences/PyCharm50 .PyCharm2016.1/config +.PyCharm2016.2/config Library/Application Support/PyCharm2016.1 Library/Application Support/PyCharm2016.2 Library/Preferences/PyCharm2016.1 diff --git a/mackup/applications/vscode.cfg b/mackup/applications/vscode.cfg index d2ffcc4e2..26fed78a1 100644 --- a/mackup/applications/vscode.cfg +++ b/mackup/applications/vscode.cfg @@ -3,3 +3,9 @@ name = Visual Studio Code [configuration_files] Library/Application Support/Code/User + +# Linux Files +.vscode +.config/Code/User/snippets +.config/Code/User/keybindings.json +.config/Code/User/settings.json From 4cb7d6fd2ad976efe8e95c3966ef9febb9e90138 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 22 Nov 2016 01:49:32 -0800 Subject: [PATCH 0677/1256] Update devilspie.cfg --- mackup/applications/devilspie.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/mackup/applications/devilspie.cfg b/mackup/applications/devilspie.cfg index 8114555f2..9bed7b099 100644 --- a/mackup/applications/devilspie.cfg +++ b/mackup/applications/devilspie.cfg @@ -2,5 +2,4 @@ name = Devil's Pie [configuration_files] - .devilspie From 2e69275ea81723f04e174be122e3f8e024077423 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 22 Nov 2016 01:54:05 -0800 Subject: [PATCH 0678/1256] Mackup 0.8.15 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d73cee17f..3b77cc32e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.15 + - Add support for CLion 2016.2 (via @danielsuo) - Add support for Keyboard Maestro (via @danielsuo) - Add support for Karabiner Elements (via @danielsuo) diff --git a/mackup/constants.py b/mackup/constants.py index bdda0caf4..03eae99b1 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.14' +VERSION = '0.8.15' # Support platforms PLATFORM_DARWIN = 'Darwin' From 09a05ea64f1683f9d26312ce4a8543ebffbd8c42 Mon Sep 17 00:00:00 2001 From: Iulian Onofrei Date: Tue, 22 Nov 2016 12:58:44 +0200 Subject: [PATCH 0679/1256] Add app in README and CHANGELOG --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ff6492d7..7b33483d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Add support for Wakatime (via @joshmedeski) - Add support for Kwm (via @neon64) +- Add support for SmartGit (via @revolter) ## Mackup 0.8.14 diff --git a/README.md b/README.md index eb140df1b..e96ebd233 100644 --- a/README.md +++ b/README.md @@ -395,6 +395,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Skitch](https://evernote.com/skitch/) - [Slate](https://github.com/jigish/slate) - [Slogger](http://brettterpstra.com/projects/slogger/) +- [SmartGit](http://www.syntevo.com/smartgit/) - [Smooth Mouse](http://smoothmouse.com/) - [Soulver](http://www.acqualia.com/soulver/) - [SourceTree](https://www.sourcetreeapp.com/) From 21380e00c376457a3e123b0c6549bf032f142a8b Mon Sep 17 00:00:00 2001 From: Iulian Onofrei Date: Tue, 22 Nov 2016 12:59:58 +0200 Subject: [PATCH 0680/1256] Rename SmartGitHg references to SmartGit --- mackup/applications/{smartgithg.cfg => smartgit.cfg} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename mackup/applications/{smartgithg.cfg => smartgit.cfg} (82%) diff --git a/mackup/applications/smartgithg.cfg b/mackup/applications/smartgit.cfg similarity index 82% rename from mackup/applications/smartgithg.cfg rename to mackup/applications/smartgit.cfg index 801d5655d..fe392f644 100644 --- a/mackup/applications/smartgithg.cfg +++ b/mackup/applications/smartgit.cfg @@ -1,5 +1,5 @@ [application] -name = SmartGitHg +name = SmartGit [configuration_files] Library/Preferences/SmartGit/smartgit.vmoptions From 6efaefa8e932c08574d9e8ac0f90ef66138a0715 Mon Sep 17 00:00:00 2001 From: Robert Orzanna Date: Mon, 6 Jun 2016 11:35:23 +0200 Subject: [PATCH 0681/1256] Create kdenlive.cfg --- mackup/applications/kdenlive.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/kdenlive.cfg diff --git a/mackup/applications/kdenlive.cfg b/mackup/applications/kdenlive.cfg new file mode 100644 index 000000000..6a64098d6 --- /dev/null +++ b/mackup/applications/kdenlive.cfg @@ -0,0 +1,6 @@ +[application] +name = Kdenlive + +[configuration_files] + +.config/kdenliverc From 44b2ee4176e6f9948191afc8b46474b5b51b58d6 Mon Sep 17 00:00:00 2001 From: Robert Orzanna Date: Mon, 6 Jun 2016 16:59:48 +0200 Subject: [PATCH 0682/1256] Update kdenlive.cfg --- mackup/applications/kdenlive.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/kdenlive.cfg b/mackup/applications/kdenlive.cfg index 6a64098d6..b19171780 100644 --- a/mackup/applications/kdenlive.cfg +++ b/mackup/applications/kdenlive.cfg @@ -4,3 +4,4 @@ name = Kdenlive [configuration_files] .config/kdenliverc +kdenlive From 69b54e12557392547058c3e506d3bdd5d648eb4e Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 22 Nov 2016 13:27:31 -0800 Subject: [PATCH 0683/1256] fix README/CHANGELOG conflicts --- CHANGELOG.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3049fc04f..988847cae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Add support for SmartGit (via @revolter) +- Add support for Kdenlive (via @orschiro) ## Mackup 0.8.15 diff --git a/README.md b/README.md index b73391754..896ff5f92 100644 --- a/README.md +++ b/README.md @@ -297,6 +297,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Kaleidoscope](http://www.kaleidoscopeapp.com/) - [Karabiner](https://pqrs.org/osx/karabiner/) - [Karabiner Elements](https://github.com/tekezo/Karabiner-Elements) +- [Kdenlive](https://kdenlive.org/) - [KeePassX](http://www.keepassx.org/) - [KeepingYouAwake](https://github.com/newmarcel/KeepingYouAwake) - [Keka](http://www.kekaosx.com/en/) From 389933cd588d7a31253853748e51f4b1b307a1cc Mon Sep 17 00:00:00 2001 From: Jan Vlnas Date: Wed, 14 Dec 2016 21:11:46 +0100 Subject: [PATCH 0684/1256] Improve Visual Studio Code synchronization (#936) - Do not sync .vscode folder on Linux, since it contains all Node dependencies - Explicitly sync files on macOS to prevent syncing workspaceStorage folder --- mackup/applications/vscode.cfg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mackup/applications/vscode.cfg b/mackup/applications/vscode.cfg index 26fed78a1..9c5da5bed 100644 --- a/mackup/applications/vscode.cfg +++ b/mackup/applications/vscode.cfg @@ -2,10 +2,11 @@ name = Visual Studio Code [configuration_files] -Library/Application Support/Code/User +Library/Application Support/Code/User/snippets +Library/Application Support/Code/User/keybindings.json +Library/Application Support/Code/User/settings.json # Linux Files -.vscode .config/Code/User/snippets .config/Code/User/keybindings.json .config/Code/User/settings.json From d65d55ab57bfd2b387dc4f69f79ab9168dfe2d0a Mon Sep 17 00:00:00 2001 From: Reno DuBois Date: Wed, 14 Dec 2016 14:17:19 -0600 Subject: [PATCH 0685/1256] Updated requirements.txt to include docopt (#935) --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index fbff3a188..535d969fe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,4 @@ nose flake8 codecov +docopt \ No newline at end of file From 7fb1c766a3f5d3b9d18f5867458fd5fe0a4f1f1e Mon Sep 17 00:00:00 2001 From: Sepehr Lajevardi Date: Tue, 27 Dec 2016 22:57:07 +0330 Subject: [PATCH 0686/1256] Add support for Apptivate. (#942) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/apptivate.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/apptivate.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 988847cae..81017ac41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Add support for SmartGit (via @revolter) - Add support for Kdenlive (via @orschiro) +- Add support for Apptivate (via @sepehr) ## Mackup 0.8.15 diff --git a/README.md b/README.md index 896ff5f92..e585055e9 100644 --- a/README.md +++ b/README.md @@ -164,6 +164,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/) +- [Apptivate](http://www.apptivateapp.com/) - [Arara](https://github.com/cereda/arara) - [aria2c](http://aria2.sourceforge.net/) - [Arm](https://www.atagar.com/arm/) diff --git a/mackup/applications/apptivate.cfg b/mackup/applications/apptivate.cfg new file mode 100644 index 000000000..0b5f6b1ae --- /dev/null +++ b/mackup/applications/apptivate.cfg @@ -0,0 +1,5 @@ +[application] +name = Apptivate + +[configuration_files] +Library/Application Support/Apptivate/hotkeys From e4503d8feaed82b582c5725e6f9583440a6c38a8 Mon Sep 17 00:00:00 2001 From: Matheus Araujo Date: Tue, 27 Dec 2016 20:37:24 +0100 Subject: [PATCH 0687/1256] Add support for GitKraken (#941) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/gitkraken.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/gitkraken.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 81017ac41..4e2f63646 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Add support for SmartGit (via @revolter) - Add support for Kdenlive (via @orschiro) +- Add support for GitKraken (via @mdentinho) - Add support for Apptivate (via @sepehr) ## Mackup 0.8.15 diff --git a/README.md b/README.md index e585055e9..70bc1c6f1 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. - [Git Hooks](https://github.com/icefox/git-hooks) - [Git](http://git-scm.com/) - [Gitbox](http://gitboxapp.com/) +- [GitKraken](https://www.gitkraken.com) - [Gmail Notifr](http://ashchan.com/projects/gmail-notifr) - [GMVault](http://gmvault.org/) - [Gnome SSH Tunnel Manager](http://sourceforge.net/projects/gstm/) diff --git a/mackup/applications/gitkraken.cfg b/mackup/applications/gitkraken.cfg new file mode 100644 index 000000000..6c9a05cce --- /dev/null +++ b/mackup/applications/gitkraken.cfg @@ -0,0 +1,6 @@ +[application] +name = GitKraken + +[configuration_files] +.gitkraken +Library/Preferences/com.axosoft.gitkraken.plist From bc09f2409efea8675f918184ef198cc987013d13 Mon Sep 17 00:00:00 2001 From: Sheri Richardson Date: Fri, 30 Dec 2016 01:15:59 +0100 Subject: [PATCH 0688/1256] Add support for qutebrowser (#945) * Add support for qutebrowser * Update README.md --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/qutebrowser.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/qutebrowser.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e2f63646..5754bfeb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Add support for Kdenlive (via @orschiro) - Add support for GitKraken (via @mdentinho) - Add support for Apptivate (via @sepehr) +- Add support for Qutebrowser (via @sheriallis) ## Mackup 0.8.15 diff --git a/README.md b/README.md index 70bc1c6f1..3940b162a 100644 --- a/README.md +++ b/README.md @@ -390,6 +390,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/) +- [Qutebrowser](http://qutebrowser.org/) - [R](http://www.r-project.org/) - [Rails](http://rubyonrails.org/) - [Redshift](http://jonls.dk/redshift/) diff --git a/mackup/applications/qutebrowser.cfg b/mackup/applications/qutebrowser.cfg new file mode 100644 index 000000000..c082c2d8b --- /dev/null +++ b/mackup/applications/qutebrowser.cfg @@ -0,0 +1,5 @@ +[application] +name = Qutebrowser + +[configuration_files] +.config/qutebrowser/qutebrowser.conf From 4e9c9a62170dcd87d0c2f53ded0c50db07e95fd3 Mon Sep 17 00:00:00 2001 From: newlix Date: Wed, 4 Jan 2017 04:31:30 +0800 Subject: [PATCH 0689/1256] Support TextMate 2's new .tm_properties files (#951) http://blog.macromates.com/2011/git-style-configuration/ --- mackup/applications/textmate.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/textmate.cfg b/mackup/applications/textmate.cfg index ec46554c6..a1646a991 100644 --- a/mackup/applications/textmate.cfg +++ b/mackup/applications/textmate.cfg @@ -5,3 +5,4 @@ name = TextMate Library/Application Support/TextMate/Managed/Bundles Library/Preferences/com.macromates.textmate.plist Library/Preferences/com.macromates.textmate.latex_config.plist +.tm_properties From 639e553e8deb33d4a3c6a85846b2df899a5a2c43 Mon Sep 17 00:00:00 2001 From: Rafael Silva Date: Wed, 4 Jan 2017 21:03:49 -0200 Subject: [PATCH 0690/1256] Update support to Idea 2016.3 (#954) --- mackup/applications/intellijidea.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/intellijidea.cfg b/mackup/applications/intellijidea.cfg index 381fceb41..e252907e6 100644 --- a/mackup/applications/intellijidea.cfg +++ b/mackup/applications/intellijidea.cfg @@ -20,3 +20,5 @@ Library/Application Support/IdeaIC2016.1 Library/Preferences/IdeaIC2016.1 Library/Preferences/IntelliJIdea2016.2 Library/Application Support/IntelliJIdea2016.2 +Library/Preferences/IntelliJIdea2016.3 +Library/Application Support/IntelliJIdea2016.3 From 2b9c1d475cf5756581d35c57f1c32422e1ec8579 Mon Sep 17 00:00:00 2001 From: Tatsuya Itakura Date: Fri, 6 Jan 2017 11:22:34 +0900 Subject: [PATCH 0691/1256] Add support for RubyMine 2016.3 (#950) --- mackup/applications/rubymine.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/rubymine.cfg b/mackup/applications/rubymine.cfg index 239f44fe6..afb45b6ba 100644 --- a/mackup/applications/rubymine.cfg +++ b/mackup/applications/rubymine.cfg @@ -16,3 +16,5 @@ Library/Application Support/RubyMine2016.1 Library/Preferences/RubyMine2016.1 Library/Application Support/RubyMine2016.2 Library/Preferences/RubyMine2016.2 +Library/Application Support/RubyMine2016.3 +Library/Preferences/RubyMine2016.3 From 9214edc188116c1fe0457a4ab13b785b14a32944 Mon Sep 17 00:00:00 2001 From: Michael Bianco Date: Thu, 5 Jan 2017 19:35:46 -0700 Subject: [PATCH 0692/1256] Explicitly list macdown sync to avoid syncing sparkle cache (#953) --- mackup/applications/macdown.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mackup/applications/macdown.cfg b/mackup/applications/macdown.cfg index 84c77b8cc..9638c2670 100644 --- a/mackup/applications/macdown.cfg +++ b/mackup/applications/macdown.cfg @@ -3,4 +3,5 @@ name = MacDown [configuration_files] Library/Preferences/com.uranusjr.macdown.plist -Library/Application Support/MacDown +Library/Application Support/MacDown/Styles +Library/Application Support/MacDown/Themes From e89acda67242f5f7ca977278de85fba274a297a6 Mon Sep 17 00:00:00 2001 From: Sepehr Lajevardi Date: Thu, 19 Jan 2017 00:58:45 +0330 Subject: [PATCH 0693/1256] Fix karabiner-elements config file location (#963) * Update karabiner elements config file location. * Fix Karabiner Elements support. --- CHANGELOG.md | 1 + mackup/applications/karabiner-elements.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5754bfeb4..6c6a62ef9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Add support for GitKraken (via @mdentinho) - Add support for Apptivate (via @sepehr) - Add support for Qutebrowser (via @sheriallis) +- Fix support for Karabiner Elements (via @sepehr) ## Mackup 0.8.15 diff --git a/mackup/applications/karabiner-elements.cfg b/mackup/applications/karabiner-elements.cfg index 3ba6f9252..239dc710e 100644 --- a/mackup/applications/karabiner-elements.cfg +++ b/mackup/applications/karabiner-elements.cfg @@ -2,4 +2,4 @@ name = Karabiner Elements [configuration_files] -.karabiner.d +.config/karabiner/karabiner.json From caf4cd4fbdffbd5f33035a7da453ab2e0fc45903 Mon Sep 17 00:00:00 2001 From: Urban Cetinski Date: Wed, 18 Jan 2017 22:30:57 +0100 Subject: [PATCH 0694/1256] Add support for Gogland 1.0 EAP (#962) --- README.md | 1 + mackup/applications/gogland.cfg | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 mackup/applications/gogland.cfg diff --git a/README.md b/README.md index 3940b162a..f93c0f5f9 100644 --- a/README.md +++ b/README.md @@ -266,6 +266,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/) (NOTE: includes private keys) - [Go2Shell](http://zipzapmac.com/Go2Shell) +- [Gogland](https://www.jetbrains.com/go/) - [GoShare](https://github.com/dictget/goshare) - [Gradle](http://gradle.org) - [GrandTotal 3](http://www.mediaatelier.com/GrandTotal4/) diff --git a/mackup/applications/gogland.cfg b/mackup/applications/gogland.cfg new file mode 100644 index 000000000..ed2cd2ffd --- /dev/null +++ b/mackup/applications/gogland.cfg @@ -0,0 +1,7 @@ +[application] +name = Gogland + +[configuration_files] +Library/Preferences/com.jetbrains.gogland-EAP.plist +Library/Application Support/Gogland1.0 +Library/Preferences/Gogland1.0 From 1e46289bc12b2a47649403981111f10828e387bc Mon Sep 17 00:00:00 2001 From: Sheri Richardson Date: Fri, 20 Jan 2017 03:25:02 +0100 Subject: [PATCH 0695/1256] Add support for Redshift Scheduler (#960) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/redshift-scheduler.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/redshift-scheduler.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c6a62ef9..8625212bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Add support for GitKraken (via @mdentinho) - Add support for Apptivate (via @sepehr) - Add support for Qutebrowser (via @sheriallis) +- Add support for Redshift Scheduler (via @sheriallis) - Fix support for Karabiner Elements (via @sepehr) ## Mackup 0.8.15 diff --git a/README.md b/README.md index f93c0f5f9..dd7062fb4 100644 --- a/README.md +++ b/README.md @@ -395,6 +395,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/) - [Redshift](http://jonls.dk/redshift/) +- [Redshift Scheduler](https://github.com/spantaleev/redshift-scheduler) - [Rhythmbox](https://wiki.gnome.org/Apps/Rhythmbox) - [Rime](http://rime.im/) - [Robomongo](http://robomongo.org/) diff --git a/mackup/applications/redshift-scheduler.cfg b/mackup/applications/redshift-scheduler.cfg new file mode 100644 index 000000000..e41627638 --- /dev/null +++ b/mackup/applications/redshift-scheduler.cfg @@ -0,0 +1,5 @@ +[application] +name = Redshift Scheduler + +[configuration_files] +.config/redshift-scheduler/rules.conf From b51ef5393e90aa835eacd4f509785e0297d49bc6 Mon Sep 17 00:00:00 2001 From: Matheus Araujo Date: Fri, 20 Jan 2017 03:33:26 +0100 Subject: [PATCH 0696/1256] Add support for Splice (#948) * Add support for GitKraken * Add support for Splice --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/splice.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/splice.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 8625212bf..ea0d8d286 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Add support for GitKraken (via @mdentinho) - Add support for Apptivate (via @sepehr) - Add support for Qutebrowser (via @sheriallis) +- Add support for Splice (via @mdentinho) - Add support for Redshift Scheduler (via @sheriallis) - Fix support for Karabiner Elements (via @sepehr) diff --git a/README.md b/README.md index dd7062fb4..d4bd0f2ec 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. - [Spark](http://www.shadowlab.org/softwares/spark.php) - [Spectacle](https://www.spectacleapp.com/) - [Spectrwm](https://github.com/conformal/spectrwm/wiki) +- [Splice](https://splice.com/) - [Spotify Notifications](http://spotify-notifications.citruspi.io/) - [Spotify](https://www.spotify.com/) - [Stata](http://www.stata.com/) diff --git a/mackup/applications/splice.cfg b/mackup/applications/splice.cfg new file mode 100644 index 000000000..18589af0c --- /dev/null +++ b/mackup/applications/splice.cfg @@ -0,0 +1,5 @@ +[application] +name = Splice + +[configuration_files] +Library/Preferences/com.splice.Splice.plist From 47b1a30bbc35e32c79afeb0e773e0a1415a6825c Mon Sep 17 00:00:00 2001 From: Matheus Araujo Date: Fri, 20 Jan 2017 03:36:31 +0100 Subject: [PATCH 0697/1256] Add support for Beatport Pro (#947) * Add support for GitKraken * Add support for Beatport Pro --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/beatport-pro.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/beatport-pro.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ea0d8d286..875fa7e7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Add support for GitKraken (via @mdentinho) - Add support for Apptivate (via @sepehr) - Add support for Qutebrowser (via @sheriallis) +- Add support for Beatport Pro (via @mdentinho) - Add support for Splice (via @mdentinho) - Add support for Redshift Scheduler (via @sheriallis) - Fix support for Karabiner Elements (via @sepehr) diff --git a/README.md b/README.md index d4bd0f2ec..e888c53ad 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. - [Bash it](https://github.com/Bash-it/bash-it) - [Bash](http://www.gnu.org/software/bash/) - [BBEdit](http://www.barebones.com/products/bbedit/) +- [Beatport Pro](https://www.beatport.com/desktop) - [BetterSnapTool](http://www.boastr.net/) - [BetterTouchTool](http://www.boastr.net/) - [BibDesk](http://bibdesk.sourceforge.net/) diff --git a/mackup/applications/beatport-pro.cfg b/mackup/applications/beatport-pro.cfg new file mode 100644 index 000000000..c5e8492eb --- /dev/null +++ b/mackup/applications/beatport-pro.cfg @@ -0,0 +1,5 @@ +[application] +name = Beatport Pro + +[configuration_files] +Library/Preferences/com.beatport.BeatportPro.plist From 15586efaa92cfab544e1b14d4646e3d3dc218278 Mon Sep 17 00:00:00 2001 From: Matheus Araujo Date: Fri, 20 Jan 2017 03:42:27 +0100 Subject: [PATCH 0698/1256] Add support for Amphetamine (#946) * Add support for GitKraken * Add support for Amphetamine Closes #928 * Update amphetamine.cfg --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/amphetamine.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/amphetamine.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 875fa7e7e..f763812cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Add support for GitKraken (via @mdentinho) - Add support for Apptivate (via @sepehr) - Add support for Qutebrowser (via @sheriallis) +- Add support for Amphetamine (via @mdentinho) - Add support for Beatport Pro (via @mdentinho) - Add support for Splice (via @mdentinho) - Add support for Redshift Scheduler (via @sheriallis) diff --git a/README.md b/README.md index e888c53ad..60ad21882 100644 --- a/README.md +++ b/README.md @@ -160,6 +160,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Airmail](http://airmailapp.com/) - [Ancient Domains of Mystery](http://www.adom.de/home/index.html) - [Adobe Photoshop Lightroom CC](https://www.adobe.com/products/photoshop-lightroom.html) +- [Amphetamine](https://itunes.apple.com/us/app/amphetamine/id937984704) - [Android Studio](https://developer.android.com/sdk/) - [Ansible](http://www.ansible.com/) - [AppCleaner](http://freemacsoft.net/appcleaner/) diff --git a/mackup/applications/amphetamine.cfg b/mackup/applications/amphetamine.cfg new file mode 100644 index 000000000..2d4548687 --- /dev/null +++ b/mackup/applications/amphetamine.cfg @@ -0,0 +1,5 @@ +[application] +name = Amphetamine + +[configuration_files] +Library/Containers/com.if.Amphetamine/Data/Library/Preferences/com.if.Amphetamine.plist From ba646ace211b59f0e3fff1e4280504af0a7bbcc1 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 19 Jan 2017 18:49:48 -0800 Subject: [PATCH 0699/1256] Add support for Lollypop (via @orschiro) Resolves #929 --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/lollypop.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/lollypop.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index f763812cc..811e27b8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Add support for Beatport Pro (via @mdentinho) - Add support for Splice (via @mdentinho) - Add support for Redshift Scheduler (via @sheriallis) +- Add support for Lollypop (via @orschiro) - Fix support for Karabiner Elements (via @sepehr) ## Mackup 0.8.15 diff --git a/README.md b/README.md index 60ad21882..0fb2b5ca8 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. - [Liquid Prompt](https://github.com/nojhan/liquidprompt) - [LittleSnitch](http://www.obdev.at/products/littlesnitch/) - [Livestreamer](http://livestreamer.tanuki.se/) +- [Lollypop](https://gnumdk.github.io/lollypop-web/) - [Luftrausers](http://luftrausers.com) - [MacDive](http://www.mac-dive.com/) - [MacDown](http://macdown.uranusjr.com/) diff --git a/mackup/applications/lollypop.cfg b/mackup/applications/lollypop.cfg new file mode 100644 index 000000000..49fc4e6f1 --- /dev/null +++ b/mackup/applications/lollypop.cfg @@ -0,0 +1,5 @@ +[application] +name = Lollypop + +[configuration_files] +.local/share/lollypop From 69db9f5535034f48ce806707d53ffe53061031cf Mon Sep 17 00:00:00 2001 From: Grigorii Horos Date: Fri, 20 Jan 2017 05:52:11 +0300 Subject: [PATCH 0700/1256] Add support for Fontconfig (#927) * Add support for Fontconfig * Fix Markdown error --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/fontconfig.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/fontconfig.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 811e27b8f..73e85e834 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Add support for SmartGit (via @revolter) - Add support for Kdenlive (via @orschiro) +- Add support for Fontconfig (via @horosgrisa) - Add support for GitKraken (via @mdentinho) - Add support for Apptivate (via @sepehr) - Add support for Qutebrowser (via @sheriallis) diff --git a/README.md b/README.md index 0fb2b5ca8..84706239a 100644 --- a/README.md +++ b/README.md @@ -248,6 +248,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Feeds](http://www.feedsapp.com/) - [FileZilla](https://filezilla-project.org/) - [Fish](http://ridiculousfish.com/shell/) +- [Fontconfig](https://www.freedesktop.org/wiki/Software/fontconfig/) - [Fisherman](http://fisherman.sh/) - [FlexGet](http://flexget.com/) - [Flux](https://justgetflux.com/) diff --git a/mackup/applications/fontconfig.cfg b/mackup/applications/fontconfig.cfg new file mode 100644 index 000000000..14395cd4d --- /dev/null +++ b/mackup/applications/fontconfig.cfg @@ -0,0 +1,5 @@ +[application] +name = Fontconfig + +[configuration_files] +.config/fontconfig From 8ff2328dae1e7808b0052bfe9be0c8a1d944f9d9 Mon Sep 17 00:00:00 2001 From: Ian Copp Date: Thu, 19 Jan 2017 18:58:08 -0800 Subject: [PATCH 0701/1256] Add Pidgin (#925) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/pidgin.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/pidgin.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 73e85e834..b2de56d68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Add support for SmartGit (via @revolter) - Add support for Kdenlive (via @orschiro) +- Add support for Pidgin (via @icopp) - Add support for Fontconfig (via @horosgrisa) - Add support for GitKraken (via @mdentinho) - Add support for Apptivate (via @sepehr) diff --git a/README.md b/README.md index 84706239a..676732545 100644 --- a/README.md +++ b/README.md @@ -378,6 +378,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Perl](https://www.perl.org/) - [Phoenix](https://github.com/kasper/phoenix) - [PhpStorm](http://www.jetbrains.com/phpstorm/) +- [Pidgin](https://www.pidgin.im) - [PIP](http://www.pip-installer.org/) - [Poedit](http://poedit.net/) - [PokerStars](https://www.pokerstars.com/) diff --git a/mackup/applications/pidgin.cfg b/mackup/applications/pidgin.cfg new file mode 100644 index 000000000..fcfa4de65 --- /dev/null +++ b/mackup/applications/pidgin.cfg @@ -0,0 +1,5 @@ +[application] +name = Pidgin + +[configuration_files] +.purple From b833b6fbb727f21cfc782e48b6f67255944081f1 Mon Sep 17 00:00:00 2001 From: Ian Copp Date: Thu, 19 Jan 2017 19:02:33 -0800 Subject: [PATCH 0702/1256] Add Hero Lab (#923) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/hero-lab.cfg | 7 +++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/hero-lab.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b2de56d68..726853813 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Add support for SmartGit (via @revolter) - Add support for Kdenlive (via @orschiro) +- Add support for Hero Lab (via @icopp) - Add support for Pidgin (via @icopp) - Add support for Fontconfig (via @horosgrisa) - Add support for GitKraken (via @mdentinho) diff --git a/README.md b/README.md index 676732545..9594a01cb 100644 --- a/README.md +++ b/README.md @@ -277,6 +277,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [HandBrake](https://handbrake.fr/) - [Hands Off!](http://www.oneperiodic.com/products/handsoff/) - [Hazel](http://www.noodlesoft.com/hazel.php) +- [Hero Lab](http://www.wolflair.com/index.php?context=hero_lab) - [Heroku](https://www.heroku.com/) - [HexChat](https://hexchat.github.io/) - [Hexels](http://hexraystudios.com/hexels/) diff --git a/mackup/applications/hero-lab.cfg b/mackup/applications/hero-lab.cfg new file mode 100644 index 000000000..0cbbc05c4 --- /dev/null +++ b/mackup/applications/hero-lab.cfg @@ -0,0 +1,7 @@ +[application] +name = Hero Lab + +[configuration_files] +Library/Application Support/Hero Lab/customoutput +Library/Application Support/Hero Lab/data +Library/Application Support/Hero Lab/docs From 372915d70dc74695ef593a3b77334c95591b5209 Mon Sep 17 00:00:00 2001 From: Ian Copp Date: Thu, 19 Jan 2017 19:05:00 -0800 Subject: [PATCH 0703/1256] Add TinyFugue (#922) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/tinyfugue.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/tinyfugue.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 726853813..9a65937ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Add support for SmartGit (via @revolter) - Add support for Kdenlive (via @orschiro) +- Add support for TinyFugue (via @icopp) - Add support for Hero Lab (via @icopp) - Add support for Pidgin (via @icopp) - Add support for Fontconfig (via @horosgrisa) diff --git a/README.md b/README.md index 9594a01cb..af0cf7019 100644 --- a/README.md +++ b/README.md @@ -466,6 +466,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) - [tint2](https://code.google.com/p/tint2/) +- [TinyFugue](http://tinyfugue.sourceforge.net) - [Tmux](http://tmux.sourceforge.net/) - [Tmuxinator](https://github.com/tmuxinator/tmuxinator) - [Todo.txt CLI](http://todotxt.com/) diff --git a/mackup/applications/tinyfugue.cfg b/mackup/applications/tinyfugue.cfg new file mode 100644 index 000000000..65c06ae7b --- /dev/null +++ b/mackup/applications/tinyfugue.cfg @@ -0,0 +1,5 @@ +[application] +name = TinyFugue + +[configuration_files] +.tfrc From f293612448de9b754aabb26c7c71c680d83c4fc9 Mon Sep 17 00:00:00 2001 From: Robert Orzanna Date: Fri, 20 Jan 2017 04:06:19 +0100 Subject: [PATCH 0704/1256] Ghostwriter (#921) * Update README.md * Create ghostwriter.cfg --- README.md | 1 + mackup/applications/ghostwriter.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/ghostwriter.cfg diff --git a/README.md b/README.md index af0cf7019..8d34a5cb9 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. - [Gear Player](https://www.gearmusicplayer.com/) - [GeekTool](http://projects.tynsoe.org/en/geektool/) - [GHCi](https://wiki.haskell.org/GHC/GHCi) +- [Ghostwriter](https://wereturtle.github.io/ghostwriter/) - [Git Hooks](https://github.com/icefox/git-hooks) - [Git](http://git-scm.com/) - [Gitbox](http://gitboxapp.com/) diff --git a/mackup/applications/ghostwriter.cfg b/mackup/applications/ghostwriter.cfg new file mode 100644 index 000000000..070a31e06 --- /dev/null +++ b/mackup/applications/ghostwriter.cfg @@ -0,0 +1,5 @@ +[application] +name = Ghostwriter + +[configuration_files] +.config/ghostwriter From dfbdb3b8effb48749bcb25a8c7c31d6ab8db2191 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 19 Jan 2017 19:06:56 -0800 Subject: [PATCH 0705/1256] Missing changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a65937ee..a0c96d8fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Add support for Splice (via @mdentinho) - Add support for Redshift Scheduler (via @sheriallis) - Add support for Lollypop (via @orschiro) +- Add support for Ghostwriter (via @orschiro) - Fix support for Karabiner Elements (via @sepehr) ## Mackup 0.8.15 From 1015a01726bbe0cab8b212b0a41fa111768ab9f7 Mon Sep 17 00:00:00 2001 From: Robert Orzanna Date: Fri, 20 Jan 2017 04:07:33 +0100 Subject: [PATCH 0706/1256] Libreoffice (#920) * Update README.md * Create libreoffice.cfg * Renamed not needed newline --- README.md | 1 + mackup/applications/libreoffice.cfg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 mackup/applications/libreoffice.cfg diff --git a/README.md b/README.md index 8d34a5cb9..7ea5975da 100644 --- a/README.md +++ b/README.md @@ -317,6 +317,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [LaTeXiT](http://www.chachatelier.fr/latexit/latexit-home.php?lang=en) - [LaunchBar](https://www.obdev.at/products/launchbar/index.html) - [Liftoff](https://github.com/thoughtbot/liftoff) +- [LibreOffice](https://www.libreoffice.org/) - [Light Table](http://lighttable.com/) - [LimeChat](http://limechat.net/mac/) - [Liquid Prompt](https://github.com/nojhan/liquidprompt) diff --git a/mackup/applications/libreoffice.cfg b/mackup/applications/libreoffice.cfg new file mode 100644 index 000000000..0c35b7f11 --- /dev/null +++ b/mackup/applications/libreoffice.cfg @@ -0,0 +1,5 @@ +[application] +name = LibreOffice + +[configuration_files] +.config/libreoffice From 474ce4edf0d4f2b2d0f3ac10a7987618fd864aa8 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 19 Jan 2017 19:08:01 -0800 Subject: [PATCH 0707/1256] Another missing changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0c96d8fc..18d54aafa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Add support for Redshift Scheduler (via @sheriallis) - Add support for Lollypop (via @orschiro) - Add support for Ghostwriter (via @orschiro) +- Add support for LibreOffice (via @orschiro) - Fix support for Karabiner Elements (via @sepehr) ## Mackup 0.8.15 From 84ff8f55a5ab7dc518f0044c24c0428d7ff6f9a2 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 24 Jan 2017 15:44:30 -0800 Subject: [PATCH 0708/1256] Mackup 0.8.16 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18d54aafa..ed045fd7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.16 + - Add support for SmartGit (via @revolter) - Add support for Kdenlive (via @orschiro) - Add support for TinyFugue (via @icopp) diff --git a/mackup/constants.py b/mackup/constants.py index 03eae99b1..3d9a2eb02 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.15' +VERSION = '0.8.16' # Support platforms PLATFORM_DARWIN = 'Darwin' From 0a3e0f57b59999fe6c7860bb22b28e9e29ea1e06 Mon Sep 17 00:00:00 2001 From: Ian Copp Date: Wed, 25 Jan 2017 15:00:07 -0800 Subject: [PATCH 0709/1256] Add Boxer (#924) --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/boxer.cfg | 6 ++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/boxer.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ed045fd7d..c1aa46cb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Add support for Boxer (via @icopp) + ## Mackup 0.8.16 - Add support for SmartGit (via @revolter) diff --git a/README.md b/README.md index 7ea5975da..a050c64e8 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. - [Bitchx](http://www.bitchx.org/) - [Blackfire](https://blackfire.io/) - [Boto](https://github.com/boto/boto) +- [Boxer](http://boxerapp.com) - [Brackets](http://brackets.io/) - [Bundler](http://bundler.io) - [Byobu](http://byobu.co/) diff --git a/mackup/applications/boxer.cfg b/mackup/applications/boxer.cfg new file mode 100644 index 000000000..5bbc9da3b --- /dev/null +++ b/mackup/applications/boxer.cfg @@ -0,0 +1,6 @@ +[application] +name = Boxer + +[configuration_files] +Library/Preferences/net.washboardabs.boxer.plist +Applications/DOS Games From 8f25571e96f9226d3398800732ae599ce516743f Mon Sep 17 00:00:00 2001 From: Iulian Onofrei Date: Fri, 3 Mar 2017 21:57:53 +0200 Subject: [PATCH 0710/1256] Update README.md (#639) * Update README.md Added instructions for testing mackup fork locally * Update README.md Possibly fix circleci fail * Update README.md Fix circleci fail --- doc/README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/README.md b/doc/README.md index 5662c0a75..3ff640996 100644 --- a/doc/README.md +++ b/doc/README.md @@ -216,3 +216,17 @@ If you override an application config that is already supported by Mackup, your new config for this application will replace the one provided by Mackup. You can find some sample config in this directory. + +### Locally test an application before submitting a Pull Request + +You can add and test an application by following these steps: + +- fork this project +- create a branch _(usually containing the name of the application)_ +- add the appropriate application config file in the `mackup/applications` folder +- from the top-most folder _(mackup)_ run `make develop` that replaces the + currently installed mackup with the local modified one +- simply run `mackup backup` to test if everything is ok +- 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 From 719efd0a630fc3c6326aab5c84ac12b8509bbbf9 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Fri, 14 Jul 2017 00:30:33 -0700 Subject: [PATCH 0711/1256] Testing GPG signatures (#1030) * Reorder the application list * Reorder engines --- README.md | 26 +++++++++++++------------- mackup/constants.py | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index a050c64e8..9c38db48a 100644 --- a/README.md +++ b/README.md @@ -157,10 +157,10 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adobe Camera Raw](http://www.adobe.com/products/photoshop/extend.html) - [Adobe Illustrator CC](https://www.adobe.com/products/illustrator.html) - [Adobe Photoshop CC](http://www.adobe.com/products/photoshop.html) -- [Airmail](http://airmailapp.com/) -- [Ancient Domains of Mystery](http://www.adom.de/home/index.html) - [Adobe Photoshop Lightroom CC](https://www.adobe.com/products/photoshop-lightroom.html) +- [Airmail](http://airmailapp.com/) - [Amphetamine](https://itunes.apple.com/us/app/amphetamine/id937984704) +- [Ancient Domains of Mystery](http://www.adom.de/home/index.html) - [Android Studio](https://developer.android.com/sdk/) - [Ansible](http://www.ansible.com/) - [AppCleaner](http://freemacsoft.net/appcleaner/) @@ -225,8 +225,8 @@ See the [README](doc/README.md) file in the doc directory for more info. - [DbVisualizer](https://www.dbvis.com/) - [Deal Alert](http://dealalertapp.com/) - [Default Folder X](http://www.stclairsoft.com/DefaultFolderX/) -- [Devil's Pie](https://en.wikipedia.org/wiki/Devil's_Pie_(software)) - [Devil's Pie 2](http://www.gusnan.se/devilspie2/) +- [Devil's Pie](https://en.wikipedia.org/wiki/Devil's_Pie_(software)) - [dig](http://en.wikipedia.org/wiki/Dig_(command)) - [Divvy](http://mizage.com/divvy/) - [Docker](https://www.docker.com/) @@ -234,8 +234,8 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Double Commander](http://doublecmd.sourceforge.net/) - [Doxie](http://www.getdoxie.com/) - [Droplr](https://droplr.com/) -- [Drush](http://www.drush.org/) - [Dropzone 3](https://aptonic.com/dropzone3/) +- [Drush](http://www.drush.org/) - [EditorConfig](http://editorconfig.org/) - [Electrum](https://electrum.org/#home) - [Emacs](http://www.gnu.org/software/emacs/) @@ -249,10 +249,10 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Feeds](http://www.feedsapp.com/) - [FileZilla](https://filezilla-project.org/) - [Fish](http://ridiculousfish.com/shell/) -- [Fontconfig](https://www.freedesktop.org/wiki/Software/fontconfig/) - [Fisherman](http://fisherman.sh/) - [FlexGet](http://flexget.com/) - [Flux](https://justgetflux.com/) +- [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/) @@ -286,9 +286,9 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Homebridge](https://github.com/nfarina/homebridge) - [Houdini](http://uglyapps.co.uk/houdini/) - [Htop](http://htop.sourceforge.net/) +- [Hyper.app](https://hyper.is/) - [HyperDock](https://bahoom.com/hyperdock) - [HyperSwitch](https://bahoom.com/hyperswitch) -- [Hyper.app](https://hyper.is/) - [i2cssh](https://github.com/wouterdebie/i2cssh) - [i3](https://i3wm.org/) - [i3wm](http://i3wm.org/) @@ -296,7 +296,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [IPython](http://ipython.org/) - [Irssi](http://www.irssi.org/) - [iStat Menus 5](https://bjango.com/mac/istatmenus/) -- iTunes Applescripts - [Janus](https://github.com/carlhuda/janus) - [jrnl](http://maebert.github.io/jrnl/) - [JSHint](http://jshint.com/) @@ -304,8 +303,8 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Jumpcut](http://jumpcut.sourceforge.net/) - [Jupyter](http://jupyter.org/) - [Kaleidoscope](http://www.kaleidoscopeapp.com/) -- [Karabiner](https://pqrs.org/osx/karabiner/) - [Karabiner Elements](https://github.com/tekezo/Karabiner-Elements) +- [Karabiner](https://pqrs.org/osx/karabiner/) - [Kdenlive](https://kdenlive.org/) - [KeePassX](http://www.keepassx.org/) - [KeepingYouAwake](https://github.com/newmarcel/KeepingYouAwake) @@ -317,8 +316,8 @@ 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) -- [Liftoff](https://github.com/thoughtbot/liftoff) - [LibreOffice](https://www.libreoffice.org/) +- [Liftoff](https://github.com/thoughtbot/liftoff) - [Light Table](http://lighttable.com/) - [LimeChat](http://limechat.net/mac/) - [Liquid Prompt](https://github.com/nojhan/liquidprompt) @@ -349,8 +348,8 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Mou](http://25.io/mou/) - [mpd](http://www.musicpd.org) - [MPlayerX](http://mplayerx.org) -- [MPV](https://mpv.io/) - [MPS Youtube](https://github.com/mps-youtube/mps-youtube) +- [MPV](https://mpv.io/) - [MusicBrainz Picard](https://picard.musicbrainz.org/) - [myrepos](https://github.com/joeyh/myrepos) - [MySQL](http://www.mysql.com/) @@ -403,8 +402,8 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Qutebrowser](http://qutebrowser.org/) - [R](http://www.r-project.org/) - [Rails](http://rubyonrails.org/) -- [Redshift](http://jonls.dk/redshift/) - [Redshift Scheduler](https://github.com/spantaleev/redshift-scheduler) +- [Redshift](http://jonls.dk/redshift/) - [Rhythmbox](https://wiki.gnome.org/Apps/Rhythmbox) - [Rime](http://rime.im/) - [Robomongo](http://robomongo.org/) @@ -481,15 +480,14 @@ See the [README](doc/README.md) file in the doc directory for more info. - [tvnamer](https://github.com/dbr/tvnamer) - [Twitterrific](http://twitterrific.com/) - [Typinator](http://www.ergonis.com/products/typinator/) -- [Übersicht](http://tracesof.net/uebersicht/) - [uTorrent](http://www.utorrent.com/) - [Ventrilo](http://www.ventrilo.com/) - [Versions](http://www.versionsapp.com) - [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) +- [Visual Studio Code](https://code.visualstudio.com) - [VLC](http://www.videolan.org/) - [Wakatime](https://wakatime.com/) - [WebStorm](https://www.jetbrains.com/webstorm/) @@ -510,6 +508,8 @@ See the [README](doc/README.md) file in the doc directory for more info. - [z](https://github.com/rupa/z) - [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/constants.py b/mackup/constants.py index 3d9a2eb02..c37a25c9e 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -22,9 +22,9 @@ CUSTOM_APPS_DIR = '.mackup' # Supported engines -ENGINE_DROPBOX = 'dropbox' -ENGINE_GDRIVE = 'google_drive' ENGINE_BOX = 'box' ENGINE_COPY = 'copy' -ENGINE_ICLOUD = 'icloud' +ENGINE_DROPBOX = 'dropbox' ENGINE_FS = 'file_system' +ENGINE_GDRIVE = 'google_drive' +ENGINE_ICLOUD = 'icloud' From a585c4697ded9c0b9ba465143419a8632d586627 Mon Sep 17 00:00:00 2001 From: Ryo Shibayama Date: Tue, 12 Sep 2017 09:02:48 +0900 Subject: [PATCH 0712/1256] Migrate to CircleCI 2.0 (#1054) * Add CircleCI 2.0 config * Delete an old config --- .circleci/config.yml | 24 ++++++++++++++++++++++++ circle.yml | 12 ------------ 2 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 circle.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..fa5b53294 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,24 @@ +version: 2 +jobs: + build: + docker: + - image: python:2.7 + working_directory: ~/repo + steps: + - checkout + - run: + name: install dependencies + command: | + apt-get update && apt-get install rubygems -y + gem install mdl + pip install -r requirements.txt + python setup.py install + - run: + name: run tests + command: make test + - run: + name: lint markdown + command: find . -name "*.md" -print0 | xargs -0 mdl + - run: + name: codecov + command: codecov diff --git a/circle.yml b/circle.yml deleted file mode 100644 index efdfbcf73..000000000 --- a/circle.yml +++ /dev/null @@ -1,12 +0,0 @@ -dependencies: - pre: - - gem install mdl - -test: - override: - - make test - - mdl: - files: - - "**/*.md" - post: - - codecov From 365ab6a797fd246fc9008f896c1a8907cedb780b Mon Sep 17 00:00:00 2001 From: Jan Piotrowski Date: Sun, 26 Nov 2017 23:52:25 +0100 Subject: [PATCH 0713/1256] fix spelling (#1093) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c38db48a..b37482c52 100644 --- a/README.md +++ b/README.md @@ -500,7 +500,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Xamarin Studio](https://xamarin.com/studio) - [XBindKeys](http://www.nongnu.org/xbindkeys/) - [Xchat](http://xchat.org/) -- [XCode](https://developer.apple.com/xcode/) +- [Xcode](https://developer.apple.com/xcode/) - [XEmacs](http://www.xemacs.org/) - [XLD](http://tmkk.undo.jp/xld/) - [XtraFinder](http://www.trankynam.com/xtrafinder/) From 62760bf12c9a8ee1f4981ff70a8a169a69d4cd4c Mon Sep 17 00:00:00 2001 From: Iulian Onofrei <6d0847b9@opayq.com> Date: Mon, 27 Nov 2017 03:16:07 +0200 Subject: [PATCH 0714/1256] Fix incorrect Xcode spelling (#1094) * Fix incorrect Xcode spelling * Fix incorrect Xcode spelling --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1aa46cb7..1efdf8e50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -534,7 +534,7 @@ ## Mackup 0.4.2 - Made a method to check if a process is running (not yet) -- Added support for XCode (via @adeca) +- Added support for Xcode (via @adeca) - Added support for CoRD, Spark, f.lux, BetterTouchTool, BetterSnapTool and Coda 2 (via @TimCorcoran) - Added support for Mailplane and Gitbox (via @THEY) From bfd2c00ae748ae48ba78cbb3b378d18fb884c12a Mon Sep 17 00:00:00 2001 From: Cameron McEfee Date: Mon, 4 Dec 2017 23:39:21 -0800 Subject: [PATCH 0715/1256] Mackup is a portmanteau (#1098) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b37482c52..4fb9bbd38 100644 --- a/README.md +++ b/README.md @@ -557,7 +557,7 @@ And it's [GPL](http://www.gnu.org/licenses/gpl.html), of course. ## What's up with the weird name -Mackup is just a contraction of Mac and Backup. It is simple, short, and easy to +Mackup is just a portmanteau of Mac and Backup. It is simple, short, and easy to remember, and it corresponds with the whole idea of Mackup: the simpler – the better! (And I suck at naming stuff, but who doesn't.) From c1995d1068b7b4c20116a1feca9bade736686389 Mon Sep 17 00:00:00 2001 From: Iulian Onofrei <6d0847b9@opayq.com> Date: Fri, 5 Jan 2018 21:50:25 +0200 Subject: [PATCH 0716/1256] Add support for fastlane (#1096) * Add support for fastlane --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/fastlane.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/fastlane.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 1efdf8e50..aaa006260 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Add support for Boxer (via @icopp) +- Add support for fastlane (via @revolter) ## Mackup 0.8.16 diff --git a/README.md b/README.md index 4fb9bbd38..f16514383 100644 --- a/README.md +++ b/README.md @@ -246,6 +246,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Factorio](https://www.factorio.com) - [Fantastical](http://flexibits.com/fantastical) - [fasd](https://github.com/clvv/fasd) +- [fastlane](https://fastlane.tools) - [Feeds](http://www.feedsapp.com/) - [FileZilla](https://filezilla-project.org/) - [Fish](http://ridiculousfish.com/shell/) diff --git a/mackup/applications/fastlane.cfg b/mackup/applications/fastlane.cfg new file mode 100644 index 000000000..123c8745d --- /dev/null +++ b/mackup/applications/fastlane.cfg @@ -0,0 +1,5 @@ +[application] +name = fastlane + +[configuration_files] +.fastlane/completions From 42256e724ee3607018236cff935357ff47751022 Mon Sep 17 00:00:00 2001 From: Chase Nordengren Date: Wed, 17 Jan 2018 08:35:10 -0800 Subject: [PATCH 0717/1256] Add Marked 2 (#1087) * Add Marked 2 http://marked2app.com --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/marked2.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/marked2.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index aaa006260..922711325 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Add support for Boxer (via @icopp) - Add support for fastlane (via @revolter) +- Add support for Marked 2 (via @semicolonsnet) ## Mackup 0.8.16 diff --git a/README.md b/README.md index f16514383..2a7de9a66 100644 --- a/README.md +++ b/README.md @@ -335,6 +335,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/) +- [Marked 2](http://marked2app.com) - [MATLAB](http://www.mathworks.com/products/matlab/) - [Maven](http://maven.apache.org) - [Max](http://sbooth.org/Max/) diff --git a/mackup/applications/marked2.cfg b/mackup/applications/marked2.cfg new file mode 100644 index 000000000..00f2702d4 --- /dev/null +++ b/mackup/applications/marked2.cfg @@ -0,0 +1,6 @@ +[application] +name = Marked 2 + +[configuration_files] +Library/Application Support/Marked 2 +Library/Preferences/com.brettterpstra.marked2.plist From 0884aadb3d3917d0adcb79b334d787f448a63a2b Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 17 Jan 2018 11:38:17 -0500 Subject: [PATCH 0718/1256] T ruby gem (#1085) Add support for 'T' ruby gem --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/t.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/t.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 922711325..e50dbc7e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Add support for Boxer (via @icopp) +- Add support for sferik/t (via @paxperscientiam) - Add support for fastlane (via @revolter) - Add support for Marked 2 (via @semicolonsnet) diff --git a/README.md b/README.md index 2a7de9a66..9e24a2bcd 100644 --- a/README.md +++ b/README.md @@ -459,6 +459,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [SuperDuper!](http://www.shirt-pocket.com/SuperDuper/SuperDuperDescription.html) - [Surge](http://surge.run/manual/) - [Swinsian](http://swinsian.com/) +- [T](http://sferik.github.io/t/) - [TaskPaper](http://www.hogbaysoftware.com/products/taskpaper) - [Taskwarrior](http://taskwarrior.org/) - [Teamocil](http://remiprev.github.io/teamocil/) diff --git a/mackup/applications/t.cfg b/mackup/applications/t.cfg new file mode 100644 index 000000000..576c7e30d --- /dev/null +++ b/mackup/applications/t.cfg @@ -0,0 +1,5 @@ +[application] +name = t + +[configuration_files] +.trc From 07917645d6a82c987672ff42eece2d5377220fea Mon Sep 17 00:00:00 2001 From: Sergey Khalymon Date: Wed, 17 Jan 2018 18:40:15 +0200 Subject: [PATCH 0719/1256] Add support for Tmuxp (#1097) * Add support for Tmuxp --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/tmuxp.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/tmuxp.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e50dbc7e5..7a75db754 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Add support for Boxer (via @icopp) +- Add support for Tmuxp (via @infernion) - Add support for sferik/t (via @paxperscientiam) - Add support for fastlane (via @revolter) - Add support for Marked 2 (via @semicolonsnet) diff --git a/README.md b/README.md index 9e24a2bcd..c1ce96f8d 100644 --- a/README.md +++ b/README.md @@ -473,6 +473,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [tint2](https://code.google.com/p/tint2/) - [TinyFugue](http://tinyfugue.sourceforge.net) - [Tmux](http://tmux.sourceforge.net/) +- [Tmuxp](https://github.com/tony/tmuxp) - [Tmuxinator](https://github.com/tmuxinator/tmuxinator) - [Todo.txt CLI](http://todotxt.com/) - [TotalSpaces2](http://totalspaces.binaryage.com/) diff --git a/mackup/applications/tmuxp.cfg b/mackup/applications/tmuxp.cfg new file mode 100644 index 000000000..ccd52de18 --- /dev/null +++ b/mackup/applications/tmuxp.cfg @@ -0,0 +1,5 @@ +[application] +name = tmuxp + +[configuration_files] +.tmuxp From 9feec2936ba8283c4b64f1192be91181807e31cd Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 17 Jan 2018 17:18:27 +0000 Subject: [PATCH 0720/1256] Add support for Insomnia REST client -- fixes #1115 (#1116) * Add support for Insomnia REST client --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/insomnia.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/insomnia.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a75db754..2a3a39b8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Add support for Tmuxp (via @infernion) - Add support for sferik/t (via @paxperscientiam) - Add support for fastlane (via @revolter) +- Add support for Insomnia (via @browniebroke) - Add support for Marked 2 (via @semicolonsnet) ## Mackup 0.8.16 diff --git a/README.md b/README.md index c1ce96f8d..432ddac2f 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. - [i2cssh](https://github.com/wouterdebie/i2cssh) - [i3](https://i3wm.org/) - [i3wm](http://i3wm.org/) +- [Insomnia](https://insomnia.rest/) - [IntelliJIDEA](http://www.jetbrains.com/idea/) - [IPython](http://ipython.org/) - [Irssi](http://www.irssi.org/) diff --git a/mackup/applications/insomnia.cfg b/mackup/applications/insomnia.cfg new file mode 100644 index 000000000..e427da4c5 --- /dev/null +++ b/mackup/applications/insomnia.cfg @@ -0,0 +1,6 @@ +[application] +name = Insomnia + +[configuration_files] +.config/Insomnia +Library/Application Support/Insomnia From c9ebcfe14836dfbd123b360757b3dfd7e3968177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loyer?= Date: Wed, 17 Jan 2018 18:31:04 +0100 Subject: [PATCH 0721/1256] Add iTerm2 support (#1075) Add iTerm2 support --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/iterm2.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/iterm2.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a3a39b8c..8c7e62322 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for iTerm (via @Sbastien) - Add support for Boxer (via @icopp) - Add support for Tmuxp (via @infernion) - Add support for sferik/t (via @paxperscientiam) diff --git a/README.md b/README.md index 432ddac2f..3d631b79b 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. - [IPython](http://ipython.org/) - [Irssi](http://www.irssi.org/) - [iStat Menus 5](https://bjango.com/mac/istatmenus/) +- [iTerm2](https://www.iterm2.com/) - [Janus](https://github.com/carlhuda/janus) - [jrnl](http://maebert.github.io/jrnl/) - [JSHint](http://jshint.com/) diff --git a/mackup/applications/iterm2.cfg b/mackup/applications/iterm2.cfg new file mode 100644 index 000000000..02e826fe3 --- /dev/null +++ b/mackup/applications/iterm2.cfg @@ -0,0 +1,5 @@ +[application] +name = iTerm2 + +[configuration_files] +Library/Preferences/com.googlecode.iterm2.plist From ace3e72c8b16fa0c358dc74f5482c58eb34b949b Mon Sep 17 00:00:00 2001 From: Kirill Korolyov Date: Fri, 9 Mar 2018 14:04:01 +0000 Subject: [PATCH 0722/1256] Add support for HTTPie (#1118) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/httpie.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/httpie.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c7e62322..a8b64d537 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Add support for fastlane (via @revolter) - Add support for Insomnia (via @browniebroke) - Add support for Marked 2 (via @semicolonsnet) +- Add support for HTTPie (via @Dremora) ## Mackup 0.8.16 diff --git a/README.md b/README.md index 3d631b79b..b8a0c0da7 100644 --- a/README.md +++ b/README.md @@ -287,6 +287,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Homebridge](https://github.com/nfarina/homebridge) - [Houdini](http://uglyapps.co.uk/houdini/) - [Htop](http://htop.sourceforge.net/) +- [HTTPie](https://httpie.org/) - [Hyper.app](https://hyper.is/) - [HyperDock](https://bahoom.com/hyperdock) - [HyperSwitch](https://bahoom.com/hyperswitch) diff --git a/mackup/applications/httpie.cfg b/mackup/applications/httpie.cfg new file mode 100644 index 000000000..25943f315 --- /dev/null +++ b/mackup/applications/httpie.cfg @@ -0,0 +1,5 @@ +[application] +name = HTTPie + +[configuration_files] +.httpie/config.json From 82e568c9911433564a858281f7c607d5ff1b046d Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Fri, 9 Mar 2018 09:52:23 -0800 Subject: [PATCH 0723/1256] Fix CCI on master (#1133) * Fix CCI on master * move codecov in python job --- .circleci/config.yml | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fa5b53294..a727752b3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2 jobs: - build: + "python": docker: - image: python:2.7 working_directory: ~/repo @@ -9,16 +9,32 @@ jobs: - run: name: install dependencies command: | - apt-get update && apt-get install rubygems -y - gem install mdl pip install -r requirements.txt python setup.py install - run: name: run tests command: make test - - run: - name: lint markdown - command: find . -name "*.md" -print0 | xargs -0 mdl - run: name: codecov command: codecov + "lint": + docker: + - image: circleci/ruby:latest-browsers + working_directory: ~/repo + steps: + - checkout + - run: + name: install dependencies + command: | + apt-get update && apt-get install rubygems -y + gem install mdl + - run: + name: lint markdown + command: find . -name "*.md" -print0 | xargs -0 mdl + +workflows: + version: 2 + build: + jobs: + - "python" + - "lint" From ca3fe6474ddcb6a6225b47043fd3733adde99f6a Mon Sep 17 00:00:00 2001 From: JI Xiang Date: Fri, 9 Mar 2018 18:58:30 +0100 Subject: [PATCH 0724/1256] Add support for IdeaVim (#1007) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/ideavim.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/ideavim.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index a8b64d537..a6ea26b0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Add support for iTerm (via @Sbastien) - Add support for Boxer (via @icopp) +- Add support for IdeaVim (via @x-ji) - Add support for Tmuxp (via @infernion) - Add support for sferik/t (via @paxperscientiam) - Add support for fastlane (via @revolter) diff --git a/README.md b/README.md index b8a0c0da7..069da4f71 100644 --- a/README.md +++ b/README.md @@ -294,6 +294,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/) - [i3wm](http://i3wm.org/) +- [IdeaVim](https://github.com/JetBrains/ideavim) - [Insomnia](https://insomnia.rest/) - [IntelliJIDEA](http://www.jetbrains.com/idea/) - [IPython](http://ipython.org/) diff --git a/mackup/applications/ideavim.cfg b/mackup/applications/ideavim.cfg new file mode 100644 index 000000000..042a9faa0 --- /dev/null +++ b/mackup/applications/ideavim.cfg @@ -0,0 +1,5 @@ +[application] +name=IdeaVim + +[configuration_files] +.ideavimrc From 99b7f9e3b73140f74fa706cd6911663f03d8c76f Mon Sep 17 00:00:00 2001 From: Jeremy Gaither Date: Fri, 9 Mar 2018 12:12:01 -0600 Subject: [PATCH 0725/1256] Disable gnupg keyrings (#1021) * Disable backup of GnuPG keyrings by default. sharing these with a cloud service unencrypted is a bad default. Ref: https://github.com/lra/mackup/issues/109 --- CHANGELOG.md | 1 + mackup/applications/gnupg.cfg | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6ea26b0b..6fdb08a47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Add support for Insomnia (via @browniebroke) - Add support for Marked 2 (via @semicolonsnet) - Add support for HTTPie (via @Dremora) +- Remove GnuPG keyrings from backup by default (via @jeremygaither) ## Mackup 0.8.16 diff --git a/mackup/applications/gnupg.cfg b/mackup/applications/gnupg.cfg index 6982790ec..8c1880c19 100644 --- a/mackup/applications/gnupg.cfg +++ b/mackup/applications/gnupg.cfg @@ -4,6 +4,4 @@ name = GnuPG [configuration_files] .gnupg/gpg-agent.conf .gnupg/gpg.conf -.gnupg/secring.gpg .gnupg/trustdb.gpg -.gnupg/pubring.gpg From f378dffc8fff7677a18f8b01820017c1a9278d5f Mon Sep 17 00:00:00 2001 From: Alexandr Subbotin Date: Fri, 9 Mar 2018 22:13:30 +0400 Subject: [PATCH 0726/1256] Add support for Cerebro (#1042) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/cerebro.cfg | 10 ++++++++++ 3 files changed, 12 insertions(+) create mode 100644 mackup/applications/cerebro.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fdb08a47..bb957d431 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for Cerebro (via @kelion) - Add support for iTerm (via @Sbastien) - Add support for Boxer (via @icopp) - Add support for IdeaVim (via @x-ji) diff --git a/README.md b/README.md index 069da4f71..2b97b8c21 100644 --- a/README.md +++ b/README.md @@ -198,6 +198,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Caffeine](http://lightheadsw.com/caffeine/) - [Capture One](http://www.phaseone.com/Imaging-Software/Capture-One.aspx) - [Cartographica](https://www.macgis.com/) +- [Cerebro](https://cerebroapp.com/) - [Charles](http://www.charlesproxy.com) - [Chef](https://www.chef.io/chef/) - [Chicken](http://sourceforge.net/projects/chicken/) diff --git a/mackup/applications/cerebro.cfg b/mackup/applications/cerebro.cfg new file mode 100644 index 000000000..8bc90d0a9 --- /dev/null +++ b/mackup/applications/cerebro.cfg @@ -0,0 +1,10 @@ +[application] +name = Cerebro + +[configuration_files] +Library/Application Support/Cerebro/config.json +Library/Application Support/Cerebro/plugins + +# Linux Files +.config/Cerebro/config.json +.config/Cerebro/plugins From fa219c49fb89d6bf523e19b9f96e1a4c3d05601f Mon Sep 17 00:00:00 2001 From: Stevie Howard Date: Fri, 9 Mar 2018 10:15:50 -0800 Subject: [PATCH 0727/1256] Add support for Postico (#1046) * add Postico to supported applications --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/postico.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/postico.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index bb957d431..4f5e681f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Add support for Marked 2 (via @semicolonsnet) - Add support for HTTPie (via @Dremora) - Remove GnuPG keyrings from backup by default (via @jeremygaither) +- Add support for Postico (via @stvhwrd) ## Mackup 0.8.16 diff --git a/README.md b/README.md index 2b97b8c21..200bc23be 100644 --- a/README.md +++ b/README.md @@ -395,6 +395,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [PopClip](http://pilotmoon.com/popclip/) - [Popcorn-Time](https://popcorntime.io/) - [PostgreSQL](http://www.postgresql.org/) +- [Postico](https://eggerapps.at/postico/) - [Pow](http://pow.cx/) - [Prezto](https://github.com/sorin-ionescu/prezto) - [Processing](https://processing.org/) diff --git a/mackup/applications/postico.cfg b/mackup/applications/postico.cfg new file mode 100644 index 000000000..8d729257c --- /dev/null +++ b/mackup/applications/postico.cfg @@ -0,0 +1,5 @@ +[application] +name = Postico + +[configuration_files] +Library/Preferences/at.eggerapps.Postico.plist From d3ac4c4f39b071629a7b8b29e9071459195f938d Mon Sep 17 00:00:00 2001 From: Jeffrey Cafferata Date: Fri, 9 Mar 2018 19:21:59 +0100 Subject: [PATCH 0728/1256] Updated phpstorm.cfg to support version 2017.1 and 2017.3. (#1056) --- CHANGELOG.md | 1 + mackup/applications/phpstorm.cfg | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f5e681f6..56f584927 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Add support for HTTPie (via @Dremora) - Remove GnuPG keyrings from backup by default (via @jeremygaither) - Add support for Postico (via @stvhwrd) +- Add support for PHPStorm 2017.3 (via @cafferata) ## Mackup 0.8.16 diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg index efa6e30d1..3e7fd7f00 100644 --- a/mackup/applications/phpstorm.cfg +++ b/mackup/applications/phpstorm.cfg @@ -3,6 +3,12 @@ name = PhpStorm [configuration_files] Library/Preferences/com.jetbrains.PhpStorm.plist +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 From ee012a6140db8f7b93f849ec159d70d649c6134e Mon Sep 17 00:00:00 2001 From: Jeffrey Cafferata Date: Fri, 9 Mar 2018 20:07:56 +0100 Subject: [PATCH 0729/1256] Add support for DaisyDisk (#1059) * Add support for DaisyDisk #1058 --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/daisydisk.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/daisydisk.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 56f584927..935718c9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Remove GnuPG keyrings from backup by default (via @jeremygaither) - Add support for Postico (via @stvhwrd) - Add support for PHPStorm 2017.3 (via @cafferata) +- Add support for DaisyDisk (via @cafferata) ## Mackup 0.8.16 diff --git a/README.md b/README.md index 200bc23be..aca67f2d6 100644 --- a/README.md +++ b/README.md @@ -221,6 +221,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [CotEditor](http://coteditor.com/) - [Ctags](http://ctags.sourceforge.net/) - [Cyberduck](https://cyberduck.io/) +- [DaisyDisk](https://daisydiskapp.com) - [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/daisydisk.cfg b/mackup/applications/daisydisk.cfg new file mode 100644 index 000000000..23eda2ca5 --- /dev/null +++ b/mackup/applications/daisydisk.cfg @@ -0,0 +1,6 @@ +[application] +name = DaisyDisk + +[configuration_files] +Library/Application Support/DaisyDisk/License.DaisyDisk +Library/Preferences/com.daisydiskapp.DaisyDiskStandAlone.plist From b501e5f60091eca93ad81c9dbe8c6732fe884a8a Mon Sep 17 00:00:00 2001 From: Jeffrey Cafferata Date: Fri, 9 Mar 2018 20:09:29 +0100 Subject: [PATCH 0730/1256] Add support for MySQL Workbench #1060 (#1061) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/mysqlworkbench.cfg | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 mackup/applications/mysqlworkbench.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 935718c9e..b1086b8ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Add support for Postico (via @stvhwrd) - Add support for PHPStorm 2017.3 (via @cafferata) - Add support for DaisyDisk (via @cafferata) +- Add support for MySQLWorkbench (via @cafferata) ## Mackup 0.8.16 diff --git a/README.md b/README.md index aca67f2d6..cbf1403b6 100644 --- a/README.md +++ b/README.md @@ -360,6 +360,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [MPV](https://mpv.io/) - [MusicBrainz Picard](https://picard.musicbrainz.org/) - [myrepos](https://github.com/joeyh/myrepos) +- [MySQL Workbench](https://www.mysql.com/products/workbench/) - [MySQL](http://www.mysql.com/) - [Name Mangler](http://manytricks.com/namemangler/) - [Nano](http://www.nano-editor.org/) diff --git a/mackup/applications/mysqlworkbench.cfg b/mackup/applications/mysqlworkbench.cfg new file mode 100644 index 000000000..b2746bb34 --- /dev/null +++ b/mackup/applications/mysqlworkbench.cfg @@ -0,0 +1,8 @@ +[application] +name = MySQL Workbench + +[configuration_files] +Library/Application Support/MySQL/Workbench/connections.xml +Library/Application Support/MySQL/Workbench/server_instances.xml +Library/Application Support/MySQL/Workbench/wb_options.xml +Library/Preferences/com.oracle.mysql.workbench.plist From 0314f98e388d2ecfff396ee7fbfa58b9e000e507 Mon Sep 17 00:00:00 2001 From: Jeffrey Cafferata Date: Fri, 9 Mar 2018 20:11:41 +0100 Subject: [PATCH 0731/1256] Add support for GitUp #1062 (#1063) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/gitup.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/gitup.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b1086b8ea..1a87e919d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Add support for fastlane (via @revolter) - Add support for Insomnia (via @browniebroke) - Add support for Marked 2 (via @semicolonsnet) +- Add support for GitUp (via @cafferata) - Add support for HTTPie (via @Dremora) - Remove GnuPG keyrings from backup by default (via @jeremygaither) - Add support for Postico (via @stvhwrd) diff --git a/README.md b/README.md index cbf1403b6..d7d83079c 100644 --- a/README.md +++ b/README.md @@ -269,6 +269,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Git](http://git-scm.com/) - [Gitbox](http://gitboxapp.com/) - [GitKraken](https://www.gitkraken.com) +- [GitUp](http://gitup.co/) - [Gmail Notifr](http://ashchan.com/projects/gmail-notifr) - [GMVault](http://gmvault.org/) - [Gnome SSH Tunnel Manager](http://sourceforge.net/projects/gstm/) diff --git a/mackup/applications/gitup.cfg b/mackup/applications/gitup.cfg new file mode 100644 index 000000000..ec7489ae2 --- /dev/null +++ b/mackup/applications/gitup.cfg @@ -0,0 +1,5 @@ +[application] +name = GitUp + +[configuration_files] +Library/Preferences/co.gitup.mac.plist From 285df1868350ceebf5d2a46c8b8d23774ec2ce40 Mon Sep 17 00:00:00 2001 From: Jeffrey Cafferata Date: Fri, 9 Mar 2018 20:13:59 +0100 Subject: [PATCH 0732/1256] Add support for WhatsApp Web (#1065) * Add support for WhatsApp Web #1065 --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/whatsapp.cfg | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 mackup/applications/whatsapp.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a87e919d..241ce7712 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Add support for fastlane (via @revolter) - Add support for Insomnia (via @browniebroke) - Add support for Marked 2 (via @semicolonsnet) +- Add support for WhatsApp Web (via @cafferata) - Add support for GitUp (via @cafferata) - Add support for HTTPie (via @Dremora) - Remove GnuPG keyrings from backup by default (via @jeremygaither) diff --git a/README.md b/README.md index d7d83079c..5b74c2914 100644 --- a/README.md +++ b/README.md @@ -505,6 +505,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Wakatime](https://wakatime.com/) - [WebStorm](https://www.jetbrains.com/webstorm/) - [Wget](https://www.gnu.org/software/wget/) +- [WhatsApp Web](https://web.whatsapp.com/) - [Wireshark 2](https://www.wireshark.org) - [Witch](http://manytricks.com/witch/) - [WordPress WP-CLI](http://wp-cli.org/) diff --git a/mackup/applications/whatsapp.cfg b/mackup/applications/whatsapp.cfg new file mode 100644 index 000000000..04a4dfd6c --- /dev/null +++ b/mackup/applications/whatsapp.cfg @@ -0,0 +1,8 @@ +[application] +name = WhatsApp Web + +[configuration_files] +Library/Application Support/WhatsApp/Preferences +Library/Application Support/WhatsApp/settings.json +Library/Preferences/WhatsApp-Helper.plist +Library/Preferences/WhatsApp.plist From b35cf76d6b0c5b824a508c4ed1c36bd747c61d98 Mon Sep 17 00:00:00 2001 From: Ian Copp Date: Fri, 9 Mar 2018 11:17:19 -0800 Subject: [PATCH 0733/1256] Add support for Micro (#1067) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/micro.cfg | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 mackup/applications/micro.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 241ce7712..6c8df7ee9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for Micro (via @icopp) - Add support for Cerebro (via @kelion) - Add support for iTerm (via @Sbastien) - Add support for Boxer (via @icopp) diff --git a/README.md b/README.md index 5b74c2914..0fa3f96f4 100644 --- a/README.md +++ b/README.md @@ -350,6 +350,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Mercurial](https://www.mercurial-scm.org/) - [MercuryMover](http://www.heliumfoot.com/mercurymover/) - [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) - [MonoDevelop](http://www.monodevelop.com) diff --git a/mackup/applications/micro.cfg b/mackup/applications/micro.cfg new file mode 100644 index 000000000..17f6f810b --- /dev/null +++ b/mackup/applications/micro.cfg @@ -0,0 +1,8 @@ +[application] +name = Micro + +[configuration_files] +.config/micro/colorschemes +.config/micro/syntax +.config/micro/settings.json +.config/micro/bindings.json From 35e531e944825e8e3f2a6626a247d0baab778d6a Mon Sep 17 00:00:00 2001 From: Stephen Mutua Date: Fri, 9 Mar 2018 22:22:04 +0300 Subject: [PATCH 0734/1256] enable backing up VS code extensions (#1071) --- CHANGELOG.md | 2 +- mackup/applications/vscode.cfg | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c8df7ee9..25cf081f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,10 @@ ## WIP -- Add support for Micro (via @icopp) - Add support for Cerebro (via @kelion) - Add support for iTerm (via @Sbastien) - Add support for Boxer (via @icopp) +- Add backing up vscode extensions for Visual Studio (via @stephen2m) - Add support for IdeaVim (via @x-ji) - Add support for Tmuxp (via @infernion) - Add support for sferik/t (via @paxperscientiam) diff --git a/mackup/applications/vscode.cfg b/mackup/applications/vscode.cfg index 9c5da5bed..2ce4b83a4 100644 --- a/mackup/applications/vscode.cfg +++ b/mackup/applications/vscode.cfg @@ -6,6 +6,9 @@ Library/Application Support/Code/User/snippets Library/Application Support/Code/User/keybindings.json Library/Application Support/Code/User/settings.json +# user extensions +.vscode/extensions + # Linux Files .config/Code/User/snippets .config/Code/User/keybindings.json From 201ed1a512d308b69794b7c8c55f3cfbfa24962a Mon Sep 17 00:00:00 2001 From: Stephen Mutua Date: Fri, 9 Mar 2018 22:25:10 +0300 Subject: [PATCH 0735/1256] Franz support (#1072) * add Franz settings files --- CHANGELOG.md | 3 ++- README.md | 1 + mackup/applications/franz.cfg | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 mackup/applications/franz.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 25cf081f8..62e17d758 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,11 @@ ## WIP +- Add support for Micro (via @icopp) - Add support for Cerebro (via @kelion) - Add support for iTerm (via @Sbastien) - Add support for Boxer (via @icopp) -- Add backing up vscode extensions for Visual Studio (via @stephen2m) +- Add support for Franz (via @stephen2m) - Add support for IdeaVim (via @x-ji) - Add support for Tmuxp (via @infernion) - Add support for sferik/t (via @paxperscientiam) diff --git a/README.md b/README.md index 0fa3f96f4..b99f446d3 100644 --- a/README.md +++ b/README.md @@ -259,6 +259,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [FontExplorer X](http://www.fontexplorerx.com/) - [Forge](http://www.slightlymagic.net/wiki/Forge) - [ForkLift 2](http://www.binarynights.com/forklift/) +- [Franz](https://meetfranz.com) - [Gas Mask](https://github.com/2ndalpha/gasmask/) - [gdb](https://www.gnu.org/software/gdb/) - [Gear Player](https://www.gearmusicplayer.com/) diff --git a/mackup/applications/franz.cfg b/mackup/applications/franz.cfg new file mode 100644 index 000000000..eecf73787 --- /dev/null +++ b/mackup/applications/franz.cfg @@ -0,0 +1,8 @@ +[application] +name = Franz + +[configuration_files] +Library/Application Support/Franz/settings + +# Linux files +.config/Franz/settings From f0cba5979884f5b1872e865db56a0fedf16aa51a Mon Sep 17 00:00:00 2001 From: Alex Yeung Date: Sat, 10 Mar 2018 03:41:01 +0800 Subject: [PATCH 0736/1256] Update bettertouchtool.cfg (#1089) * Update bettertouchtool.cfg --- CHANGELOG.md | 1 + mackup/applications/bettertouchtool.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62e17d758..d8d5a4d74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Add support for fastlane (via @revolter) - Add support for Insomnia (via @browniebroke) - Add support for Marked 2 (via @semicolonsnet) +- Add support for BetterTouchTool data store v2 (via @foray1010) - Add support for WhatsApp Web (via @cafferata) - Add support for GitUp (via @cafferata) - Add support for HTTPie (via @Dremora) diff --git a/mackup/applications/bettertouchtool.cfg b/mackup/applications/bettertouchtool.cfg index 05107b89e..844db9539 100644 --- a/mackup/applications/bettertouchtool.cfg +++ b/mackup/applications/bettertouchtool.cfg @@ -3,4 +3,5 @@ name = BetterTouchTool [configuration_files] Library/Preferences/com.hegenberg.BetterTouchTool.plist +Library/Application Support/BetterTouchTool/btt_data_store.v2 Library/Application Support/BetterTouchTool/bttdata2 From 186ca9471af76a3580d092fc15fe64d242bcee60 Mon Sep 17 00:00:00 2001 From: Matthew Chellew Date: Fri, 9 Mar 2018 14:05:14 -0600 Subject: [PATCH 0737/1256] Fix support for Bettertouchtool (#1045) Credit where credit is due. --- CHANGELOG.md | 2 +- mackup/applications/bettertouchtool.cfg | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8d5a4d74..00521d96d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ - Add support for fastlane (via @revolter) - Add support for Insomnia (via @browniebroke) - Add support for Marked 2 (via @semicolonsnet) -- Add support for BetterTouchTool data store v2 (via @foray1010) +- Add support for BetterTouchTool data store v2 (via @pearlythepirate and @foray1010) - Add support for WhatsApp Web (via @cafferata) - Add support for GitUp (via @cafferata) - Add support for HTTPie (via @Dremora) diff --git a/mackup/applications/bettertouchtool.cfg b/mackup/applications/bettertouchtool.cfg index 844db9539..72a6e0512 100644 --- a/mackup/applications/bettertouchtool.cfg +++ b/mackup/applications/bettertouchtool.cfg @@ -5,3 +5,7 @@ name = BetterTouchTool Library/Preferences/com.hegenberg.BetterTouchTool.plist Library/Application Support/BetterTouchTool/btt_data_store.v2 Library/Application Support/BetterTouchTool/bttdata2 +Library/Application Support/BetterTouchTool/bettertouchtool.license +Library/Application Support/BetterTouchTool/btt_data_store.v2 +Library/Application Support/BetterTouchTool/btt_data_store.v2-shm +Library/Application Support/BetterTouchTool/btt_data_store.v2-wal From 4706e089b0404245750e05f67fc8f54a48452f86 Mon Sep 17 00:00:00 2001 From: Jonathan Forby Date: Fri, 9 Mar 2018 15:08:09 -0500 Subject: [PATCH 0738/1256] Add support for Blender (#1112) * Add support for Blender --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/blender.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/blender.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 00521d96d..3f7fa0c9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Add support for Tmuxp (via @infernion) - Add support for sferik/t (via @paxperscientiam) - Add support for fastlane (via @revolter) +- Add support for Blender (via @forby) - Add support for Insomnia (via @browniebroke) - Add support for Marked 2 (via @semicolonsnet) - Add support for BetterTouchTool data store v2 (via @pearlythepirate and @foray1010) diff --git a/README.md b/README.md index b99f446d3..64b371490 100644 --- a/README.md +++ b/README.md @@ -190,6 +190,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Billings Pro Server Admin](https://www.marketcircle.com/billingspro/download/billingspro-server/) - [Bitchx](http://www.bitchx.org/) - [Blackfire](https://blackfire.io/) +- [Blender](https://blender.org/) - [Boto](https://github.com/boto/boto) - [Boxer](http://boxerapp.com) - [Brackets](http://brackets.io/) diff --git a/mackup/applications/blender.cfg b/mackup/applications/blender.cfg new file mode 100644 index 000000000..0b00531ab --- /dev/null +++ b/mackup/applications/blender.cfg @@ -0,0 +1,6 @@ +[application] +name = Blender + +[configuration_files] +Library/Application Support/Blender +.config/blender From 610bd1118d3f7f8573136a16ac7c92c58d6c7870 Mon Sep 17 00:00:00 2001 From: Jonathan Forby Date: Fri, 9 Mar 2018 15:11:46 -0500 Subject: [PATCH 0739/1256] Add support for Jitouch (#1113) * Add support for Jitouch --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/jitouch.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/jitouch.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f7fa0c9b..daec8c293 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Add support for Tmuxp (via @infernion) - Add support for sferik/t (via @paxperscientiam) - Add support for fastlane (via @revolter) +- Add support for Jitouch (via @forby) - Add support for Blender (via @forby) - Add support for Insomnia (via @browniebroke) - Add support for Marked 2 (via @semicolonsnet) diff --git a/README.md b/README.md index 64b371490..97bd23b05 100644 --- a/README.md +++ b/README.md @@ -307,6 +307,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [iStat Menus 5](https://bjango.com/mac/istatmenus/) - [iTerm2](https://www.iterm2.com/) - [Janus](https://github.com/carlhuda/janus) +- [Jitouch](http://www.jitouch.com/) - [jrnl](http://maebert.github.io/jrnl/) - [JSHint](http://jshint.com/) - [Julia](http://julialang.org) diff --git a/mackup/applications/jitouch.cfg b/mackup/applications/jitouch.cfg new file mode 100644 index 000000000..cfb95118b --- /dev/null +++ b/mackup/applications/jitouch.cfg @@ -0,0 +1,5 @@ +[application] +name = Jitouch + +[configuration_files] +Library/Preferences/com.jitouch.Jitouch.plist From 466c8780e52c79816045594493b71bd9a84f18fa Mon Sep 17 00:00:00 2001 From: Wu Haotian Date: Sat, 10 Mar 2018 04:14:05 +0800 Subject: [PATCH 0740/1256] Add support for Amethyst (#1119) * Add support for Amethyst --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/amethyst.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/amethyst.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index daec8c293..79bfe56e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for Amethyst (via @whtsky) - Add support for Micro (via @icopp) - Add support for Cerebro (via @kelion) - Add support for iTerm (via @Sbastien) diff --git a/README.md b/README.md index 97bd23b05..f7e06341d 100644 --- a/README.md +++ b/README.md @@ -159,6 +159,7 @@ 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) - [Airmail](http://airmailapp.com/) +- [Amethyst](https://ianyh.com/amethyst/) - [Amphetamine](https://itunes.apple.com/us/app/amphetamine/id937984704) - [Ancient Domains of Mystery](http://www.adom.de/home/index.html) - [Android Studio](https://developer.android.com/sdk/) diff --git a/mackup/applications/amethyst.cfg b/mackup/applications/amethyst.cfg new file mode 100644 index 000000000..3865d6649 --- /dev/null +++ b/mackup/applications/amethyst.cfg @@ -0,0 +1,5 @@ +[application] +name = Amethyst + +[configuration_files] +Library/Preferences/com.amethyst.Amethyst.plist From 39e3db5e6b8599b12367a779b58da59f98bb7833 Mon Sep 17 00:00:00 2001 From: Guill Lo Date: Sat, 10 Mar 2018 03:26:51 +0700 Subject: [PATCH 0741/1256] Add support for iTermocil (#1122) * Add support for iTermocil --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/itermocil.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/itermocil.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 79bfe56e7..91dc9f887 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for iTermocil (via @godbout) - Add support for Amethyst (via @whtsky) - Add support for Micro (via @icopp) - Add support for Cerebro (via @kelion) diff --git a/README.md b/README.md index f7e06341d..04cbdde13 100644 --- a/README.md +++ b/README.md @@ -307,6 +307,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Irssi](http://www.irssi.org/) - [iStat Menus 5](https://bjango.com/mac/istatmenus/) - [iTerm2](https://www.iterm2.com/) +- [iTermocil](https://github.com/TomAnthony/itermocil) - [Janus](https://github.com/carlhuda/janus) - [Jitouch](http://www.jitouch.com/) - [jrnl](http://maebert.github.io/jrnl/) diff --git a/mackup/applications/itermocil.cfg b/mackup/applications/itermocil.cfg new file mode 100644 index 000000000..897756d98 --- /dev/null +++ b/mackup/applications/itermocil.cfg @@ -0,0 +1,5 @@ +[application] +name = iTermocil + +[configuration_files] +.itermocil From c0a4324463198d5a5ff2e992585993c955cda86c Mon Sep 17 00:00:00 2001 From: Jean-Philippe Farcy <3243324+jpfarcy@users.noreply.github.com> Date: Fri, 9 Mar 2018 21:29:38 +0100 Subject: [PATCH 0742/1256] Add support fort Openbox (#1132) * add openbox --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/openbox.cfg | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 mackup/applications/openbox.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 91dc9f887..b4799d711 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ - Add support for PHPStorm 2017.3 (via @cafferata) - Add support for DaisyDisk (via @cafferata) - Add support for MySQLWorkbench (via @cafferata) +- Add support for Openbox (via @jpfarcy) ## Mackup 0.8.16 diff --git a/README.md b/README.md index 04cbdde13..5219b1ed1 100644 --- a/README.md +++ b/README.md @@ -385,6 +385,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [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) - [OpenEmu](http://openemu.org) - [OpenSSH](http://www.openssh.com/) (NOTE: includes private keys) - [Paintbrush](http://paintbrush.sourceforge.net/) diff --git a/mackup/applications/openbox.cfg b/mackup/applications/openbox.cfg new file mode 100644 index 000000000..ed672ab4f --- /dev/null +++ b/mackup/applications/openbox.cfg @@ -0,0 +1,8 @@ +[application] +name = openbox + +[configuration_files] +.config/openbox/menu.xml +.config/openbox/rc.xml +.config/openbox/environment +.config/openbox/autostart From 1accd2e7aa19981b432ad9f367144c8a30dcd3bf Mon Sep 17 00:00:00 2001 From: Ivan Mir Date: Sat, 10 Mar 2018 16:00:14 -0300 Subject: [PATCH 0743/1256] Add support for Visual Studio for Mac (#1010) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/vs4mac.cfg | 7 +++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/vs4mac.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b4799d711..b8aef8a76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Add support for DaisyDisk (via @cafferata) - Add support for MySQLWorkbench (via @cafferata) - Add support for Openbox (via @jpfarcy) +- Add support for Visual Studio for Mac (via @ivmirx) ## Mackup 0.8.16 diff --git a/README.md b/README.md index 5219b1ed1..7431a619e 100644 --- a/README.md +++ b/README.md @@ -508,6 +508,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Viscosity](http://www.sparklabs.com/viscosity/) - [Visual Studio Code - Insiders](https://code.visualstudio.com) - [Visual Studio Code](https://code.visualstudio.com) +- [Visual Studio for Mac](https://www.visualstudio.com/vs/visual-studio-mac/) - [VLC](http://www.videolan.org/) - [Wakatime](https://wakatime.com/) - [WebStorm](https://www.jetbrains.com/webstorm/) diff --git a/mackup/applications/vs4mac.cfg b/mackup/applications/vs4mac.cfg new file mode 100644 index 000000000..72a9dd624 --- /dev/null +++ b/mackup/applications/vs4mac.cfg @@ -0,0 +1,7 @@ +[application] +name = Visual Studio for Mac + +[configuration_files] +Library/VisualStudio +Library/Preferences/VisualStudio/7.0/EditingLayout.xml +Library/Preferences/VisualStudio/7.0/MonoDevelopProperties.xml From 5609f25a2f291aedeeb54e58dd0219a23964a37e Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 15 Mar 2018 18:13:56 -0700 Subject: [PATCH 0744/1256] Mackup 0.8.17 --- CHANGELOG.md | 4 ++++ mackup/constants.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4799d711..01d86ddd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## WIP +## Mackup 0.8.17 + +- Add support for Micro (via @icopp) +- Add backing up vscode extensions for Visual Studio (via @stephen2m) - Add support for iTermocil (via @godbout) - Add support for Amethyst (via @whtsky) - Add support for Micro (via @icopp) diff --git a/mackup/constants.py b/mackup/constants.py index c37a25c9e..70ea15188 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.16' +VERSION = '0.8.17' # Support platforms PLATFORM_DARWIN = 'Darwin' From ee820867133f5f752dd45403b34da64cd93281c2 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 22 Mar 2018 08:13:38 -0700 Subject: [PATCH 0745/1256] Remove duplicate file for bettertouchtool (#1139) Fixes #1137 --- mackup/applications/bettertouchtool.cfg | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mackup/applications/bettertouchtool.cfg b/mackup/applications/bettertouchtool.cfg index 72a6e0512..04d3d074c 100644 --- a/mackup/applications/bettertouchtool.cfg +++ b/mackup/applications/bettertouchtool.cfg @@ -2,10 +2,9 @@ name = BetterTouchTool [configuration_files] -Library/Preferences/com.hegenberg.BetterTouchTool.plist -Library/Application Support/BetterTouchTool/btt_data_store.v2 -Library/Application Support/BetterTouchTool/bttdata2 Library/Application Support/BetterTouchTool/bettertouchtool.license Library/Application Support/BetterTouchTool/btt_data_store.v2 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 From 3cb8f38441d3da26d972c4c4208e4bac4b53b45a Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 22 Mar 2018 08:14:34 -0700 Subject: [PATCH 0746/1256] Add changelog entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01d86ddd9..fcdce886b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Fix BetterTouchTool support + ## Mackup 0.8.17 - Add support for Micro (via @icopp) From b0aa26ba632b3f1abf59d402ebc60a6ed6ce2b63 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Fri, 23 Mar 2018 04:59:04 +0800 Subject: [PATCH 0747/1256] config: Fix typo (#1138) --- mackup/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mackup/config.py b/mackup/config.py index 97f140e29..bb6de7c28 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -220,9 +220,9 @@ def _parse_path(self): # Python 2 and python 3 byte strings are different. if sys.version_info[0] < 3: - path = str(path) - else: path = path.decode("utf-8") + else: + path = str(path) return path From 684a9c2a0dd97ebbf42d2f972627083adab3680c Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 22 Mar 2018 14:00:51 -0700 Subject: [PATCH 0748/1256] Changelog update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fcdce886b..6ca1bd863 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Fix BetterTouchTool support +- Fixed an issue with python3 ## Mackup 0.8.17 From 80de5f27cc76576abeb6a7cb36d797b768f146df Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Thu, 22 Mar 2018 14:26:25 -0700 Subject: [PATCH 0749/1256] Mackup 0.8.18 --- CHANGELOG.md | 4 +++- mackup/constants.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ca1bd863..934b74d02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,9 @@ ## WIP -- Fix BetterTouchTool support +## Mackup 0.8.18 + +- Fix crash due to bad BetterTouchTool support - Fixed an issue with python3 ## Mackup 0.8.17 diff --git a/mackup/constants.py b/mackup/constants.py index 70ea15188..fa8c3980e 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.17' +VERSION = '0.8.18' # Support platforms PLATFORM_DARWIN = 'Darwin' From 38c03b8e0539ab487ab8d8308f9cfed0ffe1fe2d Mon Sep 17 00:00:00 2001 From: Guilhem Lettron Date: Fri, 23 Mar 2018 11:19:58 +0100 Subject: [PATCH 0750/1256] Add snap support More information on https://snapcraft.io/ --- snap/snapcraft.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 snap/snapcraft.yaml diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml new file mode 100644 index 000000000..6f34e84f3 --- /dev/null +++ b/snap/snapcraft.yaml @@ -0,0 +1,20 @@ +name: mackup +version: git +summary: Keep your application settings in sync +description: | + Back ups your application settings in a safe directory (e.g. Dropbox). + Syncs your application settings among all your workstations. + Restores your configuration on any fresh install in one command line. + +grade: stable +confinement: classic + +apps: + mackup: + command: bin/mackup + +parts: + mackup: + plugin: python + python-version: python3 + source: . From e5be435149e90ca8dd6da6add49e74db91ef6374 Mon Sep 17 00:00:00 2001 From: Guilhem Lettron Date: Sat, 24 Mar 2018 01:47:02 +0100 Subject: [PATCH 0751/1256] Use custom version-script https://bugs.launchpad.net/snapcraft/+bug/1706724/comments/1 for more information --- snap/snapcraft.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 6f34e84f3..a5e148567 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,6 @@ name: mackup version: git +version-script: "git describe --tags" summary: Keep your application settings in sync description: | Back ups your application settings in a safe directory (e.g. Dropbox). From bafb02bf78c118ec0b90b42b11db47cc645acd2f Mon Sep 17 00:00:00 2001 From: Chikahiro Tokoro Date: Mon, 26 Mar 2018 19:29:53 +0200 Subject: [PATCH 0752/1256] Add support for RubyMine 2017.3 (#1142) * Add support for RubyMine 2017.3 * fix style for markdown lint --- CHANGELOG.md | 2 ++ mackup/applications/rubymine.cfg | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 934b74d02..3cce3ebbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Support for RubyMine 2017.03 (via @kibitan) + ## Mackup 0.8.18 - Fix crash due to bad BetterTouchTool support diff --git a/mackup/applications/rubymine.cfg b/mackup/applications/rubymine.cfg index afb45b6ba..d578280d7 100644 --- a/mackup/applications/rubymine.cfg +++ b/mackup/applications/rubymine.cfg @@ -18,3 +18,5 @@ Library/Application Support/RubyMine2016.2 Library/Preferences/RubyMine2016.2 Library/Application Support/RubyMine2016.3 Library/Preferences/RubyMine2016.3 +Library/Application Support/RubyMine2017.3 +Library/Preferences/RubyMine2017.3 From 79d2b6ba3a21205cd9a78997adfe512642e846c7 Mon Sep 17 00:00:00 2001 From: Roger Raymond Date: Mon, 26 Mar 2018 16:09:20 -0400 Subject: [PATCH 0753/1256] Add additional Spectacle library path (#982) There is one more path for the Spectacle.app where the Shortcuts.json file is stored. This PR adds the Library/Application Support/Spectacle directory to the config. --- CHANGELOG.md | 1 + mackup/applications/spectacle.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cce3ebbf..160b572e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Support for RubyMine 2017.03 (via @kibitan) +- Add additional Spectacle library path (via @iansym) ## Mackup 0.8.18 diff --git a/mackup/applications/spectacle.cfg b/mackup/applications/spectacle.cfg index 13d103cdd..8e1535e2b 100644 --- a/mackup/applications/spectacle.cfg +++ b/mackup/applications/spectacle.cfg @@ -3,3 +3,4 @@ name = Spectacle [configuration_files] Library/Preferences/com.divisiblebyzero.Spectacle.plist +Library/Application Support/Spectacle From 4085725387d2624e2bb8c8974dd6d46c9050f7a8 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Fri, 30 Mar 2018 20:08:57 -0700 Subject: [PATCH 0754/1256] Improve CircleCI config (#1145) * Improve CircleCI config * bad yaml * remove dashes * bad yaml * fix docker image name * Split more CI steps * Fix CI --- .circleci/config.yml | 57 +++++++++++++++++++++++--------------------- Makefile | 5 +++- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a727752b3..fc7be3f26 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,40 +1,43 @@ version: 2 jobs: - "python": + + nose: + docker: + - image: python:2.7 + steps: + - checkout + - run: pip install -r requirements.txt + - run: make test + - run: codecov + + install: docker: - image: python:2.7 - working_directory: ~/repo steps: - checkout - - run: - name: install dependencies - command: | - pip install -r requirements.txt - python setup.py install - - run: - name: run tests - command: make test - - run: - name: codecov - command: codecov - "lint": + - run: python setup.py install + - run: mackup --help + + flake8: + docker: + - image: python:2.7 + steps: + - checkout + - run: pip install flake8 + - run: flake8 mackup + + mdl: docker: - - image: circleci/ruby:latest-browsers - working_directory: ~/repo + - image: rsrchboy/mdl steps: - checkout - - run: - name: install dependencies - command: | - apt-get update && apt-get install rubygems -y - gem install mdl - - run: - name: lint markdown - command: find . -name "*.md" -print0 | xargs -0 mdl + - run: mdl . workflows: version: 2 - build: + mackup: jobs: - - "python" - - "lint" + - nose + - install + - flake8 + - mdl diff --git a/Makefile b/Makefile index 3bb4bd8ab..e6ccfb1c2 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,11 @@ develop: undevelop: python setup.py develop --uninstall -test: +lint: + mdl . flake8 mackup + +test: nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup clean: From 27a215ddced602b1f50d6439fb149eacbc57c9f1 Mon Sep 17 00:00:00 2001 From: Alex Yeung Date: Wed, 4 Apr 2018 01:12:35 +0800 Subject: [PATCH 0755/1256] feat: only sync init.vim for neovim (#1147) --- CHANGELOG.md | 1 + mackup/applications/neovim.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 160b572e0..ddd4aaedc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Support for RubyMine 2017.03 (via @kibitan) - Add additional Spectacle library path (via @iansym) +- Only sync init.vim for neovim (via @foray1010) ## Mackup 0.8.18 diff --git a/mackup/applications/neovim.cfg b/mackup/applications/neovim.cfg index 01c4d5fdb..386810e20 100644 --- a/mackup/applications/neovim.cfg +++ b/mackup/applications/neovim.cfg @@ -2,6 +2,6 @@ name = neovim [configuration_files] -.config/nvim +.config/nvim/init.vim .nvimrc .nvim From 1176faf76933f9b4d7409698f526e4a55feaefe2 Mon Sep 17 00:00:00 2001 From: Chikahiro Tokoro Date: Wed, 25 Apr 2018 20:10:59 +0200 Subject: [PATCH 0756/1256] Add support for RubyMine 2018.1 (#1154) --- CHANGELOG.md | 1 + mackup/applications/rubymine.cfg | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddd4aaedc..f961aa2e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Support for RubyMine 2017.03 (via @kibitan) - Add additional Spectacle library path (via @iansym) - Only sync init.vim for neovim (via @foray1010) +- Support for RubyMine 2018.01 (via @kibitan) ## Mackup 0.8.18 diff --git a/mackup/applications/rubymine.cfg b/mackup/applications/rubymine.cfg index d578280d7..7a996e937 100644 --- a/mackup/applications/rubymine.cfg +++ b/mackup/applications/rubymine.cfg @@ -20,3 +20,5 @@ Library/Application Support/RubyMine2016.3 Library/Preferences/RubyMine2016.3 Library/Application Support/RubyMine2017.3 Library/Preferences/RubyMine2017.3 +Library/Application Support/RubyMine2018.1 +Library/Preferences/RubyMine2018.1 From 579a029cc49cda3722c3b4cf4be2d93b076ff34d Mon Sep 17 00:00:00 2001 From: Conor O'Kelly Date: Mon, 7 May 2018 04:07:16 +0100 Subject: [PATCH 0757/1256] Fix link in readme (#1155) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5219b1ed1..738d9e66f 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Keep your application settings in sync. - [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](#what-s-up-with-the-weird-name) +- [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 From 09488ae50a3c2b774f5f4b5573a154bbfa23abb1 Mon Sep 17 00:00:00 2001 From: Vinay V Date: Sun, 6 May 2018 20:11:31 -0700 Subject: [PATCH 0758/1256] Update for IntelliJ Idea (#1160) * Update intellijidea.cfg * Update CHANGELOG.md --- CHANGELOG.md | 1 + mackup/applications/intellijidea.cfg | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f961aa2e5..9b154a727 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Add additional Spectacle library path (via @iansym) - Only sync init.vim for neovim (via @foray1010) - Support for RubyMine 2018.01 (via @kibitan) +- Support for IntelliJ Idea 2017.1, 2017.2, 2017.3, and 2018.1 (via @cool00geek) ## Mackup 0.8.18 diff --git a/mackup/applications/intellijidea.cfg b/mackup/applications/intellijidea.cfg index e252907e6..deb05819b 100644 --- a/mackup/applications/intellijidea.cfg +++ b/mackup/applications/intellijidea.cfg @@ -14,11 +14,26 @@ Library/Preferences/IntelliJIdea14 .IntelliJIdea15/config/ Library/Application Support/IntelliJIdea15 Library/Preferences/IntelliJIdea15 +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/ From d7209ccdd6a60cd0832096065a9a82f53b9efd01 Mon Sep 17 00:00:00 2001 From: Nick Dancer Date: Fri, 11 May 2018 05:45:18 +1000 Subject: [PATCH 0759/1256] Remove note about OpenSSH private keys from README (#1024) * Remove note about OpenSSH private keys from README Private keys were removed from OpenSSH config in dcb26ba. * Remove more references to OpenSSH private keys * Update changelog * Fix layout of text to resolve CI error * Fix changelog update to be consistent with previous entries * Fix grammar --- CHANGELOG.md | 1 + README.md | 2 +- mackup/main.py | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b154a727..122c2af38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Only sync init.vim for neovim (via @foray1010) - Support for RubyMine 2018.01 (via @kibitan) - Support for IntelliJ Idea 2017.1, 2017.2, 2017.3, and 2018.1 (via @cool00geek) +- Remove references to OpenSSH private key syncing - removed in dcb26ba (via @njdancer) ## Mackup 0.8.18 diff --git a/README.md b/README.md index 738d9e66f..7b1f0526c 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. - [OmniGraffle](https://www.omnigroup.com/omnigraffle/) - [Openbox](http://openbox.org) - [OpenEmu](http://openemu.org) -- [OpenSSH](http://www.openssh.com/) (NOTE: includes private keys) +- [OpenSSH](http://www.openssh.com/) - [Paintbrush](http://paintbrush.sourceforge.net/) - [Pandoc](http://pandoc.org) - [Pass](http://www.passwordstore.org/) diff --git a/mackup/main.py b/mackup/main.py index c5e2b57e1..79b1da245 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -22,13 +22,13 @@ 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 - OpenSSH and GnuPG.) + GnuPG.) 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 (including private keys!) via -Dropbox, but may be configured to exclude applications or use a different +By default, Mackup syncs all application data (including some private keys!) +via Dropbox, but may be configured to exclude applications or use a different backend with a .mackup.cfg file. See https://github.com/lra/mackup/tree/master/doc for more information. From 522522b6c5c1d1b571297c48a3120ffc238fa969 Mon Sep 17 00:00:00 2001 From: Sallar Kaboli Date: Mon, 14 May 2018 08:20:40 +0300 Subject: [PATCH 0760/1256] Remove fish modules folder (#983) --- mackup/applications/fisherman.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/mackup/applications/fisherman.cfg b/mackup/applications/fisherman.cfg index 8306142f1..e3e1db0a2 100644 --- a/mackup/applications/fisherman.cfg +++ b/mackup/applications/fisherman.cfg @@ -2,5 +2,4 @@ name = Fisherman [configuration_files] -.config/fisherman .config/fish/fishfile From 7064b282260f26a9bedcc75164b5e083934d21a4 Mon Sep 17 00:00:00 2001 From: USAMI Kosuke Date: Wed, 23 May 2018 09:51:34 +0900 Subject: [PATCH 0761/1256] Add support for hub (#1166) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/hub.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/hub.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 122c2af38..f13aa85f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Support for RubyMine 2018.01 (via @kibitan) - Support for IntelliJ Idea 2017.1, 2017.2, 2017.3, and 2018.1 (via @cool00geek) - Remove references to OpenSSH private key syncing - removed in dcb26ba (via @njdancer) +- Add support for hub (via @usami-k) ## Mackup 0.8.18 diff --git a/README.md b/README.md index 7b1f0526c..d6d403f97 100644 --- a/README.md +++ b/README.md @@ -294,6 +294,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Houdini](http://uglyapps.co.uk/houdini/) - [Htop](http://htop.sourceforge.net/) - [HTTPie](https://httpie.org/) +- [hub](https://hub.github.com) - [Hyper.app](https://hyper.is/) - [HyperDock](https://bahoom.com/hyperdock) - [HyperSwitch](https://bahoom.com/hyperswitch) diff --git a/mackup/applications/hub.cfg b/mackup/applications/hub.cfg new file mode 100644 index 000000000..acdbbec50 --- /dev/null +++ b/mackup/applications/hub.cfg @@ -0,0 +1,5 @@ +[application] +name = hub + +[configuration_files] +.config/hub From da8c4414e3043e2bdc19aeb0ce75ad64dfb5edb7 Mon Sep 17 00:00:00 2001 From: Talal Anwar Date: Tue, 5 Jun 2018 03:46:20 +0200 Subject: [PATCH 0762/1256] remove references for vscode extensions (#1170) --- CHANGELOG.md | 1 + mackup/applications/vscode.cfg | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f13aa85f9..5344e2ca6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Support for IntelliJ Idea 2017.1, 2017.2, 2017.3, and 2018.1 (via @cool00geek) - Remove references to OpenSSH private key syncing - removed in dcb26ba (via @njdancer) - Add support for hub (via @usami-k) +- Remove references for Visual Studio Code extensions syncing (via @MTalalAnwar) ## Mackup 0.8.18 diff --git a/mackup/applications/vscode.cfg b/mackup/applications/vscode.cfg index 2ce4b83a4..9c5da5bed 100644 --- a/mackup/applications/vscode.cfg +++ b/mackup/applications/vscode.cfg @@ -6,9 +6,6 @@ Library/Application Support/Code/User/snippets Library/Application Support/Code/User/keybindings.json Library/Application Support/Code/User/settings.json -# user extensions -.vscode/extensions - # Linux Files .config/Code/User/snippets .config/Code/User/keybindings.json From 3ae58ca0204058ca4eb71330fac8a64cfe4794e1 Mon Sep 17 00:00:00 2001 From: Pablo Alejandro Costesich Date: Mon, 16 Jul 2018 06:20:23 -0300 Subject: [PATCH 0763/1256] Add support for `kubectl` CLI (#1074) * Add support for KubeCtl CLI This commit adds support for backing up the configuration file under `~/.kube/config`, which holds information of the clusters the user can manage. This tool can be installed stand-alone, so I have decided to separate it from the Minikube backups. Closes #1073. * fix concerns in PR --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/kubectl.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/kubectl.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5344e2ca6..d3ab35f51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for kubectl (via @pcostesi) - Support for RubyMine 2017.03 (via @kibitan) - Add additional Spectacle library path (via @iansym) - Only sync init.vim for neovim (via @foray1010) diff --git a/README.md b/README.md index d6d403f97..9ba8f7f7a 100644 --- a/README.md +++ b/README.md @@ -327,6 +327,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Keyboard Maestro](http://www.keyboardmaestro.com) - [Keymo](http://manytricks.com/keymo/) - [KeyRemap4MacBook](https://pqrs.org/osx/karabiner/) +- [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) - [LaunchBar](https://www.obdev.at/products/launchbar/index.html) diff --git a/mackup/applications/kubectl.cfg b/mackup/applications/kubectl.cfg new file mode 100644 index 000000000..11b5b7982 --- /dev/null +++ b/mackup/applications/kubectl.cfg @@ -0,0 +1,5 @@ +[application] +name = kubectl + +[configuration_files] +.kube/config From b13fb1135cba79b9ac9b31be7f6894ef336b670f Mon Sep 17 00:00:00 2001 From: Gabriel Augendre Date: Mon, 16 Jul 2018 18:03:15 +0200 Subject: [PATCH 0764/1256] Add doc and examples about spaces in paths (#1179) --- doc/.mackup.cfg | 3 +++ doc/README.md | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/doc/.mackup.cfg b/doc/.mackup.cfg index e100c03b7..26dcf1a16 100644 --- a/doc/.mackup.cfg +++ b/doc/.mackup.cfg @@ -27,11 +27,14 @@ engine = dropbox # The "path" can be absolute (from the / of your drive) or relative to your # home directory. # The "path" setting is mandatory when using the "file_system" engine. +# Note: you don't need to escape spaces or wrap the path in quotes. # [storage] # engine = file_system # path = some/folder/in/your/home # # or # path = /some/folder/in/your/root +# # or +# path = /some path/in/your/root # You can customize the directory name in which Mackup stores your file. By # default, if not specified, Mackup creates a "Mackup" directory in the storage diff --git a/doc/README.md b/doc/README.md index 3ff640996..7879d55a1 100644 --- a/doc/README.md +++ b/doc/README.md @@ -79,6 +79,14 @@ path = some/folder/in/your/home # or path = /some/folder/in/your/root ``` +Note: you don't need to escape spaces or wrap the path in quotes. +For example, the following paths are valid : + +```ini +path = some/path in your/home +path = /some path/in/your/root +``` + ### Custom Directory Name You can customize the directory name in which Mackup stores your file. By From 025b90d3e636de95fbf8c248aca9f14c7eaedea1 Mon Sep 17 00:00:00 2001 From: Albert Salim Date: Mon, 30 Jul 2018 07:49:46 +0800 Subject: [PATCH 0765/1256] Add support for asdf version manager (#1181) --- README.md | 1 + mackup/applications/asdf.cfg | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 mackup/applications/asdf.cfg diff --git a/README.md b/README.md index 9ba8f7f7a..66a66b441 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. - [Arm](https://www.atagar.com/arm/) - [Artistic Style](http://astyle.sourceforge.net) - [asciinema](https://asciinema.org/) +- [asdf version manager](https://github.com/asdf-vm/asdf) - [Aspell](http://aspell.net/) - [Atlantis](http://www.riverdark.net/atlantis/) - [Atom](https://atom.io/) diff --git a/mackup/applications/asdf.cfg b/mackup/applications/asdf.cfg new file mode 100644 index 000000000..df7bf9924 --- /dev/null +++ b/mackup/applications/asdf.cfg @@ -0,0 +1,6 @@ +[application] +name = asdf + +[configuration_files] +.asdfrc +.tool-versions From 372f48f1d1cdec7554bb0c8c9a1db91b8b7d3233 Mon Sep 17 00:00:00 2001 From: Care-Bear Date: Mon, 30 Jul 2018 00:51:45 +0100 Subject: [PATCH 0766/1256] Add support for vim8 native package mangement (#1180) --- mackup/applications/vim.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/vim.cfg b/mackup/applications/vim.cfg index 0d8c23ed2..f13b3f447 100644 --- a/mackup/applications/vim.cfg +++ b/mackup/applications/vim.cfg @@ -12,6 +12,7 @@ name = Vim .vim/ftdetect .vim/ftplugin .vim/indent +.vim/pack .vim/plugin/settings .vim/syntax .vim/vimrc From bf25bca766ce0630f8f16a8ae75ef2e52c89510b Mon Sep 17 00:00:00 2001 From: Sean Henderson Date: Sun, 29 Jul 2018 20:43:51 -0700 Subject: [PATCH 0767/1256] Support cVim, an extension that brings Vim bindings to Chrome. (#1192) cVim uses a [.cvimrc][1] file in the file system if the user has set `localconfig`. The file can be placed anywhere, but it seems likely that most people just drop it in `$HOME`. [1]: https://github.com/1995eaton/chromium-vim#example-configuration --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/cvim.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/cvim.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index d3ab35f51..1c627f9a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Remove references to OpenSSH private key syncing - removed in dcb26ba (via @njdancer) - Add support for hub (via @usami-k) - Remove references for Visual Studio Code extensions syncing (via @MTalalAnwar) +- Add support for cVim (via @sh78) ## Mackup 0.8.18 diff --git a/README.md b/README.md index 66a66b441..3535f7225 100644 --- a/README.md +++ b/README.md @@ -223,6 +223,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [CoRD](http://cord.sourceforge.net/) - [CotEditor](http://coteditor.com/) - [Ctags](http://ctags.sourceforge.net/) +- [cVim](https://github.com/1995eaton/chromium-vim) - [Cyberduck](https://cyberduck.io/) - [DaisyDisk](https://daisydiskapp.com) - [Dash](https://kapeli.com/dash) diff --git a/mackup/applications/cvim.cfg b/mackup/applications/cvim.cfg new file mode 100644 index 000000000..c8548c73d --- /dev/null +++ b/mackup/applications/cvim.cfg @@ -0,0 +1,5 @@ +[application] +name = cVim + +[configuration_files] +.cvimrc From 3c920923222d689c68c632aff415961b5b4d9975 Mon Sep 17 00:00:00 2001 From: Sean Henderson Date: Sun, 29 Jul 2018 20:45:45 -0700 Subject: [PATCH 0768/1256] Support chunkwm, a macOS tiling window manager. (#1191) [Docs][1]. [1]: https://koekeishiya.github.io/chunkwm/docs/userguide.html#configuration --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/chunkwm.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/chunkwm.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c627f9a8..3c4244852 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Remove references to OpenSSH private key syncing - removed in dcb26ba (via @njdancer) - Add support for hub (via @usami-k) - Remove references for Visual Studio Code extensions syncing (via @MTalalAnwar) +- Add support for chunkwm (via @sh78) - Add support for cVim (via @sh78) ## Mackup 0.8.18 diff --git a/README.md b/README.md index 3535f7225..4d312890f 100644 --- a/README.md +++ b/README.md @@ -205,6 +205,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Charles](http://www.charlesproxy.com) - [Chef](https://www.chef.io/chef/) - [Chicken](http://sourceforge.net/projects/chicken/) +- [chunkwm](https://github.com/koekeishiya/chunkwm) - [Clementine](https://www.clementine-player.org/) - [CLion](https://www.jetbrains.com/clion/) - [ClipMenu](http://www.clipmenu.com/) diff --git a/mackup/applications/chunkwm.cfg b/mackup/applications/chunkwm.cfg new file mode 100644 index 000000000..a72461e12 --- /dev/null +++ b/mackup/applications/chunkwm.cfg @@ -0,0 +1,6 @@ +[application] +name = chunkwm + +[configuration_files] +.chunkwmrc +.chunkwm_plugins From 1e7accfbba1dbe0d534190a8308cb0b7dfb947c1 Mon Sep 17 00:00:00 2001 From: Sean Henderson Date: Sun, 29 Jul 2018 20:47:17 -0700 Subject: [PATCH 0769/1256] Support Karabiner complex modifications. (#1190) Some Karabiner user also have this directory if they use the complex modifications. See [Karabiner docs][1] for more info. [1]: https://pqrs.org/osx/karabiner/json.html#location --- CHANGELOG.md | 1 + mackup/applications/karabiner-elements.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c4244852..1edd46907 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Remove references to OpenSSH private key syncing - removed in dcb26ba (via @njdancer) - Add support for hub (via @usami-k) - Remove references for Visual Studio Code extensions syncing (via @MTalalAnwar) +- Include Karabiner Elements complex modifications (via @sh78) - Add support for chunkwm (via @sh78) - Add support for cVim (via @sh78) diff --git a/mackup/applications/karabiner-elements.cfg b/mackup/applications/karabiner-elements.cfg index 239dc710e..c11fbf25e 100644 --- a/mackup/applications/karabiner-elements.cfg +++ b/mackup/applications/karabiner-elements.cfg @@ -3,3 +3,4 @@ name = Karabiner Elements [configuration_files] .config/karabiner/karabiner.json +.config/karabiner/assets/complex_modifications From 1f11875927a2c54f8b1667cbdef6cb40e858c9f2 Mon Sep 17 00:00:00 2001 From: Sean Henderson Date: Sun, 29 Jul 2018 20:48:44 -0700 Subject: [PATCH 0770/1256] Support latest qutebrowser version config paths. (#1189) qutebrowser has [changed the configuration paths][1]. The schema is now: ``` macOS/OS X .qutebrowser/config.py Linux .config/qutebrowser/config.py Legacy .config/qutebrowser/qutebrowser.conf ``` This commit includes all three, just to be on the safe side. [1]: https://github.com/qutebrowser/qutebrowser/blob/master/doc/help/configuring.asciidoc#configuring-qutebrowser --- CHANGELOG.md | 1 + mackup/applications/qutebrowser.cfg | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1edd46907..d812e95c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Remove references to OpenSSH private key syncing - removed in dcb26ba (via @njdancer) - Add support for hub (via @usami-k) - Remove references for Visual Studio Code extensions syncing (via @MTalalAnwar) +- Support latest qutebrowser version config paths (via @sh78) - Include Karabiner Elements complex modifications (via @sh78) - Add support for chunkwm (via @sh78) - Add support for cVim (via @sh78) diff --git a/mackup/applications/qutebrowser.cfg b/mackup/applications/qutebrowser.cfg index c082c2d8b..23b8aff72 100644 --- a/mackup/applications/qutebrowser.cfg +++ b/mackup/applications/qutebrowser.cfg @@ -2,4 +2,6 @@ name = Qutebrowser [configuration_files] +.qutebrowser/config.py +.config/qutebrowser/config.py .config/qutebrowser/qutebrowser.conf From 0b268a2ef7d6759b279141a2ec0fe286783040bd Mon Sep 17 00:00:00 2001 From: Sean Henderson Date: Sun, 29 Jul 2018 20:50:14 -0700 Subject: [PATCH 0771/1256] Support cheat (shell application). (#1188) User's custom "cheatsheets" (notes) are stored in ~/.cheat per the [documentation][1]. [1]: https://github.com/chrisallenlane/cheat#modifying-cheatsheets --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/cheat.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/cheat.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index d812e95c2..0c449484f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Remove references to OpenSSH private key syncing - removed in dcb26ba (via @njdancer) - Add support for hub (via @usami-k) - Remove references for Visual Studio Code extensions syncing (via @MTalalAnwar) +- Add support for Cheat (via @sh78) - Support latest qutebrowser version config paths (via @sh78) - Include Karabiner Elements complex modifications (via @sh78) - Add support for chunkwm (via @sh78) diff --git a/README.md b/README.md index 4d312890f..80aa43c0e 100644 --- a/README.md +++ b/README.md @@ -203,6 +203,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Cartographica](https://www.macgis.com/) - [Cerebro](https://cerebroapp.com/) - [Charles](http://www.charlesproxy.com) +- [Cheat](https://github.com/chrisallenlane/cheat) - [Chef](https://www.chef.io/chef/) - [Chicken](http://sourceforge.net/projects/chicken/) - [chunkwm](https://github.com/koekeishiya/chunkwm) diff --git a/mackup/applications/cheat.cfg b/mackup/applications/cheat.cfg new file mode 100644 index 000000000..cb9c714d9 --- /dev/null +++ b/mackup/applications/cheat.cfg @@ -0,0 +1,5 @@ +[application] +name = Cheat + +[configuration_files] +.cheat From 6322ab9194fdafc99669ae1bfa6da2fe1a0f843c Mon Sep 17 00:00:00 2001 From: Sean Henderson Date: Sun, 29 Jul 2018 20:51:34 -0700 Subject: [PATCH 0772/1256] Support ranger, a Vim-inspired file manager for the console. (#1187) Ranger can use [four main config files][1]. The entire `~/.config/ranger/` directory is not included because there may be bookmarks or other generated files that could become invalid on a different system [Plugins][2] are also included. [1]: https://github.com/ranger/ranger#getting-started [2]: https://github.com/ranger/ranger/wiki/Plugins --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/ranger.cfg | 9 +++++++++ 3 files changed, 11 insertions(+) create mode 100644 mackup/applications/ranger.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c449484f..09430e2b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Remove references to OpenSSH private key syncing - removed in dcb26ba (via @njdancer) - Add support for hub (via @usami-k) - Remove references for Visual Studio Code extensions syncing (via @MTalalAnwar) +- Add support for ranger (via @sh78) - Add support for Cheat (via @sh78) - Support latest qutebrowser version config paths (via @sh78) - Include Karabiner Elements complex modifications (via @sh78) diff --git a/README.md b/README.md index 80aa43c0e..ad3983b59 100644 --- a/README.md +++ b/README.md @@ -426,6 +426,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Qutebrowser](http://qutebrowser.org/) - [R](http://www.r-project.org/) - [Rails](http://rubyonrails.org/) +- [Ranger](https://ranger.github.io/) - [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/ranger.cfg b/mackup/applications/ranger.cfg new file mode 100644 index 000000000..fca092043 --- /dev/null +++ b/mackup/applications/ranger.cfg @@ -0,0 +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 From 528976338d3198cd044d1506b8c1a5d8a0447d44 Mon Sep 17 00:00:00 2001 From: Sean Henderson Date: Sun, 29 Jul 2018 20:54:41 -0700 Subject: [PATCH 0773/1256] Support skhd, a hotkey daemon for macOS. (#1186) [See configuration docs][1]. skhd is the successor of [khd][2], commonly used to control [chunkwm][3]. [1]: https://github.com/koekeishiya/skhd/#configuration [2]: https://github.com/koekeishiya/khd [3]: https://github.com/koekeishiya/chunkwm --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/skhd.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/skhd.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 09430e2b5..d9ae9a622 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Remove references to OpenSSH private key syncing - removed in dcb26ba (via @njdancer) - Add support for hub (via @usami-k) - Remove references for Visual Studio Code extensions syncing (via @MTalalAnwar) +- Support for skhd (via @sh78) - Add support for ranger (via @sh78) - Add support for Cheat (via @sh78) - Support latest qutebrowser version config paths (via @sh78) diff --git a/README.md b/README.md index ad3983b59..c71b4c9a3 100644 --- a/README.md +++ b/README.md @@ -459,6 +459,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [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/) - [Slate](https://github.com/jigish/slate) diff --git a/mackup/applications/skhd.cfg b/mackup/applications/skhd.cfg new file mode 100644 index 000000000..064ffd304 --- /dev/null +++ b/mackup/applications/skhd.cfg @@ -0,0 +1,5 @@ +[application] +name = skhd + +[configuration_files] +.skhdrc From 1538976bd70d474dd43a5908cbc21de2d53a81b3 Mon Sep 17 00:00:00 2001 From: Sean Henderson Date: Sun, 29 Jul 2018 20:55:58 -0700 Subject: [PATCH 0774/1256] Support khd, a modal hotkey daemon for macOS. (#1185) khd is no longer maintained, yet works well up to macOS High Sierra 11.13.6. It is a common keyboard daemon used for [chunkwm][1]. [See docs regarding config file[2]. [1]: https://github.com/koekeishiya/chunkwm [2]: https://github.com/koekeishiya/khd#configuration --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/khd.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/khd.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index d9ae9a622..f661495a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Remove references to OpenSSH private key syncing - removed in dcb26ba (via @njdancer) - Add support for hub (via @usami-k) - Remove references for Visual Studio Code extensions syncing (via @MTalalAnwar) +- Support for Khd (via @sh78) - Support for skhd (via @sh78) - Add support for ranger (via @sh78) - Add support for Cheat (via @sh78) diff --git a/README.md b/README.md index c71b4c9a3..d66c0f91e 100644 --- a/README.md +++ b/README.md @@ -331,6 +331,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Keyboard Maestro](http://www.keyboardmaestro.com) - [Keymo](http://manytricks.com/keymo/) - [KeyRemap4MacBook](https://pqrs.org/osx/karabiner/) +- [Khd](https://github.com/koekeishiya/khd/) - [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/khd.cfg b/mackup/applications/khd.cfg new file mode 100644 index 000000000..1a18d4b6d --- /dev/null +++ b/mackup/applications/khd.cfg @@ -0,0 +1,5 @@ +[application] +name = khd + +[configuration_files] +.khdrc From 0135e9cb9f59927276ec02665f35595cd8af886e Mon Sep 17 00:00:00 2001 From: Sean Henderson Date: Sun, 29 Jul 2018 20:57:02 -0700 Subject: [PATCH 0775/1256] Support Ruby Version Manager (RVM). (#1184) RVM checks for [`~/.rvmrc`][1] and loads that configuration after the defaults. [1]: https://rvm.io/workflow/rvmrc --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/rvm.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/rvm.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index f661495a0..e42ca7a2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Remove references to OpenSSH private key syncing - removed in dcb26ba (via @njdancer) - Add support for hub (via @usami-k) - Remove references for Visual Studio Code extensions syncing (via @MTalalAnwar) +- Add support for Ruby Version Manager (via @sh78) - Support for Khd (via @sh78) - Support for skhd (via @sh78) - Add support for ranger (via @sh78) diff --git a/README.md b/README.md index d66c0f91e..97e8e2c78 100644 --- a/README.md +++ b/README.md @@ -437,6 +437,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [RStudio](https://www.rstudio.com/) - [rTorrent](http://libtorrent.rakshasa.no/) - [Rubocop](https://github.com/bbatsov/rubocop) +- [Ruby Version Manager](https://rvm.io/) - [Ruby Version](https://gist.github.com/fnichol/1912050) - [Ruby](https://www.ruby-lang.org/) - [RubyMine](http://www.jetbrains.com/ruby/) diff --git a/mackup/applications/rvm.cfg b/mackup/applications/rvm.cfg new file mode 100644 index 000000000..6d9db1115 --- /dev/null +++ b/mackup/applications/rvm.cfg @@ -0,0 +1,5 @@ +[application] +name = Ruby Version Manager + +[configuration_files] +.rvmrc From ce7f162d9ca88c9447f439ac1ae4a05a85dd1a20 Mon Sep 17 00:00:00 2001 From: Sean Henderson Date: Sun, 29 Jul 2018 21:48:55 -0700 Subject: [PATCH 0776/1256] Support ESLint global configs. (#1183) * Support ESLint global configs. [ESLint configuration][1] can be set per project or globally with a file in `$HOME`. There are five potential file names. ESLint can also be configured by rules in a `~/package.json` file, but that is a different system and therefore not included here. [1]: https://eslint.org/docs/user-guide/configuring#configuring-eslint * Update README & CHANGELOG re: ESLint. --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/eslint.cfg | 9 +++++++++ 3 files changed, 11 insertions(+) create mode 100644 mackup/applications/eslint.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index e42ca7a2d..8d8b89cb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ - Include Karabiner Elements complex modifications (via @sh78) - Add support for chunkwm (via @sh78) - Add support for cVim (via @sh78) +- Add support for ESLint (via @sh78) ## Mackup 0.8.18 diff --git a/README.md b/README.md index 97e8e2c78..c048f79ca 100644 --- a/README.md +++ b/README.md @@ -249,6 +249,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/) +- [ESLint](https://eslint.org/) - [Exercism](http://exercism.io/) - [ExpanDrive](http://www.expandrive.com/) - [Factorio](https://www.factorio.com) diff --git a/mackup/applications/eslint.cfg b/mackup/applications/eslint.cfg new file mode 100644 index 000000000..ac17092f7 --- /dev/null +++ b/mackup/applications/eslint.cfg @@ -0,0 +1,9 @@ +[application] +name = ESLint + +[configuration_files] +.eslintrc.js +.eslintrc.yaml +.eslintrc.yml +.eslintrc.json +.eslintrc From 644d2f0a5a292476c5ce731d72c40b1d55e70bfb Mon Sep 17 00:00:00 2001 From: Sean Henderson Date: Thu, 2 Aug 2018 16:56:28 -0700 Subject: [PATCH 0777/1256] Add ~/Library locations for Mac Automator sources. (#1193) This adds coverage for everything that one might create in Automator. Make Use Of has a good [overview][makeuseof] of all of them, and Engaget has a [list of where they get saved][engaget]. I verified these using `fswatch` piped to `grep` while saving test projects. Included in this change: [Scripts] Library/Scripts [Dictation Commands] Library/Speech/Speakable Items [Services] Library/Services [Workflows] Library/Workflows Print Plugins Library/PDF Services "Folder Actions" and "Calendar Alarms" are stored inside a sub directories of ~/Library/Workflows/, and "Image Capture Plugins" are stored in ~/Library/Scripts/. [makeuseof]: https://www.makeuseof.com/tag/learn-mac-automator-handy-example-workflows/ [engaget]: https://www.engadget.com/2012/12/17/where-automator-actions-and-workflows-live/ [Scripts]: https://alvinalexander.com/blog/post/mac-os-x/where-put-applescript-program-script-directory-folder [Dictation Commands]: https://lifehacker.com/dictate-any-command-to-you-mac-with-automator-1647672204 [Services]: https://www.makeuseof.com/tag/how-to-create-your-own-services-menus-mac/ [Workflows]: https://support.apple.com/guide/automator/aside/aut56b81a021/2.8/mac/10.13 --- CHANGELOG.md | 1 + mackup/applications/macosx.cfg | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d8b89cb9..b1c3ea9fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - Add support for chunkwm (via @sh78) - Add support for cVim (via @sh78) - Add support for ESLint (via @sh78) +- Improve coverage for macOS/OS X Automator files (via @sh78) ## Mackup 0.8.18 diff --git a/mackup/applications/macosx.cfg b/mackup/applications/macosx.cfg index 551573e96..516495a12 100644 --- a/mackup/applications/macosx.cfg +++ b/mackup/applications/macosx.cfg @@ -4,4 +4,9 @@ name = MacOSX [configuration_files] .MacOSX Library/KeyBindings/DefaultKeyBinding.dict +Library/PDF Services Library/Preferences/com.apple.symbolichotkeys.plist +Library/Scripts +Library/Services +Library/Speech/Speakable Items +Library/Workflows From fa3031418d3a08479c54075cbe78e87541ad9d1a Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 2 Aug 2018 20:00:16 -0400 Subject: [PATCH 0778/1256] support for itsycal on mac (#1173) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/itsycal.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/itsycal.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b1c3ea9fe..b3c8e96ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Remove references to OpenSSH private key syncing - removed in dcb26ba (via @njdancer) - Add support for hub (via @usami-k) - Remove references for Visual Studio Code extensions syncing (via @MTalalAnwar) +- Support for Itsycal (via @paxperscientiam, @sfsam, nitrocode) - Add support for Ruby Version Manager (via @sh78) - Support for Khd (via @sh78) - Support for skhd (via @sh78) diff --git a/README.md b/README.md index c048f79ca..6588ada7b 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. - [IPython](http://ipython.org/) - [Irssi](http://www.irssi.org/) - [iStat Menus 5](https://bjango.com/mac/istatmenus/) +- [Itsycal](https://github.com/sfsam/Itsycal) - [iTerm2](https://www.iterm2.com/) - [iTermocil](https://github.com/TomAnthony/itermocil) - [Janus](https://github.com/carlhuda/janus) diff --git a/mackup/applications/itsycal.cfg b/mackup/applications/itsycal.cfg new file mode 100644 index 000000000..a1a2b1978 --- /dev/null +++ b/mackup/applications/itsycal.cfg @@ -0,0 +1,5 @@ +[application] +name = Itsycal + +[configuration_files] +Library/Preferences/com.mowglii.ItsycalApp.plist From a10d7c7a6d5a0f62f1fdaa027f84bed9266aa50f Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Mon, 6 Aug 2018 23:21:40 +0200 Subject: [PATCH 0779/1256] Add support for PhoneView (#1195) * Add support for PhoneView * Fix URL --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/phoneview.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/phoneview.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b3c8e96ee..1a8650549 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ - Add support for cVim (via @sh78) - Add support for ESLint (via @sh78) - Improve coverage for macOS/OS X Automator files (via @sh78) +- Add support for PhoneView (via @dnicolson) ## Mackup 0.8.18 diff --git a/README.md b/README.md index 6588ada7b..dcddc872c 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. - [Pentadactyl](http://5digits.org/pentadactyl/) - [Perl](https://www.perl.org/) - [Phoenix](https://github.com/kasper/phoenix) +- [PhoneView](https://www.ecamm.com/mac/phoneview/) - [PhpStorm](http://www.jetbrains.com/phpstorm/) - [Pidgin](https://www.pidgin.im) - [PIP](http://www.pip-installer.org/) diff --git a/mackup/applications/phoneview.cfg b/mackup/applications/phoneview.cfg new file mode 100644 index 000000000..b85b754d0 --- /dev/null +++ b/mackup/applications/phoneview.cfg @@ -0,0 +1,5 @@ +[application] +name = PhoneView + +[configuration_files] +Library/Preferences/com.ecamm.PhoneView.plist From e42b8c64733a6ed8fd58b656e8e53e9ad6703f5a Mon Sep 17 00:00:00 2001 From: allenlsy Date: Sun, 26 Aug 2018 18:15:06 -0400 Subject: [PATCH 0780/1256] add application Typora (#1206) * add application Typora * add typora to changelog --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/typora.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/typora.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a8650549..07e7a8ce1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ - Add support for ESLint (via @sh78) - Improve coverage for macOS/OS X Automator files (via @sh78) - Add support for PhoneView (via @dnicolson) +- Add support for Typora (via @allenlsy) ## Mackup 0.8.18 diff --git a/README.md b/README.md index dcddc872c..ccfb1b650 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. - [tvnamer](https://github.com/dbr/tvnamer) - [Twitterrific](http://twitterrific.com/) - [Typinator](http://www.ergonis.com/products/typinator/) +- [Typora](https://typora.io) - [uTorrent](http://www.utorrent.com/) - [Ventrilo](http://www.ventrilo.com/) - [Versions](http://www.versionsapp.com) diff --git a/mackup/applications/typora.cfg b/mackup/applications/typora.cfg new file mode 100644 index 000000000..fd394fc2d --- /dev/null +++ b/mackup/applications/typora.cfg @@ -0,0 +1,5 @@ +[application] +name = Typora + +[configuration_files] +Library/Application Support/abnerworks.Typora/themes From 8ec1e9f105bd6009425efce7400c7c68c0f7bbb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=AA=20Schneider?= Date: Sun, 26 Aug 2018 19:37:41 -0300 Subject: [PATCH 0781/1256] Added Cider support. (#1198) --- CHANGELOG.md | 1 + README.md | 11 ++++++----- mackup/applications/cider.cfg | 5 +++++ 3 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 mackup/applications/cider.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 07e7a8ce1..6c1d9b5e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ - Add support for ESLint (via @sh78) - Improve coverage for macOS/OS X Automator files (via @sh78) - Add support for PhoneView (via @dnicolson) +- Add support for Cider (via @renews) - Add support for Typora (via @allenlsy) ## Mackup 0.8.18 diff --git a/README.md b/README.md index ccfb1b650..b83d73206 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Keep your application settings in sync. - [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) +- [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) @@ -100,7 +100,7 @@ files are transfered). Mackup makes setting up the environment easy and simple, saving time for your family, great ideas, and all the cool stuff you like. -## Bullsh*t, what does it really do to my files +## Bullsh\*t, what does it really do to my files Let's take `git` as an example. Your settings for `git` are saved in your home folder, in the `.gitconfig` file. @@ -207,6 +207,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Chef](https://www.chef.io/chef/) - [Chicken](http://sourceforge.net/projects/chicken/) - [chunkwm](https://github.com/koekeishiya/chunkwm) +- [Cider](https://github.com/msanders/cider) - [Clementine](https://www.clementine-player.org/) - [CLion](https://www.jetbrains.com/clion/) - [ClipMenu](http://www.clipmenu.com/) @@ -234,8 +235,8 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Deal Alert](http://dealalertapp.com/) - [Default Folder X](http://www.stclairsoft.com/DefaultFolderX/) - [Devil's Pie 2](http://www.gusnan.se/devilspie2/) -- [Devil's Pie](https://en.wikipedia.org/wiki/Devil's_Pie_(software)) -- [dig](http://en.wikipedia.org/wiki/Dig_(command)) +- [Devil's Pie]() +- [dig]() - [Divvy](http://mizage.com/divvy/) - [Docker](https://www.docker.com/) - [Dolphin](https://dolphin-emu.org/) @@ -281,7 +282,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/) (NOTE: includes private keys) - [Go2Shell](http://zipzapmac.com/Go2Shell) - [Gogland](https://www.jetbrains.com/go/) - [GoShare](https://github.com/dictget/goshare) diff --git a/mackup/applications/cider.cfg b/mackup/applications/cider.cfg new file mode 100644 index 000000000..18bf1870c --- /dev/null +++ b/mackup/applications/cider.cfg @@ -0,0 +1,5 @@ +[application] +name = Cider + +[configuration_files] +.cider From 9ef02bdacadb3d0167f0203d20e6c8eeba1a2e41 Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Mon, 27 Aug 2018 03:02:16 +0200 Subject: [PATCH 0782/1256] Add support for PixelSnap (#1196) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/pixelsnap.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/pixelsnap.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c1d9b5e0..550b2ea95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ - Add support for ESLint (via @sh78) - Improve coverage for macOS/OS X Automator files (via @sh78) - Add support for PhoneView (via @dnicolson) +- Add support for PixelSnap (via @dnicolson) - Add support for Cider (via @renews) - Add support for Typora (via @allenlsy) diff --git a/README.md b/README.md index b83d73206..47a7d138c 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. - [PhpStorm](http://www.jetbrains.com/phpstorm/) - [Pidgin](https://www.pidgin.im) - [PIP](http://www.pip-installer.org/) +- [PixelSnap](https://getpixelsnap.com/) - [Poedit](http://poedit.net/) - [PokerStars](https://www.pokerstars.com/) - [PopClip](http://pilotmoon.com/popclip/) diff --git a/mackup/applications/pixelsnap.cfg b/mackup/applications/pixelsnap.cfg new file mode 100644 index 000000000..2906f142e --- /dev/null +++ b/mackup/applications/pixelsnap.cfg @@ -0,0 +1,5 @@ +[application] +name = PixelSnap + +[configuration_files] +Library/Preferences/com.getpixelsnap.app.plist From 80458a01a0655b454bf8a863d802ada4a67f80ad Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 26 Aug 2018 21:05:30 -0400 Subject: [PATCH 0783/1256] config file for ledger-cli (#1086) * config file for ledger-cli * add ledger to readme * add newline * add attribution * move change to WIP section of changelog --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/ledger.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/ledger.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 550b2ea95..2ff93b3ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Remove references to OpenSSH private key syncing - removed in dcb26ba (via @njdancer) - Add support for hub (via @usami-k) - Remove references for Visual Studio Code extensions syncing (via @MTalalAnwar) +- Add support for ledger/ledger (via @paxperscientiam) - Support for Itsycal (via @paxperscientiam, @sfsam, nitrocode) - Add support for Ruby Version Manager (via @sh78) - Support for Khd (via @sh78) diff --git a/README.md b/README.md index 47a7d138c..323e684f7 100644 --- a/README.md +++ b/README.md @@ -339,6 +339,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) +- [Ledger](http://ledger-cli.org) - [LibreOffice](https://www.libreoffice.org/) - [Liftoff](https://github.com/thoughtbot/liftoff) - [Light Table](http://lighttable.com/) diff --git a/mackup/applications/ledger.cfg b/mackup/applications/ledger.cfg new file mode 100644 index 000000000..5eeeb2e81 --- /dev/null +++ b/mackup/applications/ledger.cfg @@ -0,0 +1,5 @@ +[application] +name = ledger + +[configuration_files] +.ledgerrc From 6d802f4eecb3e2377d72d08343def08b1e69a7df Mon Sep 17 00:00:00 2001 From: Diego Vieira Date: Mon, 27 Aug 2018 02:11:46 +0100 Subject: [PATCH 0784/1256] Add support for Tower 3 (#1169) --- CHANGELOG.md | 1 + mackup/applications/tower-3.cfg | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 mackup/applications/tower-3.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ff93b3ee..5f7f8c8cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Support for IntelliJ Idea 2017.1, 2017.2, 2017.3, and 2018.1 (via @cool00geek) - Remove references to OpenSSH private key syncing - removed in dcb26ba (via @njdancer) - Add support for hub (via @usami-k) +- Add support for Tower 3 (via @diego-vieira) - Remove references for Visual Studio Code extensions syncing (via @MTalalAnwar) - Add support for ledger/ledger (via @paxperscientiam) - Support for Itsycal (via @paxperscientiam, @sfsam, nitrocode) diff --git a/mackup/applications/tower-3.cfg b/mackup/applications/tower-3.cfg new file mode 100644 index 000000000..ac508f84a --- /dev/null +++ b/mackup/applications/tower-3.cfg @@ -0,0 +1,6 @@ +[application] +name = Tower 3 + +[configuration_files] +Library/Application Support/com.fournova.Tower3 +Library/Preferences/com.fournova.Tower3.plist From c8c5bb3940961fff2de895bf7874f3da7fae47ea Mon Sep 17 00:00:00 2001 From: Florian Morello Date: Mon, 27 Aug 2018 03:16:59 +0200 Subject: [PATCH 0785/1256] Add support for PhpStorm2018.1 (#1153) --- mackup/applications/phpstorm.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg index 3e7fd7f00..7017bf394 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.1 +Library/Preferences/PhpStorm2018.1 Library/Application Support/PhpStorm2017.3 Library/Preferences/PhpStorm2017.3 Library/Application Support/PhpStorm2017.2 From 48f0f948e3ee4f4884bd5b48fce78fe5fe3dba22 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 26 Aug 2018 19:53:57 -0700 Subject: [PATCH 0786/1256] Add support for python 3.x (#1209) * Add support for python 3.x * Fix some python containers * F401 'sys' imported but unused * Remove codecov * Add changelog entry --- .circleci/config.yml | 117 ++++++++++++++++++++++++++++++++++++++++-- .gitignore | 3 ++ CHANGELOG.md | 1 + Makefile | 3 +- README.md | 1 - mackup/config.py | 9 +--- mackup/utils.py | 19 +++---- requirements.txt | 4 +- setup.py | 2 +- tests/config_tests.py | 5 +- tests/main_tests.py | 1 + tests/utils_test.py | 25 ++++----- 12 files changed, 143 insertions(+), 47 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fc7be3f26..2df88d55f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,16 +1,47 @@ version: 2 jobs: - nose: + nose-2.7: docker: - image: python:2.7 steps: - checkout - run: pip install -r requirements.txt - run: make test - - run: codecov - install: + nose-3.4: + docker: + - image: python:3.4 + steps: + - checkout + - run: pip install -r requirements.txt + - run: make test + + nose-3.5: + docker: + - image: python:3.5 + steps: + - checkout + - run: pip install -r requirements.txt + - run: make test + + nose-3.6: + docker: + - image: python:3.6 + steps: + - checkout + - run: pip install -r requirements.txt + - run: make test + + nose: + docker: + - image: python + steps: + - checkout + - run: pip install -r requirements.txt + - run: make test + + install-2.7: docker: - image: python:2.7 steps: @@ -18,13 +49,77 @@ jobs: - run: python setup.py install - run: mackup --help - flake8: + 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 + steps: + - checkout + - run: python setup.py install + - run: mackup --help + + install-3.6: + docker: + - image: python:3.6 + steps: + - checkout + - run: python setup.py install + - run: mackup --help + + install: + docker: + - image: python + steps: + - checkout + - run: python setup.py install + - run: mackup --help + + flake8-2.7: docker: - image: python:2.7 steps: - checkout - run: pip install flake8 - - run: flake8 mackup + - 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: + docker: + - image: python + steps: + - checkout + - run: pip install flake8 + - run: flake8 mdl: docker: @@ -37,7 +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 - mdl diff --git a/.gitignore b/.gitignore index 26bea1e0e..5e2e8eadb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ # Generated by make test /.coverage + +# Used by pyenv +/.python-version diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f7f8c8cf..908394407 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for Python 3.4 3.5 3.6 and 3.7 - Add support for kubectl (via @pcostesi) - Support for RubyMine 2017.03 (via @kibitan) - Add additional Spectacle library path (via @iansym) diff --git a/Makefile b/Makefile index e6ccfb1c2..09f13bb3b 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,9 @@ undevelop: python setup.py develop --uninstall lint: + # Install mdl with "gem install mdl" mdl . - flake8 mackup + flake8 test: nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup diff --git a/README.md b/README.md index 323e684f7..5998fd502 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ Keep your application settings in sync. [![Circle CI](https://circleci.com/gh/lra/mackup.svg?style=shield)](https://circleci.com/gh/lra/mackup) -[![codecov.io](https://codecov.io/github/lra/mackup/coverage.svg?branch=master)](http://codecov.io/github/lra/mackup?branch=master) ## Table of content diff --git a/mackup/config.py b/mackup/config.py index bb6de7c28..0c448544a 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -2,7 +2,6 @@ import os import os.path -import sys from .constants import (MACKUP_BACKUP_PATH, MACKUP_CONFIG_FILE, @@ -218,13 +217,7 @@ def _parse_path(self): raise ConfigError("The required 'path' can't be found while" " the 'file_system' engine is used.") - # Python 2 and python 3 byte strings are different. - if sys.version_info[0] < 3: - path = path.decode("utf-8") - else: - path = str(path) - - return path + return str(path) def _parse_directory(self): """ diff --git a/mackup/utils.py b/mackup/utils.py index dad9828fb..c3b485aa7 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -7,6 +7,7 @@ import subprocess import sys import sqlite3 +from six.moves import input from . import constants @@ -30,11 +31,7 @@ def confirm(question): return True while True: - # Python 3 check - if sys.version_info[0] < 3: - answer = raw_input(question + ' ').lower() - else: - answer = input(question + ' ').lower() + answer = input(question + ' ').lower() if answer == 'yes' or answer == 'y': confirmed = True @@ -206,7 +203,7 @@ def get_dropbox_folder_location(): data = f_hostdb.read().split() except IOError: error("Unable to find your Dropbox install =(") - dropbox_home = base64.b64decode(data[1]) + dropbox_home = base64.b64decode(data[1]).decode() return dropbox_home @@ -216,7 +213,7 @@ def get_google_drive_folder_location(): Try to locate the Google Drive folder. Returns: - (unicode) Full path to the current Google Drive folder + (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/' @@ -238,7 +235,7 @@ def get_google_drive_folder_location(): "WHERE entry_key = 'local_sync_root_path';") cur.execute(query) data = cur.fetchone() - googledrive_home = unicode(data[0]) + googledrive_home = str(data[0]) con.close() if not googledrive_home: @@ -274,7 +271,7 @@ def get_copy_folder_location(): Try to locate the Copy folder. Returns: - (unicode) Full path to the current Copy folder + (str) Full path to the current Copy folder """ copy_settings_path = 'Library/Application Support/Copy Agent/config.db' copy_home = None @@ -290,7 +287,7 @@ def get_copy_folder_location(): "WHERE option = 'csmRootPath';") cur.execute(query) data = cur.fetchone() - copy_home = unicode(data[0]) + copy_home = str(data[0]) cur.close() if not copy_home: @@ -313,7 +310,7 @@ def get_icloud_folder_location(): if not os.path.isdir(icloud_home): error('Unable to find your iCloud Drive =(') - return unicode(icloud_home) + return str(icloud_home) def is_process_running(process_name): diff --git a/requirements.txt b/requirements.txt index 535d969fe..2004cfe15 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,5 +2,5 @@ # Run "pip install -r requirements.txt" then "make test" nose flake8 -codecov -docopt \ No newline at end of file +docopt +six diff --git a/setup.py b/setup.py index c3e71a7fd..cfd89666f 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ keywords='configuration config dotfiles sync backup dropbox gdrive box', license='GPLv3', packages=['mackup'], - install_requires=['docopt'], + install_requires=['docopt', 'six'], entry_points={ 'console_scripts': [ 'mackup=mackup.main:main', diff --git a/tests/config_tests.py b/tests/config_tests.py index abfbe2594..dd363c27e 100644 --- a/tests/config_tests.py +++ b/tests/config_tests.py @@ -24,7 +24,8 @@ def test_config_no_config(self): assert cfg.engine == ENGINE_DROPBOX assert isinstance(cfg.path, str) - assert cfg.path == u'/home/some_user/Dropbox' + print(cfg.path) + assert cfg.path == '/home/some_user/Dropbox' assert isinstance(cfg.directory, str) assert cfg.directory == u'Mackup' @@ -204,7 +205,7 @@ def test_config_apps_to_ignore(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' diff --git a/tests/main_tests.py b/tests/main_tests.py index 3edda9e13..5474cc6de 100644 --- a/tests/main_tests.py +++ b/tests/main_tests.py @@ -1,6 +1,7 @@ import unittest from mackup import main + class TestMain(unittest.TestCase): def test_main_header(self): diff --git a/tests/utils_test.py b/tests/utils_test.py index 787c83ff4..d962bd4e4 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -18,31 +18,24 @@ def convert_to_octal(file_name): class TestMackup(unittest.TestCase): def test_confirm_yes(self): - # Override the raw_input used in utils - def custom_raw_input(_): + # Override the input used in utils + def custom_input(_): return 'Yes' - utils.raw_input = custom_raw_input + utils.input = custom_input assert utils.confirm('Answer Yes to this question') def test_confirm_no(self): - # Override the raw_input used in utils - def custom_raw_input(_): + # Override the input used in utils + def custom_input(_): return 'No' - utils.raw_input = custom_raw_input + utils.input = custom_input assert not utils.confirm('Answer No to this question') - def test_confirm_python3(self): - # Override the raw_input used in utils - def custom_raw_input(_): - raise NameError - # Also override input used in utils, because - utils.raw_input = custom_raw_input - def test_confirm_typo(self): - # Override the raw_input used in utils - def custom_raw_input(_): + # Override the input used in utils + def custom_input(_): return 'No' - utils.raw_input = custom_raw_input + utils.input = custom_input assert not utils.confirm('Answer garbage to this question') def test_delete_file(self): From 3626aca09e7af7d4a0bb2e4691a6745adde9f5d1 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 26 Aug 2018 19:55:53 -0700 Subject: [PATCH 0787/1256] Mackup v0.8.19 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 908394407..dc029d4cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.19 + - Add support for Python 3.4 3.5 3.6 and 3.7 - Add support for kubectl (via @pcostesi) - Support for RubyMine 2017.03 (via @kibitan) diff --git a/mackup/constants.py b/mackup/constants.py index fa8c3980e..efdfc47a0 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.18' +VERSION = '0.8.19' # Support platforms PLATFORM_DARWIN = 'Darwin' From 8d5fa9c21731bf64d6b77332ceea5954db90b054 Mon Sep 17 00:00:00 2001 From: Hoel IRIS Date: Tue, 28 Aug 2018 06:16:15 +0200 Subject: [PATCH 0788/1256] feat(oh-my-zsh): add completions default folder (#1207) `oh-my-zsh` default folder for custom auto-completions is `.oh-my-zsh/completions` so I propose to add it. --- CHANGELOG.md | 1 + mackup/applications/oh-my-zsh.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc029d4cf..251721c81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ - Add support for PixelSnap (via @dnicolson) - Add support for Cider (via @renews) - Add support for Typora (via @allenlsy) +- Improve support for oh-my-zsh (via @H--o-l) ## Mackup 0.8.18 diff --git a/mackup/applications/oh-my-zsh.cfg b/mackup/applications/oh-my-zsh.cfg index 43fcf8733..37e8aa59d 100644 --- a/mackup/applications/oh-my-zsh.cfg +++ b/mackup/applications/oh-my-zsh.cfg @@ -3,3 +3,4 @@ name = Oh My Zsh [configuration_files] .oh-my-zsh/custom +.oh-my-zsh/completions From 065390fbe8caf94267a73d1b3fd26b01a395ff79 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 28 Aug 2018 00:19:38 -0400 Subject: [PATCH 0789/1256] Mackup inkscape (#1211) * inkscape preferences file * made appropriate changes to changelog and readme * bump --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/inkscape.cfg | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/inkscape.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 251721c81..b1a1c8b3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Add support for inkscape (via @paxperscientiam) + ## Mackup 0.8.19 - Add support for Python 3.4 3.5 3.6 and 3.7 diff --git a/README.md b/README.md index 5998fd502..98dec4dca 100644 --- a/README.md +++ b/README.md @@ -307,6 +307,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [i3](https://i3wm.org/) - [i3wm](http://i3wm.org/) - [IdeaVim](https://github.com/JetBrains/ideavim) +- [Inkscape](https://inkscape.org/) - [Insomnia](https://insomnia.rest/) - [IntelliJIDEA](http://www.jetbrains.com/idea/) - [IPython](http://ipython.org/) diff --git a/mackup/applications/inkscape.cfg b/mackup/applications/inkscape.cfg new file mode 100644 index 000000000..c0b8e05ca --- /dev/null +++ b/mackup/applications/inkscape.cfg @@ -0,0 +1,5 @@ +[application] +name = inkscape + +[configuration_files] +.config/inkscape/preferences.xml From 044d052836225f728a31488117b5227e2d95f052 Mon Sep 17 00:00:00 2001 From: HlubyLuk Date: Wed, 29 Aug 2018 01:03:49 +0200 Subject: [PATCH 0790/1256] Tig xdg (#1199) * Add failobj for xdg_config_home * Add xdg node for tig * Update CHANGELOG.md. * Fix merge request notes. --- CHANGELOG.md | 2 ++ mackup/applications/tig.cfg | 3 +++ mackup/appsdb.py | 5 +++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1a1c8b3b..7b397ee52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## WIP - Add support for inkscape (via @paxperscientiam) +- Add default path for `XDG_CONFIG_HOME`. (via @HlubyLuk) +- Add tig `xdg_configuration_files` to config. (via @HlubyLuk) ## Mackup 0.8.19 diff --git a/mackup/applications/tig.cfg b/mackup/applications/tig.cfg index bd5753c1c..2d37b4996 100644 --- a/mackup/applications/tig.cfg +++ b/mackup/applications/tig.cfg @@ -3,3 +3,6 @@ name = Tig [configuration_files] .tigrc + +[xdg_configuration_files] +tig/config diff --git a/mackup/appsdb.py b/mackup/appsdb.py index 8c46e8013..0458af013 100644 --- a/mackup/appsdb.py +++ b/mackup/appsdb.py @@ -54,12 +54,13 @@ def __init__(self): self.apps[app_name]['configuration_files'].add(path) # Add the XDG configuration files to sync - xdg_config_home = os.environ.get('XDG_CONFIG_HOME') + 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)) - home = os.path.expanduser('~/') if not xdg_config_home.startswith(home): raise ValueError('$XDG_CONFIG_HOME: {} must be ' 'somewhere within your home ' From e29e7b080794f76737a2e2b6c717efabe7c507d1 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 29 Aug 2018 15:13:53 -0700 Subject: [PATCH 0791/1256] Move the changelog under WIP --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ea3c41d1..56645f927 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Add support for inkscape (via @paxperscientiam) - Add default path for `XDG_CONFIG_HOME`. (via @HlubyLuk) - Add tig `xdg_configuration_files` to config. (via @HlubyLuk) +- Add support for Visual Studio for Mac (via @ivmirx) ## Mackup 0.8.19 @@ -72,7 +73,6 @@ - Add support for DaisyDisk (via @cafferata) - Add support for MySQLWorkbench (via @cafferata) - Add support for Openbox (via @jpfarcy) -- Add support for Visual Studio for Mac (via @ivmirx) ## Mackup 0.8.16 From c32cf31b1e77be4a626e8ae0095614da815de611 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Fri, 31 Aug 2018 16:40:53 -0700 Subject: [PATCH 0792/1256] Add missing changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56645f927..d9bb50e3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Add default path for `XDG_CONFIG_HOME`. (via @HlubyLuk) - Add tig `xdg_configuration_files` to config. (via @HlubyLuk) - Add support for Visual Studio for Mac (via @ivmirx) +- Add support for snapcraft (thx @guilhem) ## Mackup 0.8.19 From 698be2ffed4e14643655714aaf4155d557c69ec8 Mon Sep 17 00:00:00 2001 From: Steve Dondley Date: Sun, 2 Sep 2018 19:32:21 -0400 Subject: [PATCH 0793/1256] Create configuration_merge_guide.md (#1204) * Create configuration_merge_guide.md Provides guidance and suggestions on how to merge configuration file across two or more machines. * fixed formatting errors * remove blank lines from around lists * fix more formatting errors * add blank lines aroundlist items * remove blank lines (ugh) * try to fix list again * fix line breaks * Update configuration_merge_guide.md * add maintainers fixes/suggestion from #1294 * markdown fixes --- doc/configuration_merge_guide.md | 171 +++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) create mode 100644 doc/configuration_merge_guide.md diff --git a/doc/configuration_merge_guide.md b/doc/configuration_merge_guide.md new file mode 100644 index 000000000..f793e8d49 --- /dev/null +++ b/doc/configuration_merge_guide.md @@ -0,0 +1,171 @@ +# Guide for Merging Configurations Across Machines + +This guide is for users who want to combine configuration settings for two or +more machines. + +For example, you might have some bash settings on Machine A (like useful +command aliases) that are not on Machine B. You also have some settings on +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. + +## Step 0: Read Through This Entire Guide First + +It will probably save you some pain in the long run. + +## Step 1: Determine Which Configuration Files to Merge + +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** + in the example below with the name of your application. + +``` +[applications_to_sync] +bash +``` + +You can get a list of supported apps by running `mackup list`. + +1. Save the file +1. Run the following command: + +`mackup --dry-run --verbose backup` + +This command will let you see what mackup will do behind the scenes when it +backs up your application's configuration files so you can readily see what +configuration files Mackup will sync. Make note of these files. + +## Step 2: Prepare Your Workstations for Syncing + +Now that you've identified which files you have to merge, choose one of the two +approaches below for merging the configuration files. **Method 1** has you do all +the configuration file merges first and then pushes out them out with Mackup. +With **Method 2**, you'll push out the configuration files from one machine to the +others and then merge in your configuration changes gradually over time. + +Which method should you use? It doesn't really matter. Method 1 is more work up +front in exchange for less work later. Method 2 is less work up front but more +work later. + +Method 1 is probably best if you have very dissimilar configurations and have +few machines. Method 2 is probably best if you have a machine that is very +close to working the way you want and just need a few configuration settings +from other machines. + +### Method 1: Backup Merge-Push Approach + +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 + matter which one. +1. 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. + +#### Method 1 Example + +Let's say we have two machines, A and B and that we want to sync our bash configuration +across the machines. We decide that Machine A will serve as our master. + +First, backup the bash configuration files (there are a few of them) +for your application on all machines. + +##### Sample backup commands for Machine A** + +``` +mkdir ~/bash_backup +cp ~/.bash_profile ~/bash_backup/bash_profile.bak +cp ~/.bash_login ~/bash_backup/bash_login.bak + +...plus any other bash config files you want to keep +``` + +##### Sample backup commands for Machine B + +``` +mkdir ~/bash_backup +cp ~/.bash_profile ~/bash_backup/bash_profile.bak +cp ~/.bash_login ~/bash_backup/bash_login.bak + +...plus any other bash config files you want to keep +``` + +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: + +``` +vim .bash_profile +vim .bash_login +``` + +When editing these configuration files on Machine A, copy and 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. + +### Method 2: Backup Push-Merge Approach + +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 + configuration files for each app that you want to sync. That's it for now. + However, there will be more work for you later. + +#### Method 2 Example + +Let's say we have two machines, A and B and that we want to sync our bash configuration +across the machines. We decide that Machine A will serve as our master. + +Since A is our master, we only need to backup the bash configuration files on +Machine B: + +##### Sample backup commands for Machine B** + +``` +mkdir ~/bash_backup +cp ~/.bash_profile ~/bash_backup/bash_profile.bak +cp ~/.bash_login ~/bash_backup/bash_login.bak + +...plus any other bash config files you want to keep +``` + +If you have other machines you are syncing with the master, back those up, woo. + +## Step 3: Push Out the Configuration Files with Mackup + +Now you are ready to use Mackup to push out the changes. You should have Mackup +already installed and the `.mackup.cfg` file in place according to the +instructions provided above. If not, do that before proceeding. + +Run the following command on the master machine: + +`mackup backup` + +On each of the other "slave" machines, run: + +`mackup restore` + +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 +machines using mackup. + +If you used Method 2, you'll need to merge in new features over time. As you +discover features you need to add, you'll need to take the appropriate snippets +of configuration code from the backup configuration files you created and +insert them into the appropriate configuration file. Remember it does not matter +which machine's configuration file you update as these configuration files are +now shared across all machines. From 7479d84fbc620ade26f32f057072c11685c53cb0 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 2 Sep 2018 18:00:59 -0700 Subject: [PATCH 0794/1256] Forgot to add coverage for `make test` --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 2004cfe15..e4c375a7e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,3 +4,4 @@ nose flake8 docopt six +coverage From 1cee6737b48345d76c8808ba368894341cf5c35f Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 3 Sep 2018 23:19:03 -0400 Subject: [PATCH 0795/1256] Update mpv.cfg (#1214) From the maintainer of `mpv` on macports: > If you previously had your configuration file in > * ~/.mpv/config > please migrate it to > * ~/.config/mpv/config > which is the location preferred by upstream. --- mackup/applications/mpv.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mackup/applications/mpv.cfg b/mackup/applications/mpv.cfg index f74f37f55..3ad60ec59 100644 --- a/mackup/applications/mpv.cfg +++ b/mackup/applications/mpv.cfg @@ -2,6 +2,7 @@ name = MPV [configuration_files] +.config/mpv/config .config/mpv/mpv.conf .config/mpv/scripts .config/mpv/input.conf From 96bf11e0610bdb14ee5921767296b9ec54eb9641 Mon Sep 17 00:00:00 2001 From: glaszig Date: Tue, 4 Sep 2018 21:04:52 +0200 Subject: [PATCH 0796/1256] backup pip.conf from all the possible places named on the docs (#972) * backup pip.conf from all the possible places named on the docs see https://pip.pypa.io/en/stable/user_guide/#config-file * Update pip.cfg --- mackup/applications/pip.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mackup/applications/pip.cfg b/mackup/applications/pip.cfg index 97e776462..f1f6dd1a2 100644 --- a/mackup/applications/pip.cfg +++ b/mackup/applications/pip.cfg @@ -2,4 +2,8 @@ name = pip [configuration_files] +Library/Application Support/pip/pip.conf .pip/pip.conf + +[xdg_configuration_files] +pip/pip.conf From dd53e6f355910197ebaee242aadc1e72caff2994 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 8 Sep 2018 20:54:06 -0700 Subject: [PATCH 0797/1256] Remove support for Amphetamine as it's containerized --- CHANGELOG.md | 1 + mackup/applications/amphetamine.cfg | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 mackup/applications/amphetamine.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index d9bb50e3d..fe9074f02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Remove support for Amphetamine as it's containerized - Add support for inkscape (via @paxperscientiam) - Add default path for `XDG_CONFIG_HOME`. (via @HlubyLuk) - Add tig `xdg_configuration_files` to config. (via @HlubyLuk) diff --git a/mackup/applications/amphetamine.cfg b/mackup/applications/amphetamine.cfg deleted file mode 100644 index 2d4548687..000000000 --- a/mackup/applications/amphetamine.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[application] -name = Amphetamine - -[configuration_files] -Library/Containers/com.if.Amphetamine/Data/Library/Preferences/com.if.Amphetamine.plist From 951c828b9f92f548e81b92184191ba90b4bbe0d6 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sat, 8 Sep 2018 20:55:42 -0700 Subject: [PATCH 0798/1256] Removed Amphetamine from the list of supported apps --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index e114aaa8e..3dc949fe9 100644 --- a/README.md +++ b/README.md @@ -159,7 +159,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Adobe Photoshop Lightroom CC](https://www.adobe.com/products/photoshop-lightroom.html) - [Airmail](http://airmailapp.com/) - [Amethyst](https://ianyh.com/amethyst/) -- [Amphetamine](https://itunes.apple.com/us/app/amphetamine/id937984704) - [Ancient Domains of Mystery](http://www.adom.de/home/index.html) - [Android Studio](https://developer.android.com/sdk/) - [Ansible](http://www.ansible.com/) From f0af8413e9dea8442b655cccef290d285643f71e Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 10 Sep 2018 13:59:53 -0700 Subject: [PATCH 0799/1256] Remove Z's support (#1217) --- CHANGELOG.md | 1 + README.md | 1 - mackup/applications/z.cfg | 5 ----- 3 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 mackup/applications/z.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index fe9074f02..5de0d6c17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Remove support for Z as the link is being overwritten by the application - Remove support for Amphetamine as it's containerized - Add support for inkscape (via @paxperscientiam) - Add default path for `XDG_CONFIG_HOME`. (via @HlubyLuk) diff --git a/README.md b/README.md index 3dc949fe9..7d2e7f483 100644 --- a/README.md +++ b/README.md @@ -543,7 +543,6 @@ See the [README](doc/README.md) file in the doc directory for more info. - [XLD](http://tmkk.undo.jp/xld/) - [XtraFinder](http://www.trankynam.com/xtrafinder/) - [Yummy FTP](http://www.yummysoftware.com/) -- [z](https://github.com/rupa/z) - [zathura](https://pwmt.org/projects/zathura/) - [Zsh](http://zsh.sourceforge.net/) - [Übersicht](http://tracesof.net/uebersicht/) diff --git a/mackup/applications/z.cfg b/mackup/applications/z.cfg deleted file mode 100644 index 44db737dd..000000000 --- a/mackup/applications/z.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[application] -name = z - -[configuration_files] -.z From 953edb5f088c807be880307c7654490b54180c04 Mon Sep 17 00:00:00 2001 From: Raymond Rutjes Date: Fri, 14 Sep 2018 10:41:25 +0200 Subject: [PATCH 0800/1256] Add support for GoLand (#1218) --- CHANGELOG.md | 1 + README.md | 2 +- mackup/applications/gogland.cfg | 7 ------- mackup/applications/goland.cfg | 13 +++++++++++++ 4 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 mackup/applications/gogland.cfg create mode 100644 mackup/applications/goland.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 5de0d6c17..00b9b8c50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Add tig `xdg_configuration_files` to config. (via @HlubyLuk) - Add support for Visual Studio for Mac (via @ivmirx) - Add support for snapcraft (thx @guilhem) +- Add support for GoLand and renamed Gogland to GoLand (via @rayrutjes) ## Mackup 0.8.19 diff --git a/README.md b/README.md index 7d2e7f483..b48c724a6 100644 --- a/README.md +++ b/README.md @@ -282,7 +282,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/) (NOTE: includes private keys) - [Go2Shell](http://zipzapmac.com/Go2Shell) -- [Gogland](https://www.jetbrains.com/go/) +- [GoLand](https://www.jetbrains.com/go/) - [GoShare](https://github.com/dictget/goshare) - [Gradle](http://gradle.org) - [GrandTotal 3](http://www.mediaatelier.com/GrandTotal4/) diff --git a/mackup/applications/gogland.cfg b/mackup/applications/gogland.cfg deleted file mode 100644 index ed2cd2ffd..000000000 --- a/mackup/applications/gogland.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[application] -name = Gogland - -[configuration_files] -Library/Preferences/com.jetbrains.gogland-EAP.plist -Library/Application Support/Gogland1.0 -Library/Preferences/Gogland1.0 diff --git a/mackup/applications/goland.cfg b/mackup/applications/goland.cfg new file mode 100644 index 000000000..0ae90b1fc --- /dev/null +++ b/mackup/applications/goland.cfg @@ -0,0 +1,13 @@ +[application] +name = GoLand + +[configuration_files] +Library/Preferences/com.jetbrains.gogland-EAP.plist +Library/Application Support/Gogland1.0 +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 From 12cfa73f9f56edd86556696545cf9896bb5b8428 Mon Sep 17 00:00:00 2001 From: beerChili Date: Sun, 16 Sep 2018 00:14:01 +0200 Subject: [PATCH 0801/1256] Add Idea2018.2 CE & UE config (#1220) * Add Idea2018.2 CE & UE config * Update intellijidea.cfg --- mackup/applications/intellijidea.cfg | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mackup/applications/intellijidea.cfg b/mackup/applications/intellijidea.cfg index deb05819b..08b587e84 100644 --- a/mackup/applications/intellijidea.cfg +++ b/mackup/applications/intellijidea.cfg @@ -37,3 +37,9 @@ 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/ From e742423f477e19a459821a31ad3e449fc8c7c580 Mon Sep 17 00:00:00 2001 From: Kevin Murphy Date: Wed, 19 Sep 2018 13:19:46 -0600 Subject: [PATCH 0802/1256] Add support for Xonsh shell (#1223) * new file: xonsh.cfg modified: CHANGELOG.md modified: README.md Adding application xonsh, issue #1222 * modified: CHANGELOG.md modified: README.md * changed application name from xonsh to Xonsh (pretty name) in xonsh.cfg --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/xonsh.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/xonsh.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 00b9b8c50..d65f73da1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Add support for Visual Studio for Mac (via @ivmirx) - Add support for snapcraft (thx @guilhem) - Add support for GoLand and renamed Gogland to GoLand (via @rayrutjes) +- Add support for xonsh (via @kmcm0) ## Mackup 0.8.19 diff --git a/README.md b/README.md index b48c724a6..b0ad48021 100644 --- a/README.md +++ b/README.md @@ -541,6 +541,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Xcode](https://developer.apple.com/xcode/) - [XEmacs](http://www.xemacs.org/) - [XLD](http://tmkk.undo.jp/xld/) +- [Xonsh](https://xon.sh) - [XtraFinder](http://www.trankynam.com/xtrafinder/) - [Yummy FTP](http://www.yummysoftware.com/) - [zathura](https://pwmt.org/projects/zathura/) diff --git a/mackup/applications/xonsh.cfg b/mackup/applications/xonsh.cfg new file mode 100644 index 000000000..7f06fe8db --- /dev/null +++ b/mackup/applications/xonsh.cfg @@ -0,0 +1,5 @@ +[application] +name = Xonsh + +[configuration_files] +.xonshrc From 74684891d1d59332fbe04ecee9dab2261211111d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Cimper=C5=A1ak?= Date: Fri, 28 Sep 2018 18:53:20 +0200 Subject: [PATCH 0803/1256] fixed link for vscode insiders (#999) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b0ad48021..dcc9ba886 100644 --- a/README.md +++ b/README.md @@ -522,7 +522,7 @@ 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 - Insiders](https://code.visualstudio.com) +- [Visual Studio Code - Insiders](https://code.visualstudio.com/insiders) - [Visual Studio Code](https://code.visualstudio.com) - [Visual Studio for Mac](https://www.visualstudio.com/vs/visual-studio-mac/) - [VLC](http://www.videolan.org/) From a70eea63739e627658569078f6f37c60d7b0928a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E6=98=82?= Date: Mon, 1 Oct 2018 03:51:58 +0800 Subject: [PATCH 0804/1256] Update application.py (#1228) --- mackup/application.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/application.py b/mackup/application.py index 040066c93..e0a78c3f4 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -35,7 +35,7 @@ def getFilepaths(self, filename): Get home and mackup filepaths for given file Args: - filepath (str) + filename (str) Returns: home_filepath, mackup_filepath (str, str) From 70098f4a160c93891cd1b9de6627d2a355dfe5d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20D=C3=B6ll?= Date: Fri, 5 Oct 2018 10:41:08 -0400 Subject: [PATCH 0805/1256] feat: ~ supporting Alacritty (#1229) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/alacritty.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/alacritty.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index d65f73da1..b5c39ba7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Add support for snapcraft (thx @guilhem) - Add support for GoLand and renamed Gogland to GoLand (via @rayrutjes) - Add support for xonsh (via @kmcm0) +- Add support for Alacritty ## Mackup 0.8.19 diff --git a/README.md b/README.md index dcc9ba886..8c1fc7ab8 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. - [Adobe Photoshop CC](http://www.adobe.com/products/photoshop.html) - [Adobe Photoshop Lightroom CC](https://www.adobe.com/products/photoshop-lightroom.html) - [Airmail](http://airmailapp.com/) +- [Alacritty](https://github.com/jwilm/alacritty) - [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/alacritty.cfg b/mackup/applications/alacritty.cfg new file mode 100644 index 000000000..44cab2936 --- /dev/null +++ b/mackup/applications/alacritty.cfg @@ -0,0 +1,5 @@ +[application] +name = Alacritty + +[configuration_files] +.alacritty.yml From 40d143a46c8fc2047139cc3eee783adc57ebe110 Mon Sep 17 00:00:00 2001 From: Krzysztof Karol Date: Mon, 8 Oct 2018 22:51:32 +0200 Subject: [PATCH 0806/1256] Add support for WebStorm 2017.1, 2017.2, 2017.3 (#1123) * Add support for WebStorm 2017.1 Add support for WebStorm 2017.2 Add support for WebStorm 2017.3 * Add support for Webstorm 2018.1 and Webstorm 2018.2 --- CHANGELOG.md | 1 + mackup/applications/webstorm.cfg | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5c39ba7b..2f7060179 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Add support for GoLand and renamed Gogland to GoLand (via @rayrutjes) - 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) ## Mackup 0.8.19 diff --git a/mackup/applications/webstorm.cfg b/mackup/applications/webstorm.cfg index f2991dd5e..1a9a080cc 100644 --- a/mackup/applications/webstorm.cfg +++ b/mackup/applications/webstorm.cfg @@ -16,3 +16,13 @@ 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 From 52ac9ccad2db6d6be3f1d0949a26cd1da28057ed Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 16 Oct 2018 16:14:29 -0700 Subject: [PATCH 0807/1256] Mackup 0.8.20 --- CHANGELOG.md | 2 ++ mackup/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f7060179..b5619a426 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.20 + - Remove support for Z as the link is being overwritten by the application - Remove support for Amphetamine as it's containerized - Add support for inkscape (via @paxperscientiam) diff --git a/mackup/constants.py b/mackup/constants.py index efdfc47a0..9df6fa1fe 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = '0.8.19' +VERSION = '0.8.20' # Support platforms PLATFORM_DARWIN = 'Darwin' From 8aa41ac42f1a1cd12e558f4b2d714daa34918ac8 Mon Sep 17 00:00:00 2001 From: Herman van Boeijen Date: Mon, 29 Oct 2018 11:36:00 +0100 Subject: [PATCH 0808/1256] 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 0809/1256] 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 0810/1256] 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 62a01ccb107d5ebd191057c76f0ecde773424986 Mon Sep 17 00:00:00 2001 From: Landon Schropp Date: Mon, 29 Oct 2018 15:17:21 -0700 Subject: [PATCH 0811/1256] Update Documentation (#1244) Fixes #1227 --- mackup/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mackup/main.py b/mackup/main.py index 79b1da245..a712aba28 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -27,8 +27,8 @@ 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 (including some private keys!) -via Dropbox, but may be configured to exclude applications or use a different +By default, Mackup syncs all application data (except for private keys) via +Dropbox, but may be configured to exclude applications or use a different backend with a .mackup.cfg file. See https://github.com/lra/mackup/tree/master/doc for more information. From 53f2c14eaf6ba51889c42ac701c6bc8b95885141 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 30 Oct 2018 12:46:10 -0400 Subject: [PATCH 0812/1256] clasp (#1250) --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/clasp.cfg | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/clasp.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index b5619a426..23cf3f1f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Add support for Google clasp (via @paxperscientiam) + ## Mackup 0.8.20 - Remove support for Z as the link is being overwritten by the application diff --git a/README.md b/README.md index 8c1fc7ab8..72eef08cf 100644 --- a/README.md +++ b/README.md @@ -207,6 +207,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Chicken](http://sourceforge.net/projects/chicken/) - [chunkwm](https://github.com/koekeishiya/chunkwm) - [Cider](https://github.com/msanders/cider) +- [Clasp](https://github.com/google/clasp) - [Clementine](https://www.clementine-player.org/) - [CLion](https://www.jetbrains.com/clion/) - [ClipMenu](http://www.clipmenu.com/) diff --git a/mackup/applications/clasp.cfg b/mackup/applications/clasp.cfg new file mode 100644 index 000000000..4c049f5d6 --- /dev/null +++ b/mackup/applications/clasp.cfg @@ -0,0 +1,5 @@ +[application] +name = Clasp + +[configuration_files] +.clasprc.json From 46841d79dbc2f05819b423f9a8d7e19580305b95 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 30 Oct 2018 12:49:15 -0400 Subject: [PATCH 0813/1256] Hstr (#1248) * Update README.md * hstr commandline program * changelog --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/hstr.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/hstr.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 23cf3f1f1..91ac46163 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Add support for Google clasp (via @paxperscientiam) +- Add support for hstr (via @paxperscientiam) ## Mackup 0.8.20 diff --git a/README.md b/README.md index 72eef08cf..9d238985c 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. - [Hexels](http://hexraystudios.com/hexels/) - [Homebridge](https://github.com/nfarina/homebridge) - [Houdini](http://uglyapps.co.uk/houdini/) +- [Hstr](https://github.com/dvorka/hstr) - [Htop](http://htop.sourceforge.net/) - [HTTPie](https://httpie.org/) - [hub](https://hub.github.com) diff --git a/mackup/applications/hstr.cfg b/mackup/applications/hstr.cfg new file mode 100644 index 000000000..143bfbe95 --- /dev/null +++ b/mackup/applications/hstr.cfg @@ -0,0 +1,6 @@ +[application] +name = hstr + +[configuration_files] +.hstr_favorites +.hstr_blacklist From 048b2d59db817751277845581ccf76183f90de77 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 30 Oct 2018 14:45:36 -0400 Subject: [PATCH 0814/1256] support for calculator program bc (#1249) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/bc.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/bc.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 91ac46163..44030fcad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- 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 9d238985c..7ab597621 100644 --- a/README.md +++ b/README.md @@ -184,6 +184,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [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/) - [BetterTouchTool](http://www.boastr.net/) diff --git a/mackup/applications/bc.cfg b/mackup/applications/bc.cfg new file mode 100644 index 000000000..b201d25d6 --- /dev/null +++ b/mackup/applications/bc.cfg @@ -0,0 +1,5 @@ +[application] +name = bc + +[configuration_files] +.bcrc From 43ebe78d479f5ec339546fc38f36860b972a37c6 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 30 Oct 2018 14:48:44 -0400 Subject: [PATCH 0815/1256] Add support for b-ryan/powerline-shell (#1210) * first * config file for byran powerline-shell * changed readme and changelog as prescribed * bump * removed tsling * pretty name --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/b-ryan_powerline-shell.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/b-ryan_powerline-shell.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 44030fcad..f7ec8fdf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Add support for bc (via @paxperscientiam) - Add support for Google clasp (via @paxperscientiam) - Add support for hstr (via @paxperscientiam) +- Add support for b-ryan/powerline-shell (via @paxperscientiam) ## Mackup 0.8.20 diff --git a/README.md b/README.md index 7ab597621..49783de4f 100644 --- a/README.md +++ b/README.md @@ -423,6 +423,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-shell](https://github.com/b-ryan/powerline-shell) - [Prezto](https://github.com/sorin-ionescu/prezto) - [Processing](https://processing.org/) - [ProxyChains NG](http://sourceforge.net/projects/proxychains-ng/) diff --git a/mackup/applications/b-ryan_powerline-shell.cfg b/mackup/applications/b-ryan_powerline-shell.cfg new file mode 100644 index 000000000..54130db16 --- /dev/null +++ b/mackup/applications/b-ryan_powerline-shell.cfg @@ -0,0 +1,5 @@ +[application] +name = Powerline Shell Prompt + +[configuration_files] +.config/powerline-shell/config.json From 4d04da1305383174d4326decbcb86fbf682dfe6e Mon Sep 17 00:00:00 2001 From: Alex Yeung Date: Wed, 7 Nov 2018 14:17:17 +0800 Subject: [PATCH 0816/1256] feat: add support for kovidgoyal/kitty (#1252) * feat: add support for kovidgoyal/kitty * fixup! feat: add support for kovidgoyal/kitty --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/kitty.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/kitty.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index f7ec8fdf0..70f0815fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Add support for Google clasp (via @paxperscientiam) - Add support for hstr (via @paxperscientiam) - Add support for b-ryan/powerline-shell (via @paxperscientiam) +- Add support for kovidgoyal/kitty (via @foray1010) ## Mackup 0.8.20 diff --git a/README.md b/README.md index 49783de4f..d7117d10f 100644 --- a/README.md +++ b/README.md @@ -338,6 +338,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/) +- [kitty](https://sw.kovidgoyal.net/kitty/) - [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/kitty.cfg b/mackup/applications/kitty.cfg new file mode 100644 index 000000000..5113e5987 --- /dev/null +++ b/mackup/applications/kitty.cfg @@ -0,0 +1,5 @@ +[application] +name = kitty + +[configuration_files] +.config/kitty/kitty.conf From 8b30fd72a68b9f99f8131c91e77fd9ae739c13fe Mon Sep 17 00:00:00 2001 From: John Fitzpatrick Date: Wed, 21 Nov 2018 10:01:16 +1100 Subject: [PATCH 0817/1256] 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 0818/1256] 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 0819/1256] 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 0820/1256] 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 0821/1256] 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 0822/1256] 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 0823/1256] 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 0824/1256] 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 0825/1256] 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 0826/1256] 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 0827/1256] 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 0828/1256] 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 0829/1256] 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 0830/1256] 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 0831/1256] 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 0832/1256] 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 0833/1256] 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 0834/1256] 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 0835/1256] 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 0836/1256] 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 0837/1256] 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 0838/1256] 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 0839/1256] 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 0840/1256] 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 0841/1256] 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 0842/1256] 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 0843/1256] 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 0844/1256] 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 0845/1256] 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 0846/1256] 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 0847/1256] 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 0848/1256] 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 0849/1256] 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 0850/1256] 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 0851/1256] 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 0852/1256] 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 0853/1256] 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 0854/1256] 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 0855/1256] 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 0856/1256] 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 0857/1256] 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 0858/1256] 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 0859/1256] 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 0860/1256] 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 0861/1256] 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 0862/1256] 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 0863/1256] 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 0864/1256] 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 0865/1256] 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 0866/1256] 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 0867/1256] 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 0868/1256] 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 0869/1256] 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 0870/1256] 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 0871/1256] 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 0872/1256] 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 0873/1256] 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 0874/1256] 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 0875/1256] 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 0876/1256] 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 0877/1256] 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 0878/1256] 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 0879/1256] 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 0880/1256] 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 0881/1256] 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 0882/1256] 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 0883/1256] 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 0884/1256] 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 0885/1256] 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 0886/1256] 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 0887/1256] 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 0888/1256] 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 0889/1256] 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 0890/1256] 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 0891/1256] 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 0892/1256] 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 0893/1256] 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 0894/1256] 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 0895/1256] 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 0896/1256] 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 0897/1256] 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 0898/1256] 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 0899/1256] 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 0900/1256] 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 0901/1256] 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 0902/1256] 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 0903/1256] 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 0904/1256] 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 0905/1256] 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 0906/1256] 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 0907/1256] 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 0908/1256] 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 0909/1256] 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 0910/1256] 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 0911/1256] 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 0912/1256] 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 0913/1256] 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 0914/1256] 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 0915/1256] 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 0916/1256] 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 0917/1256] 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 0918/1256] 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 0919/1256] 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 0920/1256] 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 0921/1256] 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 0922/1256] 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 0923/1256] 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 0924/1256] 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 0925/1256] 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 0926/1256] 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 0927/1256] 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 0928/1256] 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 0929/1256] 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 0930/1256] 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 0931/1256] 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 0932/1256] 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 0933/1256] 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 0934/1256] 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 0935/1256] 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 0936/1256] 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 0937/1256] 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 0938/1256] 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 0939/1256] 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 0940/1256] 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 0941/1256] 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 0942/1256] 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 0943/1256] 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 0944/1256] 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 0945/1256] 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 0946/1256] 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 0947/1256] 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 0948/1256] 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 0949/1256] 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 0950/1256] 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 0951/1256] 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 0952/1256] 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 0953/1256] 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 0954/1256] 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 0955/1256] 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 0956/1256] 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 0957/1256] 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 0958/1256] 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 0959/1256] 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 0960/1256] 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 0961/1256] 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 0962/1256] 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 0963/1256] 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 0964/1256] 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 0965/1256] 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 0966/1256] 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 0967/1256] 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 0968/1256] 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 0969/1256] 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 0970/1256] 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 0971/1256] 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 0972/1256] 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 0973/1256] 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 0974/1256] 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 0975/1256] 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 0976/1256] 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 0977/1256] 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 0978/1256] 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 0979/1256] 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 0980/1256] 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 0981/1256] 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 0982/1256] 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 0983/1256] 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 0984/1256] 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 0985/1256] 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 0986/1256] 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 0987/1256] 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 0988/1256] 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 0989/1256] 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 0990/1256] 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 0991/1256] 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 0992/1256] 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 0993/1256] 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 0994/1256] 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 0995/1256] 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 0996/1256] 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 0997/1256] 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 0998/1256] 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 0999/1256] 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 1000/1256] 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 1001/1256] 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 1002/1256] 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 1003/1256] 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 1004/1256] 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 1005/1256] 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 1006/1256] [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 1007/1256] [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 1008/1256] 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 1009/1256] 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 1010/1256] 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 1011/1256] 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 1012/1256] 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 1013/1256] 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 1014/1256] 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 1015/1256] 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 1016/1256] 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 1017/1256] 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 1018/1256] 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 1019/1256] 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 1020/1256] 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 1021/1256] 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 1022/1256] 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 1023/1256] 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 1024/1256] 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 1025/1256] 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 1026/1256] 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 1027/1256] 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 1028/1256] 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 1029/1256] 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 1030/1256] 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 1031/1256] 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 1032/1256] 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 1033/1256] 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 1034/1256] 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 1035/1256] 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 1036/1256] 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 1037/1256] 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 1038/1256] 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 1039/1256] 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 1040/1256] 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 1041/1256] 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 1042/1256] 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 1043/1256] 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 1044/1256] 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 1045/1256] 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 1046/1256] 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 1047/1256] 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 1048/1256] 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 1049/1256] 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 1050/1256] 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 1051/1256] 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 1052/1256] 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 1053/1256] 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 1054/1256] 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 1055/1256] 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 1056/1256] 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 1057/1256] 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 1058/1256] 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 1059/1256] 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 1060/1256] 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 1061/1256] 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 1062/1256] 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 1063/1256] 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 1064/1256] 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 1065/1256] 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 1066/1256] 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 1067/1256] 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 1068/1256] 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 1069/1256] 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 1070/1256] 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 1071/1256] 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 1072/1256] 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 1073/1256] 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 1074/1256] 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 1075/1256] 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 1076/1256] 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 1077/1256] 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 1078/1256] 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 1079/1256] 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 1080/1256] 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 1081/1256] 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 1082/1256] 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 1083/1256] 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 1084/1256] 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 1085/1256] 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 1086/1256] 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 1087/1256] 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 1088/1256] 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 1089/1256] 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 1090/1256] 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 1091/1256] 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 1092/1256] 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 1093/1256] 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 1094/1256] 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 1095/1256] 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 1096/1256] 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 1097/1256] 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 1098/1256] 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 1099/1256] 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 1100/1256] 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 1101/1256] 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 1102/1256] 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 1103/1256] 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 1104/1256] 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 1105/1256] 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 1106/1256] 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 1107/1256] 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 1108/1256] 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 1109/1256] 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 1110/1256] 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 1111/1256] 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 1112/1256] 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 1113/1256] 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 1114/1256] 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 1115/1256] 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 1116/1256] 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 1117/1256] 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 1118/1256] 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 1119/1256] 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 1120/1256] 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 1121/1256] 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 1122/1256] 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 1123/1256] 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 1124/1256] 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 1125/1256] 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 1126/1256] 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 1127/1256] 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 1128/1256] 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 1129/1256] 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 1130/1256] 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 1131/1256] 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 1132/1256] 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 1133/1256] 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 1134/1256] 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 1135/1256] 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 1136/1256] 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 1137/1256] 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 1138/1256] 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 1139/1256] 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 1140/1256] 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 1141/1256] 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 1142/1256] 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 1143/1256] 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 1144/1256] 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 1145/1256] [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 1146/1256] 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 1147/1256] 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 1148/1256] 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 1149/1256] 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 1150/1256] 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 1151/1256] 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 1152/1256] 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 1153/1256] 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 1154/1256] 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 1155/1256] 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 1156/1256] 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 1157/1256] 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 1158/1256] 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 1159/1256] 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 1160/1256] 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 1161/1256] 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 1162/1256] 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 1163/1256] 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 1164/1256] 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 1165/1256] 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 1166/1256] 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 1167/1256] 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 1168/1256] 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 1169/1256] 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 1170/1256] 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 1171/1256] 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 1172/1256] 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 1173/1256] 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 1174/1256] 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 1175/1256] 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 1176/1256] 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 1177/1256] 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 1178/1256] 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 1179/1256] 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 1180/1256] 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 1181/1256] 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 1182/1256] 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 1183/1256] 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 1184/1256] 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 1185/1256] 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 1186/1256] 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 1187/1256] 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 1188/1256] 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 1189/1256] 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 1190/1256] 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 1191/1256] 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 1192/1256] 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 1193/1256] 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 1194/1256] 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 1195/1256] 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 1196/1256] 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 1197/1256] 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 1198/1256] 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 1199/1256] 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 1200/1256] 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 1201/1256] 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 1202/1256] 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 1203/1256] 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 1204/1256] 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 1205/1256] 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 1206/1256] 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 1207/1256] 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 1208/1256] 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 1209/1256] 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 1210/1256] 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 1211/1256] 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 1212/1256] 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 1213/1256] 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 1214/1256] 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 1215/1256] 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 1216/1256] 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 1217/1256] 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 1218/1256] 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 1219/1256] 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 From f322dd80986997bafc9b090de1dcfd8a47d0c8a9 Mon Sep 17 00:00:00 2001 From: Sonny Piers Date: Mon, 6 Nov 2023 00:27:59 +0100 Subject: [PATCH 1220/1256] Remove support for Copy engine as the service has been discontinued (#1255) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + doc/.mackup.cfg | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7b25b9c4..7e43acc16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Added support for Subler (via @EpicKris) - Added support for SpamSieve (via @michaelgrossklos) - Added support for Robo 3T (via @captnswing) +- Remove support for Copy engine as the service has been discontinued (via @sonnyp) ## Mackup 0.8.39 diff --git a/doc/.mackup.cfg b/doc/.mackup.cfg index 26dcf1a16..25f3620f7 100644 --- a/doc/.mackup.cfg +++ b/doc/.mackup.cfg @@ -16,11 +16,6 @@ engine = dropbox # [storage] # engine = google_drive -# If you choose the "copy" storage engine, Mackup will figure -# out where your Copy folder is and store your configuration files in it. -# [storage] -# engine = copy - # If you want to specify another directory, you can use the "file_system" # engine and Mackup won't try to detect any path for you: it will store your # files where you explicitly told him to, using the "path" setting. From b9e790470ada1ca7d572cc5230a290e09da97aa6 Mon Sep 17 00:00:00 2001 From: Benjamin K <53038537+treee111@users.noreply.github.com> Date: Mon, 6 Nov 2023 00:55:44 +0100 Subject: [PATCH 1221/1256] Sync root folder "Path Finder" so that there is no error when starting Path Finder (#1661) Co-authored-by: Laurent Raufaste --- mackup/applications/path-finder.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mackup/applications/path-finder.cfg b/mackup/applications/path-finder.cfg index 8a4a38c0c..85e1bc578 100644 --- a/mackup/applications/path-finder.cfg +++ b/mackup/applications/path-finder.cfg @@ -3,5 +3,4 @@ name = Path Finder [configuration_files] Library/Preferences/com.cocoatech.PathFinder.plist -Library/Application Support/Path Finder/PlugIns -Library/Application Support/Path Finder/Settings +Library/Application Support/Path Finder From f2cd9b9672e498b1b52ecf3c20a6031bca3ae0b5 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 6 Nov 2023 01:04:15 +0100 Subject: [PATCH 1222/1256] Mackup 0.8.40 --- 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 7e43acc16..54e3f26ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +## Mackup 0.8.40 + - Add support for Trizen (via @cilenco) - Added support for Sqitch (via @ra1fee) - Updated support for GeekTool (via @yuchen-lea) diff --git a/mackup/constants.py b/mackup/constants.py index 28fb5fd08..d35830d31 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,6 +1,6 @@ """Constants used in Mackup.""" # Current version -VERSION = "0.8.39" +VERSION = "0.8.40" # Support platforms PLATFORM_DARWIN = "Darwin" diff --git a/pyproject.toml b/pyproject.toml index 883fa3486..3c1453453 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "mackup" -version = "0.8.39" +version = "0.8.40" description = "Keep your application settings in sync (macOS/Linux)" authors = ["Laurent Raufaste "] license = "GPLv3" From c0fa16ca766aab4501b32c079436605f7313df65 Mon Sep 17 00:00:00 2001 From: or-tal-0 Date: Fri, 17 Nov 2023 15:49:38 -0500 Subject: [PATCH 1223/1256] Add support for DBeaver (#1963) --- CHANGELOG.md | 2 ++ README.md | 1 + mackup/applications/dbeaver.cfg | 6 ++++++ 3 files changed, 9 insertions(+) create mode 100644 mackup/applications/dbeaver.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 54e3f26ea..6467d77cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## WIP +- Added support for DBeaver (via @or-tal-0) + ## Mackup 0.8.40 - Add support for Trizen (via @cilenco) diff --git a/README.md b/README.md index be6103bba..c39ab0b8f 100644 --- a/README.md +++ b/README.md @@ -275,6 +275,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [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) +- [DBeaver](https://dbeaver.io/) - [DbVisualizer](https://www.dbvis.com/) - [Deal Alert](http://dealalertapp.com/) - [Deepin-dde-dock](https://github.com/linuxdeepin/dde-dock) diff --git a/mackup/applications/dbeaver.cfg b/mackup/applications/dbeaver.cfg new file mode 100644 index 000000000..53fad7476 --- /dev/null +++ b/mackup/applications/dbeaver.cfg @@ -0,0 +1,6 @@ +[application] +name = DBeaver + +[configuration_files] +Library/DBeaverData/workspace6/.metadata/.plugins/org.eclipse.core.runtime/.settings +Library/DBeaverData/workspace6/General From 9cbbc26d5774851de4fc9680ec3b26ca2cc9fc90 Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Sun, 10 Dec 2023 20:50:59 +0100 Subject: [PATCH 1224/1256] Update README.md (#1967) --- tests/README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/README.md b/tests/README.md index d27f371d0..4d48a0aa6 100644 --- a/tests/README.md +++ b/tests/README.md @@ -7,9 +7,8 @@ Feel free to add more, the more the better! ## How to run the tests ```bash -pip install pipenv -pipenv install -d -pipenv run make test +pip install poetry +make test ``` And you should see From 5666792b0a0eccf37ab1d63b5e4e3163a78ab32e Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Sun, 10 Dec 2023 20:54:06 +0100 Subject: [PATCH 1225/1256] Fix badge (#1968) Co-authored-by: Laurent Raufaste --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c39ab0b8f..2af7ba438 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Keep your application settings in sync. -[![Status](https://github.com/lra/mackup/workflows/Mackup/badge.svg)](https://github.com/lra/mackup/actions) +[![Run tests](https://github.com/lra/mackup/actions/workflows/test.yaml/badge.svg)](https://github.com/lra/mackup/actions/workflows/test.yaml) [![snapcraft](https://snapcraft.io/mackup/badge.svg)](https://snapcraft.io/mackup) ## Table of content From 64d66874f4ccd855ae7b353f8d1b31159c588304 Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Sat, 16 Dec 2023 23:39:07 +0100 Subject: [PATCH 1226/1256] Update asdf.cfg (#1965) Co-authored-by: Laurent Raufaste --- mackup/applications/asdf.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mackup/applications/asdf.cfg b/mackup/applications/asdf.cfg index d57f8dc14..daf8547d7 100644 --- a/mackup/applications/asdf.cfg +++ b/mackup/applications/asdf.cfg @@ -5,4 +5,7 @@ name = asdf .asdfrc .default-gems .default-npm-packages +.default-python-packages +.default-golang-pkgs +.default-mix-commands .tool-versions From 2f814e8d47310948de1988b77cfdf71db417ee7d Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 17 Dec 2023 00:23:55 +0100 Subject: [PATCH 1227/1256] Remove confusing icons --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 2af7ba438..b3f185d67 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,6 @@ Keep your application settings in sync. -[![Run tests](https://github.com/lra/mackup/actions/workflows/test.yaml/badge.svg)](https://github.com/lra/mackup/actions/workflows/test.yaml) -[![snapcraft](https://snapcraft.io/mackup/badge.svg)](https://snapcraft.io/mackup) - ## Table of content - [Mackup](#mackup) From 3b4165de2b66c18a9425575a41967e55cf433e1f Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 17 Dec 2023 00:24:54 +0100 Subject: [PATCH 1228/1256] Delete FUNDING.yml --- .github/FUNDING.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 4486f9791..000000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1 +0,0 @@ -custom: ['https://tippin.me/@_LR_'] From d9c95d587eb462866fb3f308b3be6bb7d14b8bad Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Sun, 17 Dec 2023 22:52:50 +0100 Subject: [PATCH 1229/1256] Add support for rtx (#1966) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/rtx.cfg | 16 ++++++++++++++++ 3 files changed, 18 insertions(+) create mode 100644 mackup/applications/rtx.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 6467d77cb..54dea0688 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## WIP - Added support for DBeaver (via @or-tal-0) +- Added support for rtx (via @dnicolson) ## Mackup 0.8.40 diff --git a/README.md b/README.md index b3f185d67..dc6c5ce69 100644 --- a/README.md +++ b/README.md @@ -576,6 +576,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/) +- [rtx](https://github.com/jdx/rtx) - [rubiTrack 5](https://www.rubitrack.com) - [Rubocop](https://github.com/bbatsov/rubocop) - [Ruby Version Manager](https://rvm.io/) diff --git a/mackup/applications/rtx.cfg b/mackup/applications/rtx.cfg new file mode 100644 index 000000000..932c37d51 --- /dev/null +++ b/mackup/applications/rtx.cfg @@ -0,0 +1,16 @@ +[application] +name = rtx + +[xdg_configuration_files] +rtx + +[configuration_files] +.rtx.toml +.tool-versions +.default-go-packages +.default-gems +.default-nodejs-packages +.default-node-packages +.default-npm-packages +.default-python-packages +.default-mix-commands From 6fccea504c493d1610e3f2ff30fdbe85845715c7 Mon Sep 17 00:00:00 2001 From: Denis Cornehl Date: Sat, 30 Dec 2023 13:54:04 +0100 Subject: [PATCH 1230/1256] add new alacritty TOML config file (#1977) --- CHANGELOG.md | 1 + mackup/applications/alacritty.cfg | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54dea0688..fec49966d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Added support for DBeaver (via @or-tal-0) - Added support for rtx (via @dnicolson) +- Add support for new TOML config for Alacritty (via @syphar) ## Mackup 0.8.40 diff --git a/mackup/applications/alacritty.cfg b/mackup/applications/alacritty.cfg index d0709ce6f..48684da58 100644 --- a/mackup/applications/alacritty.cfg +++ b/mackup/applications/alacritty.cfg @@ -3,6 +3,8 @@ name = Alacritty [configuration_files] .alacritty.yml +.alacritty.toml [xdg_configuration_files] alacritty/alacritty.yml +alacritty/alacritty.toml From 10070b73ccd1fb2bbd98dbc9a170e138f06df442 Mon Sep 17 00:00:00 2001 From: SanderHestvik Date: Sat, 30 Dec 2023 13:55:35 +0100 Subject: [PATCH 1231/1256] fix(doc/README.md): Remove Copy engine references (#1978) --- doc/README.md | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/doc/README.md b/doc/README.md index d1aa0f600..2c71e225f 100644 --- a/doc/README.md +++ b/doc/README.md @@ -14,7 +14,7 @@ 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` 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 @@ -47,16 +47,6 @@ configuration files in the `~/Library/Mobile\ Documents/com\~apple\~CloudDocs/` engine = icloud ``` -### Copy - -If you choose the `copy` storage engine, Mackup will figure out -where your Copy folder is and store your configuration files in it. - -```ini -[storage] -engine = copy -``` - ### File System If you want to specify another directory, you can use the `file_system` engine From 398ba1e3f21d94ca821f42eb2efd15beaf3953a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jan 2024 00:32:44 +0100 Subject: [PATCH 1232/1256] Bump jinja2 from 3.1.2 to 3.1.3 (#1983) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- poetry.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/poetry.lock b/poetry.lock index 5906252f0..46ba8e89c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.7.0 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. [[package]] name = "2to3" @@ -289,13 +289,13 @@ testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs [[package]] name = "jinja2" -version = "3.1.2" +version = "3.1.3" 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"}, + {file = "Jinja2-3.1.3-py3-none-any.whl", hash = "sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa"}, + {file = "Jinja2-3.1.3.tar.gz", hash = "sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90"}, ] [package.dependencies] From 23bd4b66409db12c6d1c1c2b0695e2d5e951aa05 Mon Sep 17 00:00:00 2001 From: Karl Stoney Date: Sat, 13 Jan 2024 14:14:08 +0000 Subject: [PATCH 1233/1256] Removed Raycast support (#1981) Co-authored-by: Laurent Raufaste --- README.md | 1 - mackup/applications/raycast.cfg | 5 ----- 2 files changed, 6 deletions(-) delete mode 100644 mackup/applications/raycast.cfg diff --git a/README.md b/README.md index dc6c5ce69..d279019cb 100644 --- a/README.md +++ b/README.md @@ -560,7 +560,6 @@ 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/) - [Rbenv](https://www.github.com/rbenv/rbenv) - [Rclone](https://rclone.org/) - [Rectangle](https://rectangleapp.com/) diff --git a/mackup/applications/raycast.cfg b/mackup/applications/raycast.cfg deleted file mode 100644 index 767ed4d16..000000000 --- a/mackup/applications/raycast.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[application] -name = Raycast - -[configuration_files] -Library/Preferences/com.raycast.macos.plist From 31ae717d40360e2e9d2d46518f57dcdc95b165ca Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 15 Jan 2024 17:54:14 +0100 Subject: [PATCH 1234/1256] Remove dependency on the six package (#1984) --- CHANGELOG.md | 1 + mackup/utils.py | 1 - poetry.lock | 167 ++++++++++++++++++++++-------------------------- pyproject.toml | 1 - 4 files changed, 76 insertions(+), 94 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fec49966d..03a6374e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Added support for DBeaver (via @or-tal-0) - Added support for rtx (via @dnicolson) - Add support for new TOML config for Alacritty (via @syphar) +- Remove dependency on the six package ## Mackup 0.8.40 diff --git a/mackup/utils.py b/mackup/utils.py index 6cf005f45..434631171 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -7,7 +7,6 @@ import subprocess import sys import sqlite3 -from six.moves import input from . import constants diff --git a/poetry.lock b/poetry.lock index 46ba8e89c..24058c543 100644 --- a/poetry.lock +++ b/poetry.lock @@ -24,31 +24,30 @@ files = [ [[package]] name = "babel" -version = "2.13.1" +version = "2.14.0" 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"}, + {file = "Babel-2.14.0-py3-none-any.whl", hash = "sha256:efb1a25b7118e67ce3a259bed20545c29cb68be8ad2c784c83689981b7a57287"}, + {file = "Babel-2.14.0.tar.gz", hash = "sha256:6919867db036398ba21eb5c7a0f6b28ab8cbc3ae7a73a44ebe34ae74a4e7d363"}, ] [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" +version = "2023.11.17" 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"}, + {file = "certifi-2023.11.17-py3-none-any.whl", hash = "sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474"}, + {file = "certifi-2023.11.17.tar.gz", hash = "sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1"}, ] [[package]] @@ -163,63 +162,63 @@ files = [ [[package]] name = "coverage" -version = "7.3.2" +version = "7.4.0" 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"}, + {file = "coverage-7.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36b0ea8ab20d6a7564e89cb6135920bc9188fb5f1f7152e94e8300b7b189441a"}, + {file = "coverage-7.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0676cd0ba581e514b7f726495ea75aba3eb20899d824636c6f59b0ed2f88c471"}, + {file = "coverage-7.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d0ca5c71a5a1765a0f8f88022c52b6b8be740e512980362f7fdbb03725a0d6b9"}, + {file = "coverage-7.4.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a7c97726520f784239f6c62506bc70e48d01ae71e9da128259d61ca5e9788516"}, + {file = "coverage-7.4.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:815ac2d0f3398a14286dc2cea223a6f338109f9ecf39a71160cd1628786bc6f5"}, + {file = "coverage-7.4.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:80b5ee39b7f0131ebec7968baa9b2309eddb35b8403d1869e08f024efd883566"}, + {file = "coverage-7.4.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5b2ccb7548a0b65974860a78c9ffe1173cfb5877460e5a229238d985565574ae"}, + {file = "coverage-7.4.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:995ea5c48c4ebfd898eacb098164b3cc826ba273b3049e4a889658548e321b43"}, + {file = "coverage-7.4.0-cp310-cp310-win32.whl", hash = "sha256:79287fd95585ed36e83182794a57a46aeae0b64ca53929d1176db56aacc83451"}, + {file = "coverage-7.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:5b14b4f8760006bfdb6e08667af7bc2d8d9bfdb648351915315ea17645347137"}, + {file = "coverage-7.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:04387a4a6ecb330c1878907ce0dc04078ea72a869263e53c72a1ba5bbdf380ca"}, + {file = "coverage-7.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ea81d8f9691bb53f4fb4db603203029643caffc82bf998ab5b59ca05560f4c06"}, + {file = "coverage-7.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:74775198b702868ec2d058cb92720a3c5a9177296f75bd97317c787daf711505"}, + {file = "coverage-7.4.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:76f03940f9973bfaee8cfba70ac991825611b9aac047e5c80d499a44079ec0bc"}, + {file = "coverage-7.4.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:485e9f897cf4856a65a57c7f6ea3dc0d4e6c076c87311d4bc003f82cfe199d25"}, + {file = "coverage-7.4.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:6ae8c9d301207e6856865867d762a4b6fd379c714fcc0607a84b92ee63feff70"}, + {file = "coverage-7.4.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:bf477c355274a72435ceb140dc42de0dc1e1e0bf6e97195be30487d8eaaf1a09"}, + {file = "coverage-7.4.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:83c2dda2666fe32332f8e87481eed056c8b4d163fe18ecc690b02802d36a4d26"}, + {file = "coverage-7.4.0-cp311-cp311-win32.whl", hash = "sha256:697d1317e5290a313ef0d369650cfee1a114abb6021fa239ca12b4849ebbd614"}, + {file = "coverage-7.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:26776ff6c711d9d835557ee453082025d871e30b3fd6c27fcef14733f67f0590"}, + {file = "coverage-7.4.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:13eaf476ec3e883fe3e5fe3707caeb88268a06284484a3daf8250259ef1ba143"}, + {file = "coverage-7.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:846f52f46e212affb5bcf131c952fb4075b55aae6b61adc9856222df89cbe3e2"}, + {file = "coverage-7.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26f66da8695719ccf90e794ed567a1549bb2644a706b41e9f6eae6816b398c4a"}, + {file = "coverage-7.4.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:164fdcc3246c69a6526a59b744b62e303039a81e42cfbbdc171c91a8cc2f9446"}, + {file = "coverage-7.4.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:316543f71025a6565677d84bc4df2114e9b6a615aa39fb165d697dba06a54af9"}, + {file = "coverage-7.4.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bb1de682da0b824411e00a0d4da5a784ec6496b6850fdf8c865c1d68c0e318dd"}, + {file = "coverage-7.4.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:0e8d06778e8fbffccfe96331a3946237f87b1e1d359d7fbe8b06b96c95a5407a"}, + {file = "coverage-7.4.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:a56de34db7b7ff77056a37aedded01b2b98b508227d2d0979d373a9b5d353daa"}, + {file = "coverage-7.4.0-cp312-cp312-win32.whl", hash = "sha256:51456e6fa099a8d9d91497202d9563a320513fcf59f33991b0661a4a6f2ad450"}, + {file = "coverage-7.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:cd3c1e4cb2ff0083758f09be0f77402e1bdf704adb7f89108007300a6da587d0"}, + {file = "coverage-7.4.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e9d1bf53c4c8de58d22e0e956a79a5b37f754ed1ffdbf1a260d9dcfa2d8a325e"}, + {file = "coverage-7.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:109f5985182b6b81fe33323ab4707011875198c41964f014579cf82cebf2bb85"}, + {file = "coverage-7.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3cc9d4bc55de8003663ec94c2f215d12d42ceea128da8f0f4036235a119c88ac"}, + {file = "coverage-7.4.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cc6d65b21c219ec2072c1293c505cf36e4e913a3f936d80028993dd73c7906b1"}, + {file = "coverage-7.4.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5a10a4920def78bbfff4eff8a05c51be03e42f1c3735be42d851f199144897ba"}, + {file = "coverage-7.4.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b8e99f06160602bc64da35158bb76c73522a4010f0649be44a4e167ff8555952"}, + {file = "coverage-7.4.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:7d360587e64d006402b7116623cebf9d48893329ef035278969fa3bbf75b697e"}, + {file = "coverage-7.4.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:29f3abe810930311c0b5d1a7140f6395369c3db1be68345638c33eec07535105"}, + {file = "coverage-7.4.0-cp38-cp38-win32.whl", hash = "sha256:5040148f4ec43644702e7b16ca864c5314ccb8ee0751ef617d49aa0e2d6bf4f2"}, + {file = "coverage-7.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:9864463c1c2f9cb3b5db2cf1ff475eed2f0b4285c2aaf4d357b69959941aa555"}, + {file = "coverage-7.4.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:936d38794044b26c99d3dd004d8af0035ac535b92090f7f2bb5aa9c8e2f5cd42"}, + {file = "coverage-7.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:799c8f873794a08cdf216aa5d0531c6a3747793b70c53f70e98259720a6fe2d7"}, + {file = "coverage-7.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e7defbb9737274023e2d7af02cac77043c86ce88a907c58f42b580a97d5bcca9"}, + {file = "coverage-7.4.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a1526d265743fb49363974b7aa8d5899ff64ee07df47dd8d3e37dcc0818f09ed"}, + {file = "coverage-7.4.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf635a52fc1ea401baf88843ae8708591aa4adff875e5c23220de43b1ccf575c"}, + {file = "coverage-7.4.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:756ded44f47f330666843b5781be126ab57bb57c22adbb07d83f6b519783b870"}, + {file = "coverage-7.4.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:0eb3c2f32dabe3a4aaf6441dde94f35687224dfd7eb2a7f47f3fd9428e421058"}, + {file = "coverage-7.4.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:bfd5db349d15c08311702611f3dccbef4b4e2ec148fcc636cf8739519b4a5c0f"}, + {file = "coverage-7.4.0-cp39-cp39-win32.whl", hash = "sha256:53d7d9158ee03956e0eadac38dfa1ec8068431ef8058fe6447043db1fb40d932"}, + {file = "coverage-7.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:cfd2a8b6b0d8e66e944d47cdec2f47c48fef2ba2f2dff5a9a75757f64172857e"}, + {file = "coverage-7.4.0-pp38.pp39.pp310-none-any.whl", hash = "sha256:c530833afc4707fe48524a44844493f36d8727f04dcce91fb978c414a8556cc6"}, + {file = "coverage-7.4.0.tar.gz", hash = "sha256:707c0f58cb1712b8809ece32b68996ee1e609f71bd14615bd8f87a1293cb610e"}, ] [package.extras] @@ -248,13 +247,13 @@ files = [ [[package]] name = "idna" -version = "3.4" +version = "3.6" 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"}, + {file = "idna-3.6-py3-none-any.whl", hash = "sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f"}, + {file = "idna-3.6.tar.gz", hash = "sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca"}, ] [[package]] @@ -270,20 +269,20 @@ files = [ [[package]] name = "importlib-metadata" -version = "6.8.0" +version = "7.0.1" 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"}, + {file = "importlib_metadata-7.0.1-py3-none-any.whl", hash = "sha256:4805911c3a4ec7c3966410053e9ec6a1fecd629117df5adee56dfc9432a1081e"}, + {file = "importlib_metadata-7.0.1.tar.gz", hash = "sha256:f238736bb06590ae52ac1fab06a3a9ef1d8dce2b7a35b5ab329371d6c8f5d2cc"}, ] [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"] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "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"] @@ -440,17 +439,18 @@ files = [ [[package]] name = "pygments" -version = "2.16.1" +version = "2.17.2" 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"}, + {file = "pygments-2.17.2-py3-none-any.whl", hash = "sha256:b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c"}, + {file = "pygments-2.17.2.tar.gz", hash = "sha256:da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367"}, ] [package.extras] plugins = ["importlib-metadata"] +windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pytz" @@ -484,22 +484,6 @@ urllib3 = ">=1.21.1,<3" 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" @@ -648,18 +632,17 @@ test = ["pytest"] [[package]] name = "urllib3" -version = "2.0.7" +version = "2.1.0" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "urllib3-2.0.7-py3-none-any.whl", hash = "sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e"}, - {file = "urllib3-2.0.7.tar.gz", hash = "sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84"}, + {file = "urllib3-2.1.0-py3-none-any.whl", hash = "sha256:55901e917a5896a349ff771be919f8bd99aff50b79fe58fec595eb37bbc56bb3"}, + {file = "urllib3-2.1.0.tar.gz", hash = "sha256:df7aa8afb0148fa78488e7899b2c59b5f4ffcfa82e6c54ccb9dd37c1d7b52d54"}, ] [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)"] @@ -681,4 +664,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "454bbc88f1b6c2be019c27da622698360726b6528f909624561b45613d32e3f1" +content-hash = "faef58045778e0678d5ffc80fa9d163bc088915ed9922d98cabcac8a286ea15e" diff --git a/pyproject.toml b/pyproject.toml index 3c1453453..f76668a66 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,6 @@ readme = "README.md" [tool.poetry.dependencies] python = "^3.8" docopt = "^0.6.2" -six = "^1.16.0" [tool.poetry.group.dev] optional = true From b2767d80ba1950fbccba70043e173c7fcf049be7 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 15 Jan 2024 20:33:44 +0100 Subject: [PATCH 1235/1256] Replace nose with pytest --- Makefile | 2 +- doc/develop.md | 23 +- poetry.lock | 630 ++-------------------- pyproject.toml | 2 +- tests/{config_tests.py => test_config.py} | 0 tests/{main_tests.py => test_main.py} | 0 tests/{utils_test.py => test_utils.py} | 0 7 files changed, 46 insertions(+), 611 deletions(-) rename tests/{config_tests.py => test_config.py} (100%) rename tests/{main_tests.py => test_main.py} (100%) rename tests/{utils_test.py => test_utils.py} (100%) diff --git a/Makefile b/Makefile index 979fbba7a..22009361e 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ lint: test: poetry install --with dev - poetry run nosetests --with-coverage --cover-branches --cover-package=mackup + poetry run pytest clean: rm -rf __pycache__ diff --git a/doc/develop.md b/doc/develop.md index bdfb175b6..763c1c536 100644 --- a/doc/develop.md +++ b/doc/develop.md @@ -4,26 +4,17 @@ # Install a recent non-system python brew install python -# Install pyenv to be able to easily switch Python versions -brew install pyenv +# Install pipx to be able to easily run isolated Python packages +brew install pipx -# Install the package and virtualenv manager -brew install pipenv - -# Install the most recent Python -pyenv install 3.7.4 +# Install the tool for dependency management and packaging in Python +pipx install poetry # Setup local dev cd .../mackup -pyenv local 3.7.4 -pipenv install -pipenv shell -make develop +poetry install --with dev # You can now edit files and see the impact of your changes -mackup --version -nosetests - -# Cleanup -make undevelop +poetry run mackup --version +make test ``` diff --git a/poetry.lock b/poetry.lock index 24058c543..f3013ba27 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,154 +1,5 @@ # This file is automatically @generated by Poetry 1.7.1 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.14.0" -description = "Internationalization utilities" -optional = false -python-versions = ">=3.7" -files = [ - {file = "Babel-2.14.0-py3-none-any.whl", hash = "sha256:efb1a25b7118e67ce3a259bed20545c29cb68be8ad2c784c83689981b7a57287"}, - {file = "Babel-2.14.0.tar.gz", hash = "sha256:6919867db036398ba21eb5c7a0f6b28ab8cbc3ae7a73a44ebe34ae74a4e7d363"}, -] - -[package.dependencies] -pytz = {version = ">=2015.7", markers = "python_version < \"3.9\""} - -[package.extras] -dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] - -[[package]] -name = "certifi" -version = "2023.11.17" -description = "Python package for providing Mozilla's CA Bundle." -optional = false -python-versions = ">=3.6" -files = [ - {file = "certifi-2023.11.17-py3-none-any.whl", hash = "sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474"}, - {file = "certifi-2023.11.17.tar.gz", hash = "sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1"}, -] - -[[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" @@ -160,70 +11,6 @@ files = [ {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, ] -[[package]] -name = "coverage" -version = "7.4.0" -description = "Code coverage measurement for Python" -optional = false -python-versions = ">=3.8" -files = [ - {file = "coverage-7.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36b0ea8ab20d6a7564e89cb6135920bc9188fb5f1f7152e94e8300b7b189441a"}, - {file = "coverage-7.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0676cd0ba581e514b7f726495ea75aba3eb20899d824636c6f59b0ed2f88c471"}, - {file = "coverage-7.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d0ca5c71a5a1765a0f8f88022c52b6b8be740e512980362f7fdbb03725a0d6b9"}, - {file = "coverage-7.4.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a7c97726520f784239f6c62506bc70e48d01ae71e9da128259d61ca5e9788516"}, - {file = "coverage-7.4.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:815ac2d0f3398a14286dc2cea223a6f338109f9ecf39a71160cd1628786bc6f5"}, - {file = "coverage-7.4.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:80b5ee39b7f0131ebec7968baa9b2309eddb35b8403d1869e08f024efd883566"}, - {file = "coverage-7.4.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5b2ccb7548a0b65974860a78c9ffe1173cfb5877460e5a229238d985565574ae"}, - {file = "coverage-7.4.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:995ea5c48c4ebfd898eacb098164b3cc826ba273b3049e4a889658548e321b43"}, - {file = "coverage-7.4.0-cp310-cp310-win32.whl", hash = "sha256:79287fd95585ed36e83182794a57a46aeae0b64ca53929d1176db56aacc83451"}, - {file = "coverage-7.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:5b14b4f8760006bfdb6e08667af7bc2d8d9bfdb648351915315ea17645347137"}, - {file = "coverage-7.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:04387a4a6ecb330c1878907ce0dc04078ea72a869263e53c72a1ba5bbdf380ca"}, - {file = "coverage-7.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ea81d8f9691bb53f4fb4db603203029643caffc82bf998ab5b59ca05560f4c06"}, - {file = "coverage-7.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:74775198b702868ec2d058cb92720a3c5a9177296f75bd97317c787daf711505"}, - {file = "coverage-7.4.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:76f03940f9973bfaee8cfba70ac991825611b9aac047e5c80d499a44079ec0bc"}, - {file = "coverage-7.4.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:485e9f897cf4856a65a57c7f6ea3dc0d4e6c076c87311d4bc003f82cfe199d25"}, - {file = "coverage-7.4.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:6ae8c9d301207e6856865867d762a4b6fd379c714fcc0607a84b92ee63feff70"}, - {file = "coverage-7.4.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:bf477c355274a72435ceb140dc42de0dc1e1e0bf6e97195be30487d8eaaf1a09"}, - {file = "coverage-7.4.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:83c2dda2666fe32332f8e87481eed056c8b4d163fe18ecc690b02802d36a4d26"}, - {file = "coverage-7.4.0-cp311-cp311-win32.whl", hash = "sha256:697d1317e5290a313ef0d369650cfee1a114abb6021fa239ca12b4849ebbd614"}, - {file = "coverage-7.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:26776ff6c711d9d835557ee453082025d871e30b3fd6c27fcef14733f67f0590"}, - {file = "coverage-7.4.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:13eaf476ec3e883fe3e5fe3707caeb88268a06284484a3daf8250259ef1ba143"}, - {file = "coverage-7.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:846f52f46e212affb5bcf131c952fb4075b55aae6b61adc9856222df89cbe3e2"}, - {file = "coverage-7.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26f66da8695719ccf90e794ed567a1549bb2644a706b41e9f6eae6816b398c4a"}, - {file = "coverage-7.4.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:164fdcc3246c69a6526a59b744b62e303039a81e42cfbbdc171c91a8cc2f9446"}, - {file = "coverage-7.4.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:316543f71025a6565677d84bc4df2114e9b6a615aa39fb165d697dba06a54af9"}, - {file = "coverage-7.4.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bb1de682da0b824411e00a0d4da5a784ec6496b6850fdf8c865c1d68c0e318dd"}, - {file = "coverage-7.4.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:0e8d06778e8fbffccfe96331a3946237f87b1e1d359d7fbe8b06b96c95a5407a"}, - {file = "coverage-7.4.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:a56de34db7b7ff77056a37aedded01b2b98b508227d2d0979d373a9b5d353daa"}, - {file = "coverage-7.4.0-cp312-cp312-win32.whl", hash = "sha256:51456e6fa099a8d9d91497202d9563a320513fcf59f33991b0661a4a6f2ad450"}, - {file = "coverage-7.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:cd3c1e4cb2ff0083758f09be0f77402e1bdf704adb7f89108007300a6da587d0"}, - {file = "coverage-7.4.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e9d1bf53c4c8de58d22e0e956a79a5b37f754ed1ffdbf1a260d9dcfa2d8a325e"}, - {file = "coverage-7.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:109f5985182b6b81fe33323ab4707011875198c41964f014579cf82cebf2bb85"}, - {file = "coverage-7.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3cc9d4bc55de8003663ec94c2f215d12d42ceea128da8f0f4036235a119c88ac"}, - {file = "coverage-7.4.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cc6d65b21c219ec2072c1293c505cf36e4e913a3f936d80028993dd73c7906b1"}, - {file = "coverage-7.4.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5a10a4920def78bbfff4eff8a05c51be03e42f1c3735be42d851f199144897ba"}, - {file = "coverage-7.4.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b8e99f06160602bc64da35158bb76c73522a4010f0649be44a4e167ff8555952"}, - {file = "coverage-7.4.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:7d360587e64d006402b7116623cebf9d48893329ef035278969fa3bbf75b697e"}, - {file = "coverage-7.4.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:29f3abe810930311c0b5d1a7140f6395369c3db1be68345638c33eec07535105"}, - {file = "coverage-7.4.0-cp38-cp38-win32.whl", hash = "sha256:5040148f4ec43644702e7b16ca864c5314ccb8ee0751ef617d49aa0e2d6bf4f2"}, - {file = "coverage-7.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:9864463c1c2f9cb3b5db2cf1ff475eed2f0b4285c2aaf4d357b69959941aa555"}, - {file = "coverage-7.4.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:936d38794044b26c99d3dd004d8af0035ac535b92090f7f2bb5aa9c8e2f5cd42"}, - {file = "coverage-7.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:799c8f873794a08cdf216aa5d0531c6a3747793b70c53f70e98259720a6fe2d7"}, - {file = "coverage-7.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e7defbb9737274023e2d7af02cac77043c86ce88a907c58f42b580a97d5bcca9"}, - {file = "coverage-7.4.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a1526d265743fb49363974b7aa8d5899ff64ee07df47dd8d3e37dcc0818f09ed"}, - {file = "coverage-7.4.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf635a52fc1ea401baf88843ae8708591aa4adff875e5c23220de43b1ccf575c"}, - {file = "coverage-7.4.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:756ded44f47f330666843b5781be126ab57bb57c22adbb07d83f6b519783b870"}, - {file = "coverage-7.4.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:0eb3c2f32dabe3a4aaf6441dde94f35687224dfd7eb2a7f47f3fd9428e421058"}, - {file = "coverage-7.4.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:bfd5db349d15c08311702611f3dccbef4b4e2ec148fcc636cf8739519b4a5c0f"}, - {file = "coverage-7.4.0-cp39-cp39-win32.whl", hash = "sha256:53d7d9158ee03956e0eadac38dfa1ec8068431ef8058fe6447043db1fb40d932"}, - {file = "coverage-7.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:cfd2a8b6b0d8e66e944d47cdec2f47c48fef2ba2f2dff5a9a75757f64172857e"}, - {file = "coverage-7.4.0-pp38.pp39.pp310-none-any.whl", hash = "sha256:c530833afc4707fe48524a44844493f36d8727f04dcce91fb978c414a8556cc6"}, - {file = "coverage-7.4.0.tar.gz", hash = "sha256:707c0f58cb1712b8809ece32b68996ee1e609f71bd14615bd8f87a1293cb610e"}, -] - -[package.extras] -toml = ["tomli"] - [[package]] name = "docopt" version = "0.6.2" @@ -235,195 +22,28 @@ files = [ ] [[package]] -name = "docutils" -version = "0.20.1" -description = "Docutils -- Python Documentation Utilities" +name = "exceptiongroup" +version = "1.2.0" +description = "Backport of PEP 654 (exception groups)" 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"}, + {file = "exceptiongroup-1.2.0-py3-none-any.whl", hash = "sha256:4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14"}, + {file = "exceptiongroup-1.2.0.tar.gz", hash = "sha256:91f5c769735f051a4290d52edd0858999b57e5876e9f85937691bd4c9fa3ed68"}, ] -[[package]] -name = "idna" -version = "3.6" -description = "Internationalized Domain Names in Applications (IDNA)" -optional = false -python-versions = ">=3.5" -files = [ - {file = "idna-3.6-py3-none-any.whl", hash = "sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f"}, - {file = "idna-3.6.tar.gz", hash = "sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca"}, -] - -[[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 = "7.0.1" -description = "Read metadata from Python packages" -optional = false -python-versions = ">=3.8" -files = [ - {file = "importlib_metadata-7.0.1-py3-none-any.whl", hash = "sha256:4805911c3a4ec7c3966410053e9ec6a1fecd629117df5adee56dfc9432a1081e"}, - {file = "importlib_metadata-7.0.1.tar.gz", hash = "sha256:f238736bb06590ae52ac1fab06a3a9ef1d8dce2b7a35b5ab329371d6c8f5d2cc"}, -] - -[package.dependencies] -zipp = ">=0.5" - [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"] -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"] +test = ["pytest (>=6)"] [[package]] -name = "jinja2" -version = "3.1.3" -description = "A very fast and expressive template engine." +name = "iniconfig" +version = "2.0.0" +description = "brain-dead simple config-ini parsing" optional = false python-versions = ">=3.7" files = [ - {file = "Jinja2-3.1.3-py3-none-any.whl", hash = "sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa"}, - {file = "Jinja2-3.1.3.tar.gz", hash = "sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90"}, -] - -[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"}, + {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"}, + {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"}, ] [[package]] @@ -438,230 +58,54 @@ files = [ ] [[package]] -name = "pygments" -version = "2.17.2" -description = "Pygments is a syntax highlighting package written in Python." +name = "pluggy" +version = "1.3.0" +description = "plugin and hook calling mechanisms for python" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "pygments-2.17.2-py3-none-any.whl", hash = "sha256:b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c"}, - {file = "pygments-2.17.2.tar.gz", hash = "sha256:da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367"}, + {file = "pluggy-1.3.0-py3-none-any.whl", hash = "sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7"}, + {file = "pluggy-1.3.0.tar.gz", hash = "sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12"}, ] [package.extras] -plugins = ["importlib-metadata"] -windows-terminal = ["colorama (>=0.4.6)"] +dev = ["pre-commit", "tox"] +testing = ["pytest", "pytest-benchmark"] [[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." +name = "pytest" +version = "7.4.4" +description = "pytest: simple powerful testing with Python" 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"}, + {file = "pytest-7.4.4-py3-none-any.whl", hash = "sha256:b090cdf5ed60bf4c45261be03239c2c1c22df034fbffe691abe93cd80cea01d8"}, + {file = "pytest-7.4.4.tar.gz", hash = "sha256:2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280"}, ] [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 = "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"}, -] +colorama = {version = "*", markers = "sys_platform == \"win32\""} +exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} +iniconfig = "*" +packaging = "*" +pluggy = ">=0.12,<2.0" +tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""} [package.extras] -lint = ["docutils-stubs", "flake8", "mypy"] -test = ["pytest"] +testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] [[package]] -name = "sphinxcontrib-htmlhelp" +name = "tomli" version = "2.0.1" -description = "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files" +description = "A lil' TOML parser" 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.1.0" -description = "HTTP library with thread-safe connection pooling, file post, and more." -optional = false -python-versions = ">=3.8" -files = [ - {file = "urllib3-2.1.0-py3-none-any.whl", hash = "sha256:55901e917a5896a349ff771be919f8bd99aff50b79fe58fec595eb37bbc56bb3"}, - {file = "urllib3-2.1.0.tar.gz", hash = "sha256:df7aa8afb0148fa78488e7899b2c59b5f4ffcfa82e6c54ccb9dd37c1d7b52d54"}, -] - -[package.extras] -brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"] -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" +python-versions = ">=3.7" files = [ - {file = "zipp-3.17.0-py3-none-any.whl", hash = "sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31"}, - {file = "zipp-3.17.0.tar.gz", hash = "sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0"}, + {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, + {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, ] -[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 = "faef58045778e0678d5ffc80fa9d163bc088915ed9922d98cabcac8a286ea15e" +content-hash = "274c8d39282fbf6db0684799da3630436eeae91276b11d3a27d2e338a7d2a41d" diff --git a/pyproject.toml b/pyproject.toml index f76668a66..0cc463db5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ docopt = "^0.6.2" optional = true [tool.poetry.group.dev.dependencies] -nose-py3 = "^1.6.3" +pytest = "^7.4.4" [build-system] requires = ["poetry-core"] diff --git a/tests/config_tests.py b/tests/test_config.py similarity index 100% rename from tests/config_tests.py rename to tests/test_config.py diff --git a/tests/main_tests.py b/tests/test_main.py similarity index 100% rename from tests/main_tests.py rename to tests/test_main.py diff --git a/tests/utils_test.py b/tests/test_utils.py similarity index 100% rename from tests/utils_test.py rename to tests/test_utils.py From 6629dae9d507fc2a6e5e1efc90deedf474eb565e Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Mon, 15 Jan 2024 20:35:53 +0100 Subject: [PATCH 1236/1256] Remove nose test on 2.7 --- .github/workflows/test.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e28679e76..f13bc6c96 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -7,14 +7,6 @@ on: jobs: - nose-2_7: - runs-on: ubuntu-latest - container: python:2.7 - steps: - - run: pip install docopt six nose - - uses: actions/checkout@v4 - - run: nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup - nose: runs-on: ubuntu-latest strategy: From 3775c544a11098abf1dc237da028a434fa0b9737 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 30 Jan 2024 23:20:07 +0100 Subject: [PATCH 1237/1256] Black formatting (#1992) --- mackup/application.py | 2 +- mackup/appsdb.py | 2 +- mackup/config.py | 2 -- mackup/constants.py | 1 + mackup/mackup.py | 2 +- mackup/main.py | 1 + mackup/utils.py | 1 + 7 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mackup/application.py b/mackup/application.py index 7e7522dc2..bc34aa982 100644 --- a/mackup/application.py +++ b/mackup/application.py @@ -4,6 +4,7 @@ An Application Profile contains all the information about an application in Mackup. Name, files, ... """ + import os from .mackup import Mackup @@ -11,7 +12,6 @@ class ApplicationProfile(object): - """Instantiate this class with application specific data.""" def __init__(self, mackup, files, dry_run, verbose): diff --git a/mackup/appsdb.py b/mackup/appsdb.py index 3699cb1f0..354a3106a 100644 --- a/mackup/appsdb.py +++ b/mackup/appsdb.py @@ -4,6 +4,7 @@ The Applications Database provides an easy to use interface to load application data from the Mackup Database (files). """ + import os try: @@ -17,7 +18,6 @@ class ApplicationsDatabase(object): - """Database containing all the configured applications.""" def __init__(self): diff --git a/mackup/config.py b/mackup/config.py index 9ad9a36d1..eca948bba 100644 --- a/mackup/config.py +++ b/mackup/config.py @@ -27,7 +27,6 @@ class Config(object): - """The Mackup Config class.""" def __init__(self, filename=None): @@ -276,7 +275,6 @@ def _parse_apps_to_sync(self): class ConfigError(Exception): - """Exception used for handle errors in the configuration.""" pass diff --git a/mackup/constants.py b/mackup/constants.py index d35830d31..1a7e027c0 100644 --- a/mackup/constants.py +++ b/mackup/constants.py @@ -1,4 +1,5 @@ """Constants used in Mackup.""" + # Current version VERSION = "0.8.40" diff --git a/mackup/mackup.py b/mackup/mackup.py index 734e8ee9c..92ea0bb22 100644 --- a/mackup/mackup.py +++ b/mackup/mackup.py @@ -5,6 +5,7 @@ runtime. It also provides easy to use interface that is used by the Mackup UI. The only UI for now is the command line. """ + import os import os.path import shutil @@ -16,7 +17,6 @@ class Mackup(object): - """Main Mackup class.""" def __init__(self): diff --git a/mackup/main.py b/mackup/main.py index 198ac2563..71d1f04c7 100644 --- a/mackup/main.py +++ b/mackup/main.py @@ -35,6 +35,7 @@ See https://github.com/lra/mackup/tree/master/doc for more information. """ + from docopt import docopt from .appsdb import ApplicationsDatabase from .application import ApplicationProfile diff --git a/mackup/utils.py b/mackup/utils.py index 434631171..316800a9b 100644 --- a/mackup/utils.py +++ b/mackup/utils.py @@ -1,4 +1,5 @@ """System static utilities being used by the modules.""" + import base64 import os import platform From eecbffc74e9824ae77e2834b28dbe8d370140775 Mon Sep 17 00:00:00 2001 From: Lars Refsgaard <1552887+LarsRefsgaard@users.noreply.github.com> Date: Tue, 30 Jan 2024 23:21:15 +0100 Subject: [PATCH 1238/1256] Add Aerospace as an application (#1990) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/aerospace.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/aerospace.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 03a6374e7..da77da562 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Added support for rtx (via @dnicolson) - Add support for new TOML config for Alacritty (via @syphar) - Remove dependency on the six package +- Add support for AeroSpace (via @LarsRefsgaard) ## Mackup 0.8.40 diff --git a/README.md b/README.md index d279019cb..469fd0997 100644 --- a/README.md +++ b/README.md @@ -175,6 +175,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [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/) +- [AeroSpace](https://github.com/nikitabobko/AeroSpace) - [Affinity Designer](https://affinity.serif.com/designer) - [Affinity Photo](https://affinity.serif.com/photo) - [Affinity Publisher](https://affinity.serif.com/publisher) diff --git a/mackup/applications/aerospace.cfg b/mackup/applications/aerospace.cfg new file mode 100644 index 000000000..f78abfeac --- /dev/null +++ b/mackup/applications/aerospace.cfg @@ -0,0 +1,5 @@ +[application] +name = aerospace + +[configuration_files] +.aerospace.toml From 2464f9a48ad7ec5691e595b0d97dd6a80c9e75d4 Mon Sep 17 00:00:00 2001 From: Lars Refsgaard <1552887+LarsRefsgaard@users.noreply.github.com> Date: Tue, 30 Jan 2024 23:23:08 +0100 Subject: [PATCH 1239/1256] Add support for JankyBorders (#1991) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/jankyborders.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/jankyborders.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index da77da562..fc5dae483 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Added support for rtx (via @dnicolson) - Add support for new TOML config for Alacritty (via @syphar) - Remove dependency on the six package +- Add support for JankyBorders (via @LarsRefsgaard) - Add support for AeroSpace (via @LarsRefsgaard) ## Mackup 0.8.40 diff --git a/README.md b/README.md index 469fd0997..c93f7925b 100644 --- a/README.md +++ b/README.md @@ -388,6 +388,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [iTerm2](https://www.iterm2.com/) - [iTermocil](https://github.com/TomAnthony/itermocil) - [iTunes Scripts](https://www.apple.com/) +- [JankyBorders](https://github.com/FelixKratz/JankyBorders) - [Janus](https://github.com/carlhuda/janus) - [Jitouch](http://www.jitouch.com/) - [Joplin](https://joplinapp.org/) diff --git a/mackup/applications/jankyborders.cfg b/mackup/applications/jankyborders.cfg new file mode 100644 index 000000000..f926e7317 --- /dev/null +++ b/mackup/applications/jankyborders.cfg @@ -0,0 +1,5 @@ +[application] +name = Janky Borders + +[xdg_configuration_files] +borders/bordersrc From 79cfdc46ecd7dae04059200c97f3723f5bd7e20e Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Wed, 31 Jan 2024 03:07:21 +0100 Subject: [PATCH 1240/1256] Add MacOS 14 (#1993) --- .github/workflows/install.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml index c1ed045d9..d49e849c1 100644 --- a/.github/workflows/install.yaml +++ b/.github/workflows/install.yaml @@ -33,8 +33,9 @@ jobs: - macos-11 - macos-12 - macos-13 + - macos-14 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - run: pip install . + - run: pip3 install . - run: mackup --help From 4a096f7964fd5736c57a7486b62285e21e2d974c Mon Sep 17 00:00:00 2001 From: Lars Refsgaard <1552887+LarsRefsgaard@users.noreply.github.com> Date: Wed, 31 Jan 2024 22:25:24 +0100 Subject: [PATCH 1241/1256] Add support for SketchyBar (#1995) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/sketchybar.cfg | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 mackup/applications/sketchybar.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index fc5dae483..972e60ae5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Remove dependency on the six package - Add support for JankyBorders (via @LarsRefsgaard) - Add support for AeroSpace (via @LarsRefsgaard) +- Add support for SketchyBar (via @LarsRefsgaard) ## Mackup 0.8.40 diff --git a/README.md b/README.md index c93f7925b..a3fa7f1f3 100644 --- a/README.md +++ b/README.md @@ -607,6 +607,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Shuttle](http://fitztrev.github.io/shuttle/) - [SizeUp](http://www.irradiatedsoftware.com/sizeup/) - [Sizzy](https://sizzy.co/) +- [SketchyBar](https://felixkratz.github.io/SketchyBar/) - [skhd](https://github.com/koekeishiya/skhd/) - [Skim](http://skim-app.sourceforge.net/) - [Skitch](https://evernote.com/skitch/) diff --git a/mackup/applications/sketchybar.cfg b/mackup/applications/sketchybar.cfg new file mode 100644 index 000000000..58b2f931a --- /dev/null +++ b/mackup/applications/sketchybar.cfg @@ -0,0 +1,6 @@ +[application] +name = SketchyBar + +[xdg_configuration_files] +sketchybar/sketchybarrc +sketchybar/plugins From 7509dfddad21d8557ac48532daf89f83bd793c37 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 11 Feb 2024 17:22:33 +0100 Subject: [PATCH 1242/1256] Update poetry.lock --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index f3013ba27..594fdfcad 100644 --- a/poetry.lock +++ b/poetry.lock @@ -59,13 +59,13 @@ files = [ [[package]] name = "pluggy" -version = "1.3.0" +version = "1.4.0" description = "plugin and hook calling mechanisms for python" optional = false python-versions = ">=3.8" files = [ - {file = "pluggy-1.3.0-py3-none-any.whl", hash = "sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7"}, - {file = "pluggy-1.3.0.tar.gz", hash = "sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12"}, + {file = "pluggy-1.4.0-py3-none-any.whl", hash = "sha256:7db9f7b503d67d1c5b95f59773ebb58a8c1c288129a88665838012cfb07b8981"}, + {file = "pluggy-1.4.0.tar.gz", hash = "sha256:8c85c2876142a764e5b7548e7d9a0e0ddb46f5185161049a79b7e974454223be"}, ] [package.extras] From 3e4943b166b982a0e92287ceb6052ae1d25eb3cb Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 11 Feb 2024 17:36:22 +0100 Subject: [PATCH 1243/1256] Replace black with ruff (#1996) --- .github/workflows/{lint.yaml => ruff.yaml} | 6 ++---- Makefile | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) rename .github/workflows/{lint.yaml => ruff.yaml} (57%) diff --git a/.github/workflows/lint.yaml b/.github/workflows/ruff.yaml similarity index 57% rename from .github/workflows/lint.yaml rename to .github/workflows/ruff.yaml index a4180836a..04afafe30 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/ruff.yaml @@ -7,10 +7,8 @@ on: jobs: - black: + ruff: runs-on: ubuntu-latest - container: python steps: - - run: pip install black - uses: actions/checkout@v4 - - run: black --check --target-version py310 . + - uses: chartboost/ruff-action@v1 diff --git a/Makefile b/Makefile index 22009361e..621171357 100644 --- a/Makefile +++ b/Makefile @@ -16,5 +16,5 @@ release: clean poetry build poetry publish -black: - black --target-version py310 . +ruff: + ruff check . From e9dfd107343df0d47af540e65409fa54db2ace6f Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 11 Feb 2024 17:40:58 +0100 Subject: [PATCH 1244/1256] Enable tests on 3.12 (#1997) --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index f13bc6c96..258fd4d44 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,7 @@ jobs: - "3.9" - "3.10" - "3.11" - # - "3.12" # Installing numpy (1.24.4): Failed + - "3.12" container: python:${{ matrix.python-version }} steps: - run: echo "${HOME}/.local/bin" >> $GITHUB_PATH From 9666a57520636bb2cf45af0b913e3a1a284b9208 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 11 Feb 2024 17:44:31 +0100 Subject: [PATCH 1245/1256] Update test.yaml (#1998) --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 258fd4d44..ab33d4946 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -7,7 +7,7 @@ on: jobs: - nose: + pytest: runs-on: ubuntu-latest strategy: matrix: From ca38f2a9e6fa6d9c7fe2f5d9bf70fd7c5d82add7 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 11 Feb 2024 18:09:21 +0100 Subject: [PATCH 1246/1256] Bunch of cleanups (#1999) --- .github/workflows/markdown.yaml | 2 +- .gitignore | 7 ------- .markdownlintignore | 1 + .mdl_style.rb | 4 ---- .mdlrc | 1 - Makefile | 4 +--- codecov.yml | 1 - 7 files changed, 3 insertions(+), 17 deletions(-) create mode 100644 .markdownlintignore delete mode 100644 .mdl_style.rb delete mode 100644 .mdlrc delete mode 100644 codecov.yml diff --git a/.github/workflows/markdown.yaml b/.github/workflows/markdown.yaml index 8f73aca67..9b4ccd386 100644 --- a/.github/workflows/markdown.yaml +++ b/.github/workflows/markdown.yaml @@ -7,7 +7,7 @@ on: jobs: - mdl: + markdownlint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.gitignore b/.gitignore index 5e2e8eadb..3d6e5a1f1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,11 +2,4 @@ *.pyc # Generated by make release -/mackup.egg-info/ /dist/ - -# Generated by make test -/.coverage - -# Used by pyenv -/.python-version diff --git a/.markdownlintignore b/.markdownlintignore new file mode 100644 index 000000000..2bfa6a4d9 --- /dev/null +++ b/.markdownlintignore @@ -0,0 +1 @@ +tests/ diff --git a/.mdl_style.rb b/.mdl_style.rb deleted file mode 100644 index 87660f6eb..000000000 --- a/.mdl_style.rb +++ /dev/null @@ -1,4 +0,0 @@ -all -rule 'MD007', :indent => 2 -rule 'MD029', :style => :ordered -exclude_rule 'MD041' diff --git a/.mdlrc b/.mdlrc deleted file mode 100644 index 8f1aa6109..000000000 --- a/.mdlrc +++ /dev/null @@ -1 +0,0 @@ -style './.mdl_style.rb' diff --git a/Makefile b/Makefile index 621171357..aedb6e084 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,11 @@ lint: - # Install mdl with "gem install mdl" - mdl . + markdownlint -c .markdownlint.yaml '**/*.md' test: poetry install --with dev poetry run pytest clean: - rm -rf __pycache__ rm -rf mackup/__pycache__ rm -rf tests/__pycache__ rm -rf dist/ diff --git a/codecov.yml b/codecov.yml deleted file mode 100644 index 651ace8f3..000000000 --- a/codecov.yml +++ /dev/null @@ -1 +0,0 @@ -comments: false From 5dafbc7deb13333998db3627fc2163e2217dda99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BA=A2?= Date: Mon, 19 Feb 2024 05:22:00 -0800 Subject: [PATCH 1247/1256] feat: Add support for nvm (#2001) --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/nvm.cfg | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 mackup/applications/nvm.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 972e60ae5..c39a053c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Add support for JankyBorders (via @LarsRefsgaard) - Add support for AeroSpace (via @LarsRefsgaard) - Add support for SketchyBar (via @LarsRefsgaard) +- Add support for nvm (via @Wxh16144) ## Mackup 0.8.40 diff --git a/README.md b/README.md index a3fa7f1f3..51e145ad8 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. - [nuget](https://www.nuget.org/) - [Nushell](https://www.nushell.sh/) - [nvALT](http://brettterpstra.com/projects/nvalt/) +- [nvm](https://github.com/nvm-sh/nvm) - [nvpy](https://github.com/cpbotha/nvpy) - [OBS](https://obsproject.com) - [Oh My Fish](https://github.com/bpinto/oh-my-fish) diff --git a/mackup/applications/nvm.cfg b/mackup/applications/nvm.cfg new file mode 100644 index 000000000..fe48af855 --- /dev/null +++ b/mackup/applications/nvm.cfg @@ -0,0 +1,5 @@ +[application] +name = nvm + +[configuration_files] +.nvm/default-packages From 77e81127c718d12377889aa87b3a1c7501939143 Mon Sep 17 00:00:00 2001 From: Damien Date: Sun, 25 Feb 2024 03:20:40 +0100 Subject: [PATCH 1248/1256] Add support for PHPStorm 2023.3 (#2002) --- CHANGELOG.md | 1 + mackup/applications/phpstorm.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c39a053c3..ccc23f83f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Add support for AeroSpace (via @LarsRefsgaard) - Add support for SketchyBar (via @LarsRefsgaard) - Add support for nvm (via @Wxh16144) +- Add support for PHPStorm 2023.3 (via @damosse31) ## Mackup 0.8.40 diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg index 9977d4298..46ae10516 100644 --- a/mackup/applications/phpstorm.cfg +++ b/mackup/applications/phpstorm.cfg @@ -13,6 +13,7 @@ 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/JetBrains/PhpStorm2023.3 Library/Application Support/PhpStorm2016.1 Library/Application Support/PhpStorm2016.2 Library/Application Support/PhpStorm2016.3 From ed4e4721b80d91534214000e914309f4bea62654 Mon Sep 17 00:00:00 2001 From: Xander <1174877+xtrasmal@users.noreply.github.com> Date: Sat, 6 Apr 2024 11:43:47 +0200 Subject: [PATCH 1249/1256] Create helix.cfg Adds support for Helix editor. https://helix-editor.com/ --- mackup/applications/helix.cfg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mackup/applications/helix.cfg diff --git a/mackup/applications/helix.cfg b/mackup/applications/helix.cfg new file mode 100644 index 000000000..ef09c512c --- /dev/null +++ b/mackup/applications/helix.cfg @@ -0,0 +1,6 @@ +[application] +name = Helix + +[configuration_files] +.config/helix/config.toml +.config/helix/languages.toml From 1242f3e400ad5ee1a79b08e8db5d75c62f7d0ce0 Mon Sep 17 00:00:00 2001 From: Xander Smalbil <1174877+xtrasmal@users.noreply.github.com> Date: Sat, 6 Apr 2024 11:55:12 +0200 Subject: [PATCH 1250/1256] adds Helix to CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccc23f83f..724bb6755 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## WIP +- Add support for Helix (via @xtrasmal) - Added support for DBeaver (via @or-tal-0) - Added support for rtx (via @dnicolson) - Add support for new TOML config for Alacritty (via @syphar) From 1d26002be42a7a44091ea7efb830de4e831c38f9 Mon Sep 17 00:00:00 2001 From: Xander Smalbil <1174877+xtrasmal@users.noreply.github.com> Date: Sat, 6 Apr 2024 11:55:30 +0200 Subject: [PATCH 1251/1256] adds Helix to README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 51e145ad8..0141ee81e 100644 --- a/README.md +++ b/README.md @@ -354,6 +354,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [Gradle](http://gradle.org) - [GrandTotal 3](http://www.mediaatelier.com/GrandTotal4/) - [grsync](http://www.opbyte.it/grsync/) +- [Helix](https://helix-editor.com/) - [Hammerspoon](http://www.hammerspoon.org/) - [HandBrake](https://handbrake.fr/) - [Hands Off!](http://www.oneperiodic.com/products/handsoff/) From 32e7a38fafaa139cfeb5fdd46b3d235814215cd2 Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Sun, 19 May 2024 16:33:29 +0200 Subject: [PATCH 1252/1256] Add ubuntu-24.04 (#2024) --- .github/workflows/install.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml index d49e849c1..5f056ad60 100644 --- a/.github/workflows/install.yaml +++ b/.github/workflows/install.yaml @@ -13,6 +13,7 @@ jobs: os: - "ubuntu-20.04" - "ubuntu-22.04" + - "ubuntu-24.04" python-version: - "3.8" - "3.9" @@ -37,5 +38,5 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - run: pip3 install . + - run: pip install . - run: mackup --help From 6ad9eb8389d981b4a7da3e9799fb40327ca40a1f Mon Sep 17 00:00:00 2001 From: Shuhei Takiguchi Date: Mon, 20 May 2024 01:09:55 +0900 Subject: [PATCH 1253/1256] Add support for Cursor (#2020) Co-authored-by: Laurent Raufaste --- CHANGELOG.md | 1 + README.md | 1 + mackup/applications/cursor.cfg | 12 ++++++++++++ 3 files changed, 14 insertions(+) create mode 100644 mackup/applications/cursor.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index ccc23f83f..b7cb515bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Add support for SketchyBar (via @LarsRefsgaard) - Add support for nvm (via @Wxh16144) - Add support for PHPStorm 2023.3 (via @damosse31) +- Add support for Cursor (via @takyshu98) ## Mackup 0.8.40 diff --git a/README.md b/README.md index 51e145ad8..b273f9271 100644 --- a/README.md +++ b/README.md @@ -267,6 +267,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [CoRD](http://cord.sourceforge.net/) - [CotEditor](http://coteditor.com/) - [Ctags](http://ctags.sourceforge.net/) +- [Cursor](https://cursor.sh/) - [cVim](https://github.com/1995eaton/chromium-vim) - [Cyberduck](https://cyberduck.io/) - [DaisyDisk](https://daisydiskapp.com) diff --git a/mackup/applications/cursor.cfg b/mackup/applications/cursor.cfg new file mode 100644 index 000000000..760be9510 --- /dev/null +++ b/mackup/applications/cursor.cfg @@ -0,0 +1,12 @@ +[application] +name = Cursor + +[configuration_files] +Library/Application Support/Cursor/User/snippets +Library/Application Support/Cursor/User/keybindings.json +Library/Application Support/Cursor/User/settings.json + +[xdg_configuration_files] +Cursor/User/snippets +Cursor/User/keybindings.json +Cursor/User/settings.json From 8045b21c6df533820bec65299544956956a2bdec Mon Sep 17 00:00:00 2001 From: Laurent Raufaste Date: Tue, 21 May 2024 12:00:41 +0200 Subject: [PATCH 1254/1256] The macOS 11 runner image will be removed by 6/28/24 (#2027) --- .github/workflows/install.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml index 5f056ad60..e27a4d85b 100644 --- a/.github/workflows/install.yaml +++ b/.github/workflows/install.yaml @@ -31,7 +31,6 @@ jobs: strategy: matrix: os: - - macos-11 - macos-12 - macos-13 - macos-14 From 0def08b8543ac3a436257cce4426a5b109b31a2d Mon Sep 17 00:00:00 2001 From: Edwin van de Pol Date: Sat, 8 Jun 2024 14:36:37 +0200 Subject: [PATCH 1255/1256] Add support for PHPStorm 2024.1 (#2031) --- CHANGELOG.md | 1 + mackup/applications/phpstorm.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7cb515bd..7962576c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Add support for nvm (via @Wxh16144) - Add support for PHPStorm 2023.3 (via @damosse31) - Add support for Cursor (via @takyshu98) +- Add support for PHPStorm 2024.1 (via @edwinvdpol) ## Mackup 0.8.40 diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg index 46ae10516..13e4296dc 100644 --- a/mackup/applications/phpstorm.cfg +++ b/mackup/applications/phpstorm.cfg @@ -14,6 +14,7 @@ Library/Application Support/JetBrains/PhpStorm2022.3 Library/Application Support/JetBrains/PhpStorm2023.1 Library/Application Support/JetBrains/PhpStorm2023.2 Library/Application Support/JetBrains/PhpStorm2023.3 +Library/Application Support/JetBrains/PhpStorm2024.1 Library/Application Support/PhpStorm2016.1 Library/Application Support/PhpStorm2016.2 Library/Application Support/PhpStorm2016.3 From a1c3136d1b4bb25afe53fe2c2a768a69ad6f7a78 Mon Sep 17 00:00:00 2001 From: Xander <1174877+xtrasmal@users.noreply.github.com> Date: Thu, 25 Jul 2024 17:06:24 +0200 Subject: [PATCH 1256/1256] Update helix.cfg Changes name to lowercase --- mackup/applications/helix.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mackup/applications/helix.cfg b/mackup/applications/helix.cfg index ef09c512c..d9a8a0cd7 100644 --- a/mackup/applications/helix.cfg +++ b/mackup/applications/helix.cfg @@ -1,5 +1,5 @@ [application] -name = Helix +name = helix [configuration_files] .config/helix/config.toml