From 63ce8bcfce0c108abab2e96467f592d5fc55b88c Mon Sep 17 00:00:00 2001
From: Zachary Yedidia <zyedidia@gmail.com>
Date: Mon, 18 Apr 2016 09:40:27 -0400
Subject: [PATCH] Create ~/.micro if it does not exist

---
 cmd/micro/colorscheme.go |  1 +
 cmd/micro/settings.go    |  2 ++
 tools/cross-compile.sh   | 14 +++++---------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/cmd/micro/colorscheme.go b/cmd/micro/colorscheme.go
index 91402c77..6d431bb1 100644
--- a/cmd/micro/colorscheme.go
+++ b/cmd/micro/colorscheme.go
@@ -52,6 +52,7 @@ func LoadColorscheme(colorschemeName, dir string) {
 			data, err := Asset("runtime/colorschemes/" + name + ".micro")
 			if err != nil {
 				TermMessage("Unable to load pre-installed colorscheme " + name)
+				continue
 			}
 			colorscheme = ParseColorscheme(string(data))
 		}
diff --git a/cmd/micro/settings.go b/cmd/micro/settings.go
index 0e026f5d..9b6f9089 100644
--- a/cmd/micro/settings.go
+++ b/cmd/micro/settings.go
@@ -46,6 +46,8 @@ func InitSettings() {
 		if err != nil {
 			TermMessage("Error writing settings.json file: " + err.Error())
 		}
+
+		os.Mkdir(home+"/.micro", 755)
 	}
 }
 
diff --git a/tools/cross-compile.sh b/tools/cross-compile.sh
index cac25a5e..d472cefd 100755
--- a/tools/cross-compile.sh
+++ b/tools/cross-compile.sh
@@ -1,29 +1,25 @@
 cd ..
 
 mkdir -p binaries
-mkdir -p micro/bin
-cp -r runtime micro/
-
-echo 'mkdir -p ~/.micro' >> micro/install.sh
-chmod +x micro/install.sh
+mkdir -p micro
 
 # Mac
 echo "OSX 64"
-GOOS=darwin GOARCH=amd64 go build -o micro/bin/micro ./src
+GOOS=darwin GOARCH=amd64 go build -o micro/micro ./src
 tar -czf micro-osx.tar.gz micro
 mv micro-osx.tar.gz binaries
 
 # Linux
 echo "Linux 64"
-GOOS=linux GOARCH=amd64 go build -o micro/bin/micro ./src
+GOOS=linux GOARCH=amd64 go build -o micro/micro ./src
 tar -czf micro-linux64.tar.gz micro
 mv micro-linux64.tar.gz binaries
 echo "Linux 32"
-GOOS=linux GOARCH=386 go build -o micro/bin/micro ./src
+GOOS=linux GOARCH=386 go build -o micro/micro ./src
 tar -czf micro-linux32.tar.gz micro
 mv micro-linux32.tar.gz binaries
 echo "Linux arm"
-GOOS=linux GOARCH=arm go build -o micro/bin/micro ./src
+GOOS=linux GOARCH=arm go build -o micro/micro ./src
 tar -czf micro-linux-arm.tar.gz micro
 mv micro-linux-arm.tar.gz binaries