Small fixes

James Peret 8 年之前
父节点
当前提交
e87f979a95
共有 5 个文件被更改,包括 148 次插入22 次删除
  1. 2 2
      atom-installer.sh
  2. 27 6
      core.sh
  3. 20 14
      install.sh
  4. 1 0
      node-config.sh
  5. 98 0
      script.sh

+ 2 - 2
atom-installer.sh

@@ -43,7 +43,7 @@ function configure_keymap {
43 43
     'ctrl-alt-tab' : 'window:focus-next-pane'
44 44
     'ctrl-alt-shift-tab' : 'window:focus-previous-pane'
45 45
     'ctrl-alt-cmd-p' : 'project-sidebar:toggle'
46
-  " >> $HOME/.atom/keymap.cson
46
+  " > $HOME/.atom/keymap.cson
47 47
 }
48 48
 
49 49
 function configure_styles {
@@ -135,5 +135,5 @@ if [ check_dependencies ] ; then
135 135
   install_plugins
136 136
   configure_keymap
137 137
   configure_styles
138
-  echo "\n\n\033[32mMAC OSX CONFIGURED SUCCESFULLY\n\n"
138
+  echo "\n\n\033[32mATOM CONFIGURED SUCCESFULLY\n\n"
139 139
 fi

+ 27 - 6
core.sh

@@ -1,3 +1,5 @@
1
+#!/bin/bash
2
+
1 3
 # Functions ==============================================
2 4
 
3 5
 function app_is_installed {
@@ -73,20 +75,39 @@ function install_app {
73 75
   tput sc
74 76
   tput rc
75 77
   tput ed
76
-  echo "$1\t\t\t\t$(echo_if $(app_is_installed $2))                   "
77
-  if [ $(app_is_installed $2) == 0 ]; then
78
-    sleep 1
78
+  app_name_tabs "$1"
79
+  echo "$1$tabs$(echo_if $(app_is_installed "$2"))                   "
80
+  if [ $(app_is_installed "$2") == 0 ]; then
81
+    sleep 0.1
79 82
     tput rc
80 83
     tput ed
81
-    echo "$1\t\t\t\t$(echo_if $(app_is_installed $2))   Installing... "
82
-    sleep 3
84
+    echo "$1$tabs$(echo_if $(app_is_installed "$2"))   Installing... "
85
+    sleep 0.2
83 86
     tput rc
84 87
     tput ed
85
-    echo "$1\t\t\t\t$(echo_if $(app_is_installed $2))                 "
88
+    echo "$1$tabs$(echo_if $(app_is_installed "$2"))                 "
89
+    sleep 0.1
86 90
     tput sc
87 91
   fi
88 92
 }
89 93
 
94
+function app_name_tabs {
95
+  name="$1"
96
+  size="${#name}"
97
+  if (( $size < 8 )) ; then
98
+    tabs="\t\t\t\t"
99
+  fi
100
+  if (( $size >= 8 )) && (( $size < 16 )) ; then
101
+    tabs="\t\t\t"
102
+  fi
103
+  if (( $size >= 16 )) && (( $size < 24 )) ; then
104
+    tabs="\t\t"
105
+  fi
106
+  if (( $size >= 24 )) && (( $size < 32 )) ; then
107
+    tabs="\t"
108
+  fi
109
+}
110
+
90 111
 function test {
91 112
   echo "\nALL DONE\n\n"
92 113
 

+ 20 - 14
install.sh

@@ -1,3 +1,4 @@
1
+clear
1 2
 printf "\n\033[104mInstall Script\033[49m\n"
2 3
 printf "by James Peret - http://jamesperet.com\n\n"
3 4
 
@@ -5,15 +6,8 @@ printf "by James Peret - http://jamesperet.com\n\n"
5 6
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
6 7
 source $DIR/core.sh
7 8
 
8
-# Install xCode Command Line Tools
9
-echo "- Intalling command line tools"
10
-xcode-select --install
11
-
12
-# Install all Max OS X Updates
13
-echo "- Installing Mac OSX Updates"
14
-sw_vers |grep ProductVersion
15
-sudo softwareupdate -i -a
16
-sw_vers |grep ProductVersion
9
+install_command_line_tools
10
+install_mac_osx_updates
17 11
 
18 12
 
19 13
 # command line programs
@@ -23,12 +17,24 @@ tput civis -- invisible
23 17
 install_app atom Atom.app
24 18
 install_app craxxxp Crap.app
25 19
 
26
-echo "node\t\t\t\t$(echo_if $(program_is_installed node))"
27
-#echo "grunt\t\t\t\t$(echo_if $(program_is_installed grunt))"
28
-#echo "testacular\t\t\t$(echo_if $(program_is_installed testacular))"
29
-#echo "uglifyjs\t\t\t$(echo_if $(program_is_installed uglifyjs))"
30
-#echo "requirejs\t\t\t$(echo_if $(program_is_installed r.js))"
20
+echo "node$(echo_if $(program_is_installed node))"
21
+echo "grunt$(echo_if $(program_is_installed grunt))"
22
+echo "testacular$(echo_if $(program_is_installed testacular))"
23
+echo "uglifyjs$(echo_if $(program_is_installed uglifyjs))"
24
+echo "requirejs$(echo_if $(program_is_installed r.js))"
31 25
 
32 26
 # local npm packages
33 27
 echo "grunt\t\t\t\t$(echo_if $(npm_package_is_installed grunt))"
34 28
 echo "serve\t\t\t\t$(echo_if $(npm_package_is_installed serve))"
29
+
30
+function install_command_line_tools {
31
+  echo "- Intalling command line tools"
32
+  xcode-select --install
33
+}
34
+
35
+function install_mac_osx_updates {
36
+  echo "- Installing Mac OSX Updates"
37
+  sw_vers |grep ProductVersion
38
+  sudo softwareupdate -i -a
39
+  sw_vers |grep ProductVersion
40
+}

+ 1 - 0
node-config.sh

@@ -1,6 +1,7 @@
1 1
 # Set permissions to the node modules folder
2 2
 sudo chown -R $(whoami) ~/.npm
3 3
 sudo chown -R $(whoami) /usr/local/lib/node_modules/
4
+# more info: https://docs.npmjs.com/getting-started/fixing-npm-permissions
4 5
 
5 6
 npm install -g grunt-cli
6 7
 npm install -g serve

+ 98 - 0
script.sh

@@ -0,0 +1,98 @@
1
+#!/bin/bash
2
+
3
+# Load installer script dependencies
4
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
5
+source $DIR/core.sh
6
+
7
+# Browsers
8
+install_app "Google Chrome" "Google Chrome.app"
9
+install_app "Firefox" "Firefox.app"
10
+
11
+# COMMs
12
+install_app "Skype" "Skype.app"
13
+install_app "Slack" "Slack.app"
14
+
15
+# Office
16
+install_app "Pages" "Pages.app"
17
+install_app "Numbers" "Numbers.app"
18
+install_app "Keynote" "Keynote.app"
19
+install_app "Microsoft Excel" "Microsoft Excel.app"
20
+install_app "Microsoft PowerPoint" "Microsoft PowerPoint.app"
21
+install_app "Microsoft Word" "Microsoft Word.app"
22
+
23
+# Design
24
+install_app "Adobe Acrobat X Pro" "Adobe Acrobat X Pro/Adobe Acrobat Pro.app"
25
+install_app "Adobe Bridge CS6" "Adobe Bridge CS6/Adobe Bridge CS6.app"
26
+install_app "Adobe Illustrator CS6" "Adobe Illustrator CS6"
27
+install_app "Adobe InDesign CS6" "Adobe InDesign CS6/Adobe InDesign CS6.app"
28
+install_app "Adobe Photoshop CS6" "Adobe Photoshop CS6/Adobe Photoshop CS6.app"
29
+install_app "BrushPilot" "BrushPilot.app"
30
+install_app "xScope" "xScope.app"
31
+install_app "Pickr" "Pickr.app"
32
+install_app "Sketch" "Sketch.app"
33
+install_app "Sketch Toolbox" "Sketch Toolbox.app"
34
+install_app "OmniGraffle" "OmniGraffle.app"
35
+
36
+# Libraries
37
+install_app "Evernote" "Evernote.app"
38
+install_app "Ember" "Ember.app"
39
+install_app "Aperture" "Aperture.app"
40
+install_app "FontCase" "FontCase.app"
41
+
42
+# Dev
43
+install_app "Atom" "Atom.app"
44
+install_app "Dash" "Dash.app"
45
+install_app "iTerm" "iTerm.app"
46
+install_app "Mou" "Mou.app"
47
+install_app "Transmit" "Transmit.app"
48
+install_app "Postgres" "Postgres.app"
49
+install_app "Monodraw" "Monodraw.app"
50
+install_app "Go2Shell" "Go2Shell.app"
51
+
52
+# Video
53
+install_app "Final Cut Pro" "Final Cut Pro.app"
54
+install_app "Compressor" "Compressor.app"
55
+install_app "Adobe After Effects CC" "Adobe After Effects CC 2014/Adobe After Effects CC 2014.app"
56
+install_app "Adobe Premiere Pro CS6" "Adobe Premiere Pro CS6/Adobe Premiere Pro CS6.app"
57
+install_app "ScreenFlow" "ScreenFlow.app"
58
+install_app "Screenflick" "ScreenFlick.app"
59
+
60
+# Audio
61
+install_app "Logic Pro X" "Logic Pro X.app"
62
+install_app "Main Stage" "Main Stage.app"
63
+install_app "Arturia Moog Modular" "Arturia/Modular V2.app"
64
+install_app "Audio Hijack" "Audio Hijack.app"
65
+install_app "Sonic Pi" "Sonic Pi.app"
66
+install_app "Bfxr" "Bfxr.app"
67
+install_app "xAct" "xAct.app"
68
+
69
+# Game Design/ 3D
70
+install_app "Cinema 4D" "Cinema 4D.app"
71
+install_app "Unity 3D" "Unity/Unity 3D.app"
72
+install_app "Substance Designer" "Substance Designer.app"
73
+install_app "Z-Brush" "zBrush.app"
74
+install_app "Hexels" "Hexels.app"
75
+
76
+# Utilities
77
+install_app "1Password" "1Password.app"
78
+install_app "Alfred 2" "Alfred 2.app"
79
+install_app "AppCleaner" "AppCleaner.app"
80
+install_app "Dropbox" "Dropbox.app"
81
+install_app "HyperSwitch" "HyperSwitch.app"
82
+install_app "iScrobbler" "iScrobbler.app"
83
+install_app "iStat Menus" "iStat Menus.app"
84
+install_app "Sunrise" "Sunrise.app"
85
+install_app "The Unarchiver" "The Unarchiver.app"
86
+install_app "Transmission" "Transmission.app"
87
+install_app "VLC" "VLC.app"
88
+install_app "DaisyDisk" "DaisyDisk.app"
89
+install_app "Soulver" "Soulver.app"
90
+install_app "SerialSeeker" "SerialSeeker.app"
91
+install_app "Wifi Explorer" "Wifi Explorer.app"
92
+install_app "Network Radar" "Network Radar.app"
93
+install_app "OmniPlan" "OmniPlan.app"
94
+install_app "SiteSucker" "SiteSucker.app"
95
+install_app "OmniFocus" "OmniFocus.app"
96
+install_app "Popcorn-Time" "Popcorn-Time.app"
97
+install_app "RescueTime" "RescueTime.app"
98
+install_app "SleepDisplay" "SleepDisplay.app"