diff --git a/apt/applications.md b/apt/applications.md index 227780c..0ad0d1e 100644 --- a/apt/applications.md +++ b/apt/applications.md @@ -1,19 +1,14 @@ # SDK - Android SDK - Java -- node -- nvm # Applications not installed automatically -- Astrill -- Atom - GitKraken - Messenger for desktop - PlayOnLinux - skype - slack - spotify -- thefuck - WPS office - xampp - Yandex diff --git a/apt/custom-installs.sh b/apt/custom-installs.sh new file mode 100644 index 0000000..9ef3165 --- /dev/null +++ b/apt/custom-installs.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -e + + +echo ">> Collecting Packages..." +wget https://atom.io/download/deb -O atom.deb +wget "https://www.astrill.com/downloads/astrill-setup-linux64.deb?mirror=uk" -O astrill.deb +curl -sL https://deb.nodesource.com/setup_5.x | -E bash - + +echo ">> Installing Packages..." +dpkg -i atom.deb +dpkg -i astrill.deb + + +echo ">> Installing Apt Packages" +apt-get install nodejs -y + + +echo ">> Installing other packages..." +wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash +wget -O - https://raw.githubusercontent.com/nvbn/thefuck/master/install.sh | sh - && $0 + + +echo ">> Cleaning up..." +rm -rf atom.deb astrill.deb diff --git a/wscript b/wscript index a47eb0e..9640f45 100644 --- a/wscript +++ b/wscript @@ -36,11 +36,10 @@ def apt_install_extras(ctx): for package in packages: os.system("apt-get install {} -y".format(package)) -def install_atom(ctx): - FILENAME = "atom.deb" - os.system('wget https://atom.io/download/deb -O {}'.format(FILENAME)) - os.system('dpkg -i {}'.format(FILENAME)) - os.remove(FILENAME) + +def run_custom_installs(ctx): + os.system('apt/custom-installs.sh') + def install_atom_packages(ctx): packages = json.load(open(DIR + '/atom/packages.json')) @@ -51,6 +50,7 @@ def install_atom_packages(ctx): def install_configs(ctx): shutil.copyfile(DIR + "/config/terminator.conf", "~/.config/terminator/config") + if __name__ == '__main__': print("Please run this file using waf, not directly.") exit(1)