cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use gpg isntead of gpg2 when necessary

Browse source
This commit is contained in:
Cyryl Plotnicki 2016-11-01 14:35:53 +01:00
parent 8790efe856
commit 386212b872
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
common/configure_fresh_system
View file

@ -105,8 +105,21 @@ set +e
set -e set -e
fi fi
set +e
echo "Querying for gpg2 path"
gpg2_path=`which gpg2`
echo "Got $gpg2_path for gpg2 path"
echo set -e
if [[ -x gpg2_path ]]; then
echo "Using gpg2"
GPG=gpg2
else
echo "WARNING using gpg instead of gpg2"
GPG=gpg
fi
if [[ -z $NORUBY ]]; then if [[ -z $NORUBY ]]; then
gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 $GPG --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
curl -sSL https://get.rvm.io | bash -s stable --ruby curl -sSL https://get.rvm.io | bash -s stable --ruby
fi fi

8
windows/build_insider.sh
View file

@ -4,17 +4,19 @@ set -e
DOTFILES_PATH="$HOME/dev/dotfiles" DOTFILES_PATH="$HOME/dev/dotfiles"
mkdir -pv $HOME/dev/ mkdir -pv $HOME/dev/
rm -fr $DOTFILES_PATH
git clone "$OUTER_CLONE" "$DOTFILES_PATH" if [[ ! -d $DOTFILES_PATH ]]; then
git clone "$OUTER_CLONE" "$DOTFILES_PATH"
fi
cd "$DOTFILES_PATH" cd "$DOTFILES_PATH"
git remote set-url origin git@github.com:cyplo/dotfiles.git git remote set-url origin git@github.com:cyplo/dotfiles.git
git checkout $branch git checkout $branch
git pull
export NOSUDO=true export NOSUDO=true
export DONT_CHANGE_SHELL=true export DONT_CHANGE_SHELL=true
export NORUST=true export NORUST=true
export NORUBY=true
export NO_GO=true export NO_GO=true
export DIR=$DOTFILES_PATH export DIR=$DOTFILES_PATH
export NOYCM=true export NOYCM=true