Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Talleyran/install_script
base: 57e3080a73
...
head fork: Talleyran/install_script
compare: 26d143da2a
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 17 additions and 9 deletions.
  1. +7 −8 files/.zshrc
  2. +10 −1 install-all.sh
View
15 files/.zshrc
@@ -21,7 +21,13 @@ plugins=(rake git mercurial vi-mode)
source $ZSH/oh-my-zsh.sh
# Customize to your needs...
-alias reso="source $ZSH/oh-my-zsh.sh"
+alias reso="source ~/.zshrc"
+
+alias bi="bundle install"
+alias bu="bundle update"
+alias be="bundle exec"
+alias bea="bundle exec autoload"
+alias bet="bundle exec thin"
alias addppa="sudo add-apt-repository"
alias aptup="sudo apt-get update"
@@ -30,8 +36,6 @@ alias aptsgr="sudo apt-get dist-upgrade"
alias apti="sudo apt-get install"
alias r="rails"
-alias bi="bundle install"
-alias be="bundle exec"
alias gsvim='gvim --servername onevim'
alias gsvimadd='gsvim --remote'
@@ -59,7 +63,6 @@ alias grsh='git reset --hard'
alias gcur='git rev-parse HEAD'
alias gcam='git commit --amend'
alias gar="git add .&&git ls-files --deleted | xargs git rm"
-<<<<<<< HEAD
alias gar="git add .&&git ls-files --deleted | xargs git rm"
alias gd="git diff"
alias gdh="git diff HEAD"
@@ -67,10 +70,6 @@ alias gsi="git submodule init"
alias gsu="git submodule update"
alias hids="history | grep"
-=======
-alias gd="git diff"
-alias gdh="git diff HEAD"
->>>>>>> f991baa639ba28dc7fe9d6e1e318af37f283f763
alias xclip='xclip -selection c'
View
11 install-all.sh
@@ -16,6 +16,7 @@ fi
show_help() {
echo 'You can install:
+ chsh
rsa
system
git
@@ -60,18 +61,22 @@ else
not_b=true
fi
+chsh=$not_b
rsa=$not_b
system=$not_b
git=$not_b
vim=$not_b
ruby=$not_b
desktop=$not_b
+postgres=$not_b
gis=$not_b
mapscript=$not_b
for i in $*
do
case $i in
+ chsh) chsh=$b
+ ;;
rsa) rsa=$b
;;
system) system=$b
@@ -96,7 +101,9 @@ cd ~
sudo echo We are sudo
#set shell
+if $chsh;then
chsh -s /bin/zsh
+fi
#gen rsa
if $rsa;then
@@ -128,6 +135,7 @@ fi
if $vim;then
rm -rf .vim #clean
rm -f .vimrc #clean
+ rm -f .iabbrev #clean
sudo apt-get install -y vim-gnome
git clone git@github.com:Talleyran/myvim.git ~/.vim
cd ~/.vim
@@ -177,12 +185,13 @@ fi
if $gis;then
if [[ $version = new ]]
then
- sudo add-apt-repository -y ppa:alexey-smirnov/deadbeef
+ sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
else
sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable
fi
sudo apt-get update
sudo apt-get install -y qgis mapserver-bin postgis postgresql-8.4-postgis
+ #TODO default spatial template
fi
#mapscript

No commit comments for this range

Something went wrong with that request. Please try again.