Commit Graph

24 Commits

Author SHA1 Message Date
Mathias Djärv
543afc7c01 assert fish version before asserting commands (#399)
* assert fish version before asserting commands

- fix #398 so that the correct error message is displayed

* move assert_cmds to after fish and git checks

- remove fish and git from assert_cmds, these checks are already done in their specific assert_ functions making them redundant in assert_cmds
- move function assert_cmds to match execution order
2016-09-16 10:49:36 -05:00
Stephen M. Coakley
9aae289714 ~ expansion and always setup config in multiple installs (#381) 2016-08-08 12:11:18 -05:00
Stephen M. Coakley
cfe8e769db Refactor installer and config setup (#361)
Refactor the installer to be more maintainable and interactive. The installer is now more robust and safe in its operation, and asks interactive questions for choices that the user must resolve. Setting up confuguration is also now changed to take advantage of Fish 2.3 features and does not mess with user's configuration files without permission.

- Make installer smarter and use uninstaller in destroy
- Better handling and checking for offline installs
- `omf destroy` simply uses `install --uninstall`
- Final warning message is no longer displayed when user intentionally aborts install
- Backups are restored during uninstall
- Update the README to detail the new ways to install OMF
2016-08-08 09:00:17 -05:00
Stephen M. Coakley
228ef9aafe Evaluate OMF_PATH at init time to fix #136 (#348) 2016-06-15 15:20:49 -03:00
Luís Fiolhais
780c833cb4 Inspect $FISH_VERSION variable instead of $version 2016-06-02 11:16:46 +01:00
Stephen M. Coakley
c809051edd Bump minimum Fish version in installer (fix #243) 2016-05-13 02:17:34 -05:00
Johnny Robeson
e5997f211e Add https:// to curl calls in README and install script 2015-10-20 18:17:49 -04:00
Derek Stavis
433832bb82 install: Remove existing fish_prompt into a backup
First works toward generalizing file backup code, applying to both
config.fish file and now fish_prompt.fish too. This avoids clean
installs which start with theme issues.
2015-10-05 14:11:33 -03:00
Derek Stavis
7feb557569 Remove reload notice from installer script
Also fix a whitespace issue.
2015-10-03 16:45:45 -03:00
Derek Stavis
792e3b7b72 install: Replace source by fish invocation 2015-10-02 20:50:39 -03:00
Derek Stavis
8c394771df install: migrate script from bash to fish
- Checks for a supported fish version (greater than 2.1)
- Migrate travis install script to fish
2015-10-02 20:16:04 -03:00
Derek Stavis
c58d14fe3e Move $OMF_CONFIG variable to $OMF_PATH/init.fish
This PR sets the default value of `OMF_CONFIG` variable in
framework init.fish file. The variable can still be overridden by
the user by setting it on `~/.config/fish/config.fish file`.

This is in preparation to rewriting install script in plain fish,
which will ditch config template and stop replacing `config.fish`
contents in favor of just appending Oh My Fish startup.
2015-09-29 09:54:36 -03:00
jeremiejig
56b1d837e0 changing to git -C to git --git-dir work-tree 2015-09-27 18:53:51 +02:00
jeremiejig
9258757901 install script using git -C $OMF_PATH 2015-09-27 14:59:30 +02:00
Bruno Pinto
ae0e4388b6 Back to oh-my-fish organization 2015-09-03 19:35:19 +01:00
Bruno Pinto
7dad917436 Make default theme the default theme for omf.
* On clean install, configure and download `default` theme.
* Do not allow `default` theme to be removed.
* When the current theme is removed, fallback to `default`.
2015-09-01 12:38:32 +01:00
Derek Stavis
102771b73c install: resolve bundle if existent, otherwise create file 2015-08-31 20:39:54 -03:00
Bruno Pinto
f89bc18846 Do not convert $HOME when installing omf.
Keep `$HOME` variable inside `config.fish` when installing oh my fish
instead of converting it to its content.
2015-08-31 00:46:59 +01:00
Bruno Pinto
7c5e2b3964 Extracting template to a file and improving it
It's hard to read the template as it was being created using `echo`
instead of being defined on a separate file. Also adding some comments
to improve the configuration file readability.
2015-08-28 12:53:37 +01:00
Harrison Heck
e7abc74939 Change github url to current url. 2015-08-28 18:28:47 +09:00
Justin Hileman
0359ba047c Merge $OMF_CONFIG and $OMF_CUSTOM.
Per conversation with @bpinto in Gitter.

There's no need for two separate directories. You don't have a `.git` and `.git-custom` folder, you just put your config in `.git` :)

The most straightforward interpretation of XDG basedir spec is that user configuration for omf would go in `~/.config/omf`, so let's put it there. The only question is whether omf-generated config (i.e. the `theme` file) should go there as well. By analogy with git, programmatically generated config should probably be merged in with user config. This also makes it so when a user clones their dotfiles to a new machine, both kinds of settings come with it.
2015-08-27 11:02:30 -07:00
Jorge Bucaran
7a7b0ff393 create empty theme config file during install 2015-08-27 06:15:17 +09:00
Jorge Bucaran
c855e0024c fix omf new theme and remove default theme 2015-08-27 06:04:24 +09:00
Jorge Bucaran
2693a2fd18 %%% United States of the Fish → Wahoo + OMF %%% 2015-08-27 00:20:13 +09:00