Merge pull request #13 from Kilgaloon/development

Slight changes to dir structure and unreachable code

Author: kilgaloon

Makefile

@@ -4,13 +4,16 @@ install:
 	mkdir /var/run/leprechaun/
 	touch /var/log/leprechaun/info-client.log
 	touch /var/log/leprechaun/error-client.log
-	go build
+	cd bin/ && go build -u leprechaun
 
 uninstall:
 	rm -rf /etc/leprechaun
 	rm -rf /var/log/leprechaun
 	rm -rf /var/run/leprechaun
 
+build:
+	cd bin/ && go build -o leprechaun
+
 format:
 	gofmt -s -w src/
 

README.md

@@ -1,8 +1,10 @@
 # Leprechaun
 
+<<<<<<< HEAD
+
 [![Go Report Card](https://goreportcard.com/badge/github.com/Kilgaloon/Leprechaun)](https://goreportcard.com/report/github.com/Kilgaloon/Leprechaun)
 
-Current Version: **0.2.0** <br />
+Current Version: **0.2.1** <br />
 Current Release: **Calimero**
 
 **Leprechaun** is tool where you can schedule your recurring tasks to be performed over and over. 

client.go renamed to bin/client.go

@@ -1,19 +1,19 @@
 package main
 
 import (
-	"./src/client"
+	"../src/client"
 	"flag"
 )
 
 // VERSION of application
 const (
-	VERSION = "0.2.0"
+	VERSION = "0.2.1"
 	RELEASE = "Calimero"
 )
 
 func main() {
 
-	iniPath := flag.String("ini_path", "./configs/client.ini", "Path to client .ini configuration")
+	iniPath := flag.String("ini_path", "../configs/client.ini", "Path to client .ini configuration")
 	flag.Parse()
 
 	client.Start(iniPath)

bin/leprechaun

@@ -3,7 +3,6 @@ package client
 import (
 	"../log"
 	"gopkg.in/ini.v1"
-	"os"
 )
 
 // Config values
@@ -17,7 +16,6 @@ func readConfig(path string) *Config {
 	cfg, err := ini.Load(path)
 	if err != nil {
 		panic("Failed to load ini file")
-		os.Exit(1)
 	}
 
 	c := &Config{}

src/client/config.go

@@ -49,8 +49,8 @@ func ProcessQueue(queue *Queue, client *Client) {
 					parts := strings.Fields(step)
 					head := parts[0]
 					parts = parts[1:]
-					// if is internal command of Rainbow
-					if len(head) >= 7 && head[0:7] == "rainbow" {
+					// if is internal command of Leprechaun
+					if len(head) >= 7 && head[0:7] == "internal" {
 						err := Resolve(head, parts)
 						if err != nil {
 							RemoveLock(r.Name, client)