diff --git a/Makefile b/Makefile index d162cfa..b5ddddb 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,11 @@ DOTFILES=$(PWD) -install: apt bash config gnome yaourt +install: apt bash bin config gnome yaourt + chmod +x $(DOTFILES)/deploy.sh +bin: + chmod +x $(DOTFILES)/bin/* bash: yaourt ln -sfP $(DOTFILES)/bash/.bashrc ~/.bashrc @@ -16,7 +19,7 @@ gnome: yaourt rm -rf ~/Templates/* ln -sfP $(DOTFILES)/gnome/Templates/* ~/Templates/ -yaourt: pacman python-fix +yaourt: pacman hot\-fix yaourt -Syau # Install any updates before extra packages yaourt -S `cat $(DOTFILES)/yaourt/packages.conf` --needed ln -sfP $(DOTFILES)/yaourt/.yaourtrc ~/.yaourtrc @@ -28,7 +31,7 @@ pacman: sudo pacman-key --lsign-key 962DDE58 gpg --keyserver pool.sks-keyservers.net --recv-keys 2E1AC68ED40814E0 # gotta be a way to add to pacman, not my GPG -python-fix: +hot\-fix: sudo ln -sfP /usr/bin/python2 /usr/bin/python # Set the default python version to be python 2 -.PHONY: apt bash config gnome yaourt pacman python-fix +.PHONY: apt bash bin config gnome yaourt pacman hot-fix diff --git a/circle.yml b/circle.yml index d4677ef..bf20114 100644 --- a/circle.yml +++ b/circle.yml @@ -5,7 +5,6 @@ machine: test: override: - npm install -g jsonlint - - jsonlint -q yaourt/packages.json - jsonlint -q apt/apt-installs-core.json - jsonlint -q apt/apt-installs-extra.json - jsonlint -q apt/apt-repos.json diff --git a/deploy.sh b/deploy.sh old mode 100644 new mode 100755 index eec3a20..cbc7474 --- a/deploy.sh +++ b/deploy.sh @@ -25,7 +25,8 @@ mv atom/Atom\ Settings.md atom/README.md echo ">> Preparing Git..." git config user.name "Jake Howard" git config user.email "git@theorangeone.net" - +git add . +git reset HEAD . echo ">> Ready!" echo "1. Add and commit files." echo "2. git push -f origin master" diff --git a/yaourt/packages.conf b/yaourt/packages.conf index c913785..d273c3b 100644 --- a/yaourt/packages.conf +++ b/yaourt/packages.conf @@ -76,7 +76,7 @@ variety vbam-gtk virtualbox vlc -whatsapp-desktop +whatsapp-desktop-bin wps-office wps-office-extension-english-uk-dictionary yaourt