From 180ff9d091a9fd0c5baa153b210055d3cfb68db1 Mon Sep 17 00:00:00 2001
From: atnartur <atnartur2012@gmail.com>
Date: Sat, 15 Aug 2015 19:12:20 +0300
Subject: [PATCH] =?UTF-8?q?+=20=D0=97=D0=B0=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=20bashrc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 start.js        |  7 ++++---
 tasks/bashrc.js | 20 +++++++++-----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/start.js b/start.js
index c0246dc..94a9e7d 100644
--- a/start.js
+++ b/start.js
@@ -68,10 +68,11 @@ async.series([ // предотвращаем асинхронность
             operation = 'write';
             
         if (task !== '*') 
-            tasks[task][operation]();
+            console.log('задача', key, 'операция', operation, '-', tasks[task][operation]());
         else{
-			for(var key in tasks) // пробегаемся по массиву задач и выполняем их
-				tasks[key][operation]();
+			for(var key in tasks){ // пробегаемся по массиву задач и выполняем их
+				console.log('задача', key, 'операция', operation, '-', tasks[key][operation]());
+			}
         }
     }
 ]);
diff --git a/tasks/bashrc.js b/tasks/bashrc.js
index a2b012b..2b57d4f 100644
--- a/tasks/bashrc.js
+++ b/tasks/bashrc.js
@@ -7,20 +7,24 @@ module.exports = {
         return path.normalize(process.env.HOME + '/.bashrc');
     },
     get_code: function(){
-        var str = "http://" + global.config.edu_login + ":" + global.config.edu_pass + "@" + global.config.host + ":" + global.config.port + "/";
+        var str = "http://" + global.config.edu_login + ":" + global.config.edu_pass + "@" + global.config.proxy_host + ":" + global.config.proxy_port + "/";
         
-        return
+        var full = "\n" +
             this.label_str + "\n" +
             "export http_proxy='" + str + "'\n" +
             "export ftp_proxy='" + str + "'\n" +
-            this.label_str
+            this.label_str + "\n";
+            
+        return full;
     },
     check: function(){
         var filepath = this.get_path();
+        
         if(!fs.existsSync(filepath))
             return false;
         else{
-            var content = fs.readFileSync(filepath);
+            var content = fs.readFileSync(filepath).toString();
+            
             if(content.indexOf(this.label_str) !== -1){
                 if(content.indexOf(this.get_code()) !== -1)
                     return true;
@@ -44,17 +48,11 @@ module.exports = {
                 }
             }
             
-            if (!fs.accessSync(filepath)) {
-                console.error('Ошибка: недоступен файл', filepath, '. Запустите скрипт с правами администратора');
-                return false;
-            }
-            
             fs.appendFileSync(filepath, this.get_code());
-            
             return true;
         }
     },
     remove: function(){
         
     }
-}
\ No newline at end of file
+}