Fix bug when discern whether there are ssh and rsync

`whereis notfound` output `notfound:` in linux
brickgao · Jul 11, 2015 · 08f6d42 · 08f6d42
1 parent 5e1fda5
commit 08f6d42
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/specchio/__init__.py b/specchio/__init__.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-__version__ = "0.1.0"
+__version__ = "0.1.0-dev"
diff --git a/specchio/main.py b/specchio/main.py
@@ -20,10 +20,12 @@ def main():
     :return: None
     """
     init_logger()
-    if os.popen("whereis ssh").read() == "":
+    _popen_str = os.popen("whereis ssh").read().strip()
+    if _popen_str == "" or _popen_str == "ssh:":
         return logger.error("Specchio need `ssh`, "
                             "but there is no `ssh` in the system")
-    if os.popen("whereis rsync").read() == "":
+    _popen_str = os.popen("whereis rsync").read().strip()
+    if _popen_str == "" or _popen_str == "rsync:":
         return logger.error("Specchio need `rsync`, "
                             "but there is no `rsync` in the system")
     if len(sys.argv) >= 3: