From d5bcc01eae2912528e8ab2a65733c84fa3f8f4e1 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 4 Jul 2014 13:05:07 +0200
Subject: Fixed shebang check. Previously it would hang on an unknown shebang

---
 ethutil/script.go | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

(limited to 'ethutil/script.go')

diff --git a/ethutil/script.go b/ethutil/script.go
index af4ca6a38..aaa0f8ed8 100644
--- a/ethutil/script.go
+++ b/ethutil/script.go
@@ -10,28 +10,36 @@ import (
 
 // General compile function
 func Compile(script string) (ret []byte, err error) {
-	c := strings.Split(script, "\n")[0]
+	if len(script) > 2 {
+		line := strings.Split(script, "\n")[0]
 
-	if c == "#!serpent" {
-		byteCode, err := serpent.Compile(script)
-		if err != nil {
-			return nil, err
-		}
+		if line[0:2] == "#!" {
+			switch line {
+			case "#!serpent":
+				byteCode, err := serpent.Compile(script)
+				if err != nil {
+					return nil, err
+				}
+
+				return byteCode, nil
+			}
+		} else {
 
-		return byteCode, nil
-	} else {
-		compiler := mutan.NewCompiler(backend.NewEthereumBackend())
-		byteCode, errors := compiler.Compile(strings.NewReader(script))
-		if len(errors) > 0 {
-			var errs string
-			for _, er := range errors {
-				if er != nil {
-					errs += er.Error()
+			compiler := mutan.NewCompiler(backend.NewEthereumBackend())
+			byteCode, errors := compiler.Compile(strings.NewReader(script))
+			if len(errors) > 0 {
+				var errs string
+				for _, er := range errors {
+					if er != nil {
+						errs += er.Error()
+					}
 				}
+				return nil, fmt.Errorf("%v", errs)
 			}
-			return nil, fmt.Errorf("%v", errs)
-		}
 
-		return byteCode, nil
+			return byteCode, nil
+		}
 	}
+
+	return nil, nil
 }
-- 
cgit