Merge branch 'master' of github.com:revans/bash-it

.gitignore

@@ -5,3 +5,4 @@ custom/*.bash
 aliases/custom.aliases.bash
 lib/custom.bash
 plugins/custom.plugins.bash
+*.swp

aliases/general.aliases.bash

@@ -6,6 +6,7 @@ alias ls='ls -G'        # Compact view, show colors
 alias la='ls -AF'       # Compact view, show hidden
 alias ll='ls -al'
 alias l='ls -a'
+alias l1='ls -1'
 
 alias c='clear'
 alias k='clear'

aliases/git.aliases.bash

@@ -8,6 +8,7 @@ alias g='git'
 alias get='git'
 alias gst='git status'
 alias gs='git status'
+alias gss='git status -s'
 alias gl='git pull'
 alias gup='git fetch && git rebase'
 alias gp='git push'
@@ -46,6 +47,7 @@ function git-help() {
   echo "  ga      = git add"
   echo "  gall	  = git add ."
   echo "  gst/gs  = git status"
+  echo "  gss	  = git status -s"
   echo "  gl      = git pull"
   echo "  gup     = git fetch && git rebase"
   echo "  gp      = git push"

aliases/jekyll.aliases.bash

@@ -0,0 +1,19 @@
+# Open the root of your site in your favorite editor
+
+alias newentry="cd $JEKYLL_LOCAL_ROOT && $EDITOR ."
+
+# Open the _posts/ directory for making a new blog post (seperate from above alias because not everyone uses jekyll for a blog)
+
+alias newpost="cd $JEKYLL_LOCAL_ROOT/_posts && $EDITOR ."
+
+# Build and locally serve the site
+
+alias testsite="cd $JEKYLL_LOCAL_ROOT && jekyll --server --auto"
+
+# Build but don't locally serve the site
+
+alias buildsite="cd $JEKYLL_LOCAL_ROOT && rm -rf _site/ && jekyll"
+
+# Rsync the site to the remote server
+
+alias deploysite="cd $JEKYLL_LOCAL_ROOT && rsync -rz _site/ $JEKYLL_REMOTE_ROOT"

template/bash_profile.template.bash

@@ -26,5 +26,13 @@ export NGINX_PATH='/opt/nginx'
 # Don't check mail when opening terminal.
 unset MAILCHECK
 
+# Change this to the path of your local jekyll root to use the jekyll aliases
+
+export JEKYLL_LOCAL_ROOT="~/Sites/mrminimalist"
+
+# And change this to the remote server and root
+
+export JEKYLL_REMOTE_ROOT="user@server:/path/to/jekyll/root"
+
 # Load Bash It
 source $BASH/bash_it.sh