Source and target dir locating improved..

binaryage · Apr 25, 2012 · a1ab044 · a1ab044
1 parent 3892988
commit a1ab044
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 13 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,3 +1,3 @@
 .DS_Store
 npm-debug.log
-node_modules
+node_modules
diff --git a/bin/restatic b/bin/restatic
@@ -1,4 +1,3 @@
 #!/bin/bash
 
-node ../src/restatic.js $1 $2 fetch
-node ../src/restatic.js $1 $2 process
+node ../src/restatic.js $1 $2 $3
diff --git a/bin/restatic-fetch b/bin/restatic-fetch
diff --git a/bin/restatic-process b/bin/restatic-process
diff --git a/src/Environment.js b/src/Environment.js
@@ -47,7 +47,7 @@ Environment.prototype.loadExtractor = function (defaultExtractor) {
 }
 
 Environment.prototype.prepareEnvironment = function () {
-	if(Environment.conf.mode == 'process') {
+	if(Environment.conf.mode != 'fetch') {
 		if(Environment.conf.target == './_site/') {
 			var dirName = '/tmp/restatic_temp/';
 
@@ -95,7 +95,7 @@ Environment.prototype.prepareEnvironment = function () {
 
 Environment.prototype.loadConfigFile = function (fileName) {
 	if(typeof Environment.conf.source != 'undefined') {
-		var contents = fs.readFileSync(Environment.conf.source + '/' + fileName);
+		var contents = fs.readFileSync(Environment.conf.source + fileName);
   		var config = JSON.parse(contents);
   	}
 
@@ -119,13 +119,13 @@ Environment.prototype.loadLineArgs = function (args) {
 
 	if(args[0] != '-d')  {
 		if(typeof args[0] != 'undefined') {
-			Environment.conf.source = this.fixEndingSlash(args[0]);
+			Environment.conf.source = this.fixEndingSlash(path.resolve(args[0]));
 		} else {
 			checked = false;
 		}
 
 		if(typeof args[1] != 'undefined') {
-			Environment.conf.target = this.fixEndingSlash(args[1]);
+			Environment.conf.target = this.fixEndingSlash(path.resolve(args[1]));
 		} else {
 			checked = false;
 		}