Fixed a load of things!

INSTALL_ALL_THE_THINGS

@@ -22,14 +22,10 @@ EXEC_ORDER = [
 
 
 if __name__ == '__main__':
-    t0 = "temp_time"
+    t0 = time.time()
-    if os.geteuid() != 0:
+    for script in EXEC_ORDER:
-        print("Please run as root!")
+        script()
-    elif input("Are you sure you want to install (allthethings)? [Y/N]: ").lower() == 'y':
+        print("\n>> {} Exescuted.\n".format(script.__name__))
-        t0 = time.time()
+    t1 = time.time()
-        for script in EXEC_ORDER:
-            script()
-            print("\n>> {} Exe1cuted.\n".format(script.__name__))
-        t1 = time.time()
     print("Execution Complete")
-    print("Took {} seconds.".format(t1 - t0))
+    print("Took {} seconds.".format(int(t1 - t0)))

apt/add-apt-sources.sh

@@ -1,21 +1,24 @@
 #!/usr/bin/env bash
 
+HCLINE="deb http://downloads.hipchat.com/linux/apt stable main"
+HCFILE=/etc/apt/sources.list.d/atlassian-hipchat.list
 
-if [ -a /etc/apt/sources.list.d/atlassian-hipchat.list ]; then
+ILINE="deb http://apt.insynchq.com/ubuntu wily non-free contrib"
-  echo "deb http://downloads.hipchat.com/linux/apt stable main" >> /etc/apt/sources.list.d/atlassian-hipchat.list
+IFILE=/etc/apt/sources.list.d/atlassian-hipchat.list
-fi
+
+VLINE="deb http://download.virtualbox.org/virtualbox/debian wily contrib"
+VFILE=/etc/apt/sources.list.d/virtualbox.list
+
+OCLINE="deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_15.10/ /"
+OCFILE=/etc/apt/sources.list.d/owncloud-client.list
 
 
-if [ -a /etc/apt/sources.list.d/insync.list ]; then
+echo ">> Removing old files..."
-  echo "deb http://apt.insynchq.com/ubuntu wily non-free contrib" >> /etc/apt/sources.list.d/insync.list
+rm -rf $HCFILE $IFILE $VFILE $OCFILE
-fi
+touch $HCFILE $IFILE $VFILE $OCFILE
 
-
+echo "Adding new sources..."
-if [ -a /etc/apt/sources.list.d/virtualbox.list ]; then
+echo "$HCLINE" >> "$HCFILE"
-  echo "deb http://download.virtualbox.org/virtualbox/debian wily contrib" >> /etc/apt/sources.list.d/virtualbox.list
+echo "$ILINE" >> "$IFILE"
-if
+echo "$VLINE" >> "$VFILE"
-
+echo "$OCLINE" >> "$OCFILE"
-
-if [ -a /etc/apt/sources.list.d/owncloud-client.list ]; then
-  echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_15.10/ /' >> /etc/apt/sources.list.d/owncloud-client.list
-fi

apt/apt-installs-extra.json

@@ -2,7 +2,6 @@
   "hipchat",
   "insync",
   "kodi",
-  "mutate",
   "nodejs",
   "owncloud-client",
   "remmina",

apt/apt-repos.json

@@ -1,6 +1,5 @@
 [
   "ppa:team-xbmc/ppa",
-  "ppa:mutate/ppa",
   "ppa:remmina-ppa-team/remmina-next",
   "ppa:zeal-developers/ppa"
 ]

apt/custom-installs.sh

@@ -1,12 +1,9 @@
 #!/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 | bash -
+curl -sL https://deb.nodesource.com/setup_5.x | sudo -E bash -
 
 echo ">> Installing Packages..."
 dpkg -i atom.deb

scripts/install_dotfiles.py

@@ -3,6 +3,7 @@ import json, os, shutil
 
 
 DIR = os.getcwd()
+HOME = os.path.expanduser('~')
 
 
 def _get_json(path):
@@ -10,36 +11,36 @@ def _get_json(path):
 
 
 def update():
-    os.system('apt-get update -y')
+    os.system('sudo apt-get update -y')
 
 
 def apt_upgrade():
-    os.system('apt-get upgrade -y')
+    os.system('sudo apt-get upgrade -y')
-    os.system('apt-get dist-upgrade -y')
+    os.system('sudo apt-get dist-upgrade -y')
 
 
 def apt_install_core():
     packages = " ".join(_get_json('/apt/apt-installs-core.json'))
-    os.system("apt-get install {} -y".format(packages))
+    os.system("sudo apt-get install {} -y".format(packages))
 
 
 def add_apt_keys():
     for key in _get_json('/apt/apt-keys.json'):
-        os.system("wget -O - {} | apt-key add -".format(key))
+        os.system("wget -O - {} | sudo apt-key add -".format(key))
 
 
 def add_apt_sources():
-    os.system('apt/add-apt-sources.sh')
+    os.system('sudo apt/add-apt-sources.sh')
 
 
 def add_apt_repos():
     for repo in _get_json('/apt/apt-repos.json'):
-        os.system("add-apt-repository {} -y".format(repo))
+        os.system("sudo add-apt-repository {} -y".format(repo))
 
 
 def apt_install_extras():
     packages = " ".join(_get_json('/apt/apt-installs-extra.json'))
-    os.system("apt-get install {} -y".format(packages))
+    os.system("sudo apt-get install {} -y".format(packages))
 
 
 def run_custom_installs():
@@ -58,8 +59,8 @@ def export_atom_config():
 
 def install_configs():
     os.makedirs("~/.config/terminator/", exist_ok=True)
-    shutil.copyfile(DIR + "/config/terminator.conf", "~/.config/terminator/config")
+    shutil.copyfile(os.path.join(DIR, "config/terminator.conf"), os.path.expanduser("~/.config/terminator/config"))
-    shutil.copyfile(DIR + "/bash/.bash_aliases", "~/.bash_aliases")
+    shutil.copyfile(os.path.join(DIR, "bash/.bash_aliases"), os.path.expanduser("~/.bash_aliases"))
 
 
 def source():