Archives/oh-my-fish
2
0
Fork 0
mirror of https://github.com/oh-my-fish/oh-my-fish synced 2024-11-09 13:10:40 +00:00
Code Issues Projects Releases Wiki Activity
1,251 Commits 4 Branches 6 Tags 3.7 MiB
e40f2d3ceb
Commit Graph

1251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bruno
e40f2d3ceb Merge pull request #80 from oh-my-fish/dockerize 
Dockerize
 2015-10-02 23:52:51 +01:00
Bruno Pinto
dde679ff98 Get original repository branch name 
Travis does not provide the original repository branch name on any
environment variable. We are getting the information from the GitHub
API instead.

The misleading environment variable `TRAVIS_BRANCH` returns `master`
instead:
> TRAVIS_BRANCH: For builds not triggered by a pull request this is the
name of the branch currently being built; whereas for builds triggered
by a pull request this is the name of the branch targeted by the pull
request (in many cases this will be master).

Reference: http://docs.travis-ci.com/user/environment-variables/
 2015-10-02 23:50:18 +01:00
Bruno Pinto
faba765a94 Run tests on an isolated docker environment 
- Install fish from dockerfile and generate a docker image.
- Install Oh My Fish! from downloaded git repository and generate a
  docker image.
 2015-10-02 23:50:18 +01:00
Bruno Pinto
319c8a05cd Don't overwrite function on test environment 
Instead of overwriting functions that use `exec fish` on test
environment, skip this call if the variable `CI` has been defined on the
running shell.
 2015-10-02 23:50:18 +01:00
Bruno Pinto
055178bf3d Dockerfile to install fish and test dependencies 
This Dockerfile creates an ubuntu machine with fish-shell and the
dependencies we use on our test suite installed.

It does not install Oh My Fish, which one might find weird (I do). Not
confident that this is the best approach, but it's the best I could find
at the moment.
 2015-10-02 23:50:18 +01:00
Bruno
e59b75125a Merge pull request #89 from coderstephen/master 
Update pkg urls and add weather plugin
 2015-10-02 21:56:44 +01:00
Stephen Coakley
53940f5187 Update pkg urls and add weather plugin 2015-10-02 15:54:00 -05:00
Bruno
a1243f659f Merge pull request #83 from oh-my-fish/faster-loading 
Faster loading
 2015-10-02 21:37:54 +01:00
Bruno Pinto
e2a7f7d229 Split into init.fish and omf.fish files 2015-10-02 21:35:06 +01:00
Bruno Pinto
30ab05445d Add require function to support plugin dep 
In order to support dependency between plugins a function called
`require` has been added.
 2015-10-02 21:35:06 +01:00
Bruno Pinto
ceb31c143a Source init.fish on each plugin. 
Unnecessarily sourcing a `$plugin_name.fish` is affecting the loading
time.
 2015-10-02 21:35:05 +01:00
Bruno
2040eedc15 Merge pull request #84 from oh-my-fish/stash-is-bad 
Stash does not support --git-dir
 2015-10-02 21:34:12 +01:00
Bruno Pinto
9cc8ee5a82 Stash does not support --git-dir 
Stash is a shell script that does not support `--git-dir`, not even on
latest versions. We need to use `git -C` which was only added on recent
versions of `git`.

`omf update` will fail in case omf need needs to run `git stash` and
git is not compatible.
 2015-10-02 21:16:50 +01:00
Bruno
f0ea67b861 Merge pull request #72 from coderstephen/master 
Split custom "init.fish" into clearer "before.init.fish" and "init.fish"
 2015-10-02 20:59:45 +01:00
Stephen Coakley
18679d866e Split custom "init.fish" into clearer "before.init.fish" and "init.fish" 2015-10-02 11:33:23 -05:00
Bruno
557b5da03b Merge pull request #85 from chgu82837/pr/add-pastfish-theme 
add pastfish theme
 2015-10-01 20:36:27 +01:00
PastLeo
32344b305c add pastfish theme and update theme-doc 2015-10-02 03:01:56 +08:00
Bruno Pinto
99be4930bc Merge pull request #39 from icyleaf-feature/i18n-plan 2015-09-29 18:51:22 +01:00
Bruno Pinto
3069368dc5 Remove license from README 2015-09-29 18:50:54 +01:00
icyleaf
639390b203 Added switch language menu 2015-09-29 18:48:12 +01:00
icyleaf
a40f3be16b Split doc file by i18n rule, add zh-CN docs 2015-09-29 18:48:12 +01:00
Bruno
658c8ad50f Merge pull request #79 from derekstavis/omf-config-to-init 
Move $OMF_CONFIG variable to $OMF_PATH/init.fish
 2015-09-29 16:57:49 +01: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
Bruno
456f6fc4ce Merge pull request #71 from Pyppe/travis-themes-test 
Add test-generate-themes-doc.fish
 2015-09-28 21:43:52 +01:00
Pyry-Samuli Lahti
c97e1af4bc Add test-generate-themes-doc.fish 
* Run with Travis CI, if commits contain changes to `db/themes`
* When run; fail build if `docs/Themes.md` is no longer up-to-date
 2015-09-28 23:36:22 +03:00
Bruno
9c071490ab Merge pull request #73 from vincentjames501/add-getopts-pkg 
Add getopts pkg
 2015-09-28 17:45:34 +01:00
Vincent Pizzo
2675b22b2c Add getopts pkg 2015-09-28 11:30:59 -05:00
Bruno
3d77c39e27 Merge pull request #74 from vincentjames501/add-kill-on-port-pkg 
Add kill-on-port pkg
 2015-09-28 11:19:39 +01:00
Vincent Pizzo
9dacbaad0e Add kill-on-port pkg 2015-09-27 20:23:11 -05:00
Bruno
9f3ab25515 Merge pull request #70 from jeremiejig/remove_pushd_popd 
Remove some pushd popd, using git --git-dir --work-tree
 2015-09-27 22:23:01 +01:00
Bruno
b31f6f3d6a Merge pull request #69 from nelsonjchen/add-nelsonjchen-theme 
Add nelsonjchen theme to db
 2015-09-27 17:58:06 +01:00
Nelson Chen
c71106a585 Add nelsonjchen theme to db 2015-09-27 09:57:16 -07:00
jeremiejig
56b1d837e0 changing to git -C to git --git-dir work-tree 2015-09-27 18:53:51 +02:00
jeremiejig
5cdde2639a bin/install & omf.repo.pull adding -C $git_dir removing pushd and popd 2015-09-27 18:53:51 +02:00
Bruno
1994b658ff Merge pull request #52 from jeremiejig/travisci 
Travis: Base of travis test
 2015-09-27 17:49:29 +01:00
Bruno
c95bef8e30 Merge pull request #68 from coderstephen/master 
Add tmux-zen plugin to db
 2015-09-27 17:48:23 +01:00
Bruno
c99b5fed59 Merge pull request #66 from derekstavis/patch-1 
README: add custom config file documentation
 2015-09-27 17:47:13 +01:00
Bruno
dbfac3a748 Merge pull request #65 from nelsonjchen/readme-remove-src-in-spacer 
Remove src attribute from spacer image in the README
 2015-09-27 17:45:58 +01:00
jeremiejig
77275ea492 adding a TODO: comment 2015-09-27 14:59:30 +02:00
jeremiejig
7022c3db95 tests: test commands help, query & install 2015-09-27 14:59:30 +02:00
jeremiejig
9258757901 install script using git -C $OMF_PATH 2015-09-27 14:59:30 +02:00
jeremiejig
961d051c2e Some Renaming. Creation of tools dir. 
Moving and renaming install_fish.sh to travis_install_fish

Moving travis_* from tests to tools.

rename: fish_user_function/ -> functions_override/

renaming travis_test.fish to test_runner.fish
 2015-09-27 14:59:20 +02:00
jeremiejig
2556068da6 adding the entry point to do some more test. 2015-09-27 14:51:18 +02:00
jeremiejig
7919f8ef6a travis: new travis_install_omf script to checkout PR 2015-09-27 14:51:16 +02:00
jeremiejig
e68dca448a travis: setting env for OMF_REPO_URI and OMF_REPO_BRANCH 2015-09-27 14:49:35 +02:00
jeremiejig
a7d6376616 install_fish: Use strip on binary fish... 
Cache from 7.51MB to 1.63MB
 2015-09-27 14:49:35 +02:00
jeremiejig
250fe263ef Travis: Adding fish-2.2.0 from github. 
Adding apt dependencies + build script + cache directive.
 2015-09-27 14:49:22 +02:00
Stephen Coakley
e8268d647f Add tmux-zen plugin to db 2015-09-27 01:52:56 -05:00
Derek Willian Stavis
1be472aa86 README: add custom config file documentation 
Addresses #40 by briefly documenting init.fish file.
 2015-09-27 01:15:49 -03:00
Nelson Chen
8fcb1cf0c0 Remove src attribute from spacer image in the README 
Spacer still works just as good.

This will make Chrome and its siblings not display a broken image placeholder
in the spacer.

Confirmed OK on Firefox and Safari.
 2015-09-26 20:22:40 -07:00