remove dependency to which, chmod and chown

Author: ygerlach

src/Core/Main.vala

@@ -314,7 +314,7 @@ public class Main : GLib.Object{
 		}
 		else{
 			//timeshift is running from system directory - update app_path
-			this.app_path = get_cmd_path("timeshift");
+			this.app_path = Environment.find_program_in_path("timeshift");
 		}
 
 		// initialize lists -----------------
@@ -350,17 +350,13 @@ public class Main : GLib.Object{
 	}
 
 	public bool check_dependencies(out string msg){
-		
-		msg = "";
-
 		log_debug("Main: check_dependencies()");
 
-		string[] dependencies = { "rsync","/sbin/blkid","df","mount","umount","fuser","crontab","cp","rm","touch","ln","sync","which", "run-parts"}; //"shutdown","chroot",
+		string[] dependencies = { "rsync","/sbin/blkid","df","mount","umount","fuser","crontab","cp","rm","touch","ln","sync", "run-parts"}; //"shutdown","chroot",
 
-		string path;
+		msg = "";
 		foreach(string cmd_tool in dependencies){
-			path = get_cmd_path (cmd_tool);
-			if ((path == null) || (path.length == 0)){
+			if(!cmd_exists(cmd_tool)) {
 				msg += " * " + cmd_tool + "\n";
 			}
 		}

src/Utility/CronTab.vala

@@ -306,8 +306,8 @@ public class CronTab : GLib.Object {
 		}
 
 		file_write(file_path, sh);
-		chown(file_path, "root", "root");
-		chmod(file_path, "644");
+		Posix.chown(file_path, 0, 0); // chown to root:root
+		Posix.chmod(file_path, 0644);
 
 		log_msg(_("Added cron task") + ": %s".printf(file_path));
 

src/Utility/OSDNotify.vala

@@ -56,16 +56,15 @@ public class OSDNotify : GLib.Object {
 		long seconds = 9999;
 
 		if (dt_last_notification != null){
-			
 			DateTime dt_end = new DateTime.now_local();
 			TimeSpan elapsed = dt_end.difference(dt_last_notification);
 			seconds = (long)(elapsed * 1.0 / TimeSpan.SECOND);
 		}
 
 		if (seconds > NOTIFICATION_INTERVAL){
-			
-			if (cmd_exists("notify-send")){
-				
+
+			if (is_supported()){
+
 				string desktop_entry = "timeshift-gtk";
 				string hint = "string:desktop-entry:%s".printf(desktop_entry);
 
@@ -82,9 +81,6 @@ public class OSDNotify : GLib.Object {
 	}
 
 	public static bool is_supported(){
-		
-		string path = get_cmd_path("notify-send");
-		
-		return (path != null) && (path.length > 0);
+		return cmd_exists("notify-send");
 	}
 }

src/Utility/TeeJee.FileSystem.vala

@@ -445,12 +445,6 @@ namespace TeeJee.FileSystem{
 		return list;
 	}
 
-	public bool chown(string dir_path, string user, string group = user){
-		string cmd = "chown %s:%s -R '%s'".printf(user, group, escape_single_quote(dir_path));
-		int status = exec_sync(cmd, null, null);
-		return (status == 0);
-	}
-	
 	// misc --------------------
 
 	public string format_file_size (
@@ -506,11 +500,4 @@ namespace TeeJee.FileSystem{
 
 		return file_path.replace("'","'\\''");
 	}
-	
-	// dep: chmod
-	public int chmod(string file, string permission){
-
-		string cmd = "chmod %s '%s'".printf(permission, escape_single_quote(file));
-		return exec_sync (cmd, null, null);
-	}
 }

src/Utility/TeeJee.Process.vala

@@ -49,7 +49,7 @@ namespace TeeJee.ProcessHelper{
 
 			TEMP_DIR = tempPlace + "/timeshift-" + random_string();
 			dir_create(TEMP_DIR);
-			chmod(TEMP_DIR, "0750");
+			Posix.chmod(TEMP_DIR, 0750);
 			exec_script_sync("echo 'ok'",out std_out,out std_err, true);
 
 			if ((std_out == null) || (std_out.strip() != "ok")){
@@ -223,7 +223,7 @@ namespace TeeJee.ProcessHelper{
 		script.append ("echo ${exitCode} > status\n");
 
 		if ((sh_path == null) || (sh_path.length == 0)){
-			sh_path = get_temp_file_path() + ".sh";
+			sh_path = get_temp_file_path();
 		}
 
 		try{
@@ -238,7 +238,7 @@ namespace TeeJee.ProcessHelper{
 			data_stream.close();
 
 			// set execute permission
-			chmod (sh_path, "u+x");
+			Posix.chmod (sh_path, 0744);
 
 			return sh_path;
 		}
@@ -259,32 +259,10 @@ namespace TeeJee.ProcessHelper{
 	}
 
 	// find process -------------------------------
-	
-	// dep: which
-	public string get_cmd_path (string cmd_tool){
-
-		/* Returns the full path to a command */
 
-		try {
-			int exitCode;
-			string stdout, stderr;
-			Process.spawn_command_line_sync("which " + cmd_tool, out stdout, out stderr, out exitCode);
-	        return stdout;
-		}
-		catch (Error e){
-	        log_error (e.message);
-	        return "";
-	    }
-	}
-
-	public bool cmd_exists(string cmd_tool){
-		string path = get_cmd_path (cmd_tool);
-		if ((path == null) || (path.length == 0)){
-			return false;
-		}
-		else{
-			return true;
-		}
+	public static bool cmd_exists(string cmd_tool){
+		string? path = Environment.find_program_in_path(cmd_tool);
+		return (path != null) && (path.length > 0);
 	}
 
 	// return the name of the executable of a given pid or self if pid is <= 0

src/Utility/TeeJee.System.vala

@@ -164,9 +164,8 @@ namespace TeeJee.System{
 
 	// open -----------------------------
 
-	public bool xdg_open (string file, string user = ""){
-		string path = get_cmd_path ("xdg-open");
-		if ((path != null) && (path != "")){
+	public static bool xdg_open (string file, string user = ""){
+		if (cmd_exists("xdg-open")){
 			string cmd = "xdg-open '%s'".printf(escape_single_quote(file));
 			if (user.length > 0){
 				cmd = "pkexec --user %s env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY ".printf(user) + cmd;
@@ -189,38 +188,36 @@ namespace TeeJee.System{
 		We will first try using xdg-open and then check for specific file managers if it fails.
 		*/
 
-		string path;
-		int status;
-		
-		if (xdg_open_try_first){
+		bool xdgAvailable = cmd_exists("xdg-open");
+		string escaped_dir_path = escape_single_quote(dir_path);
+		int status = -1;
+
+		if (xdg_open_try_first && xdgAvailable){
 			//try using xdg-open
-			path = get_cmd_path ("xdg-open");
-			if ((path != null)&&(path != "")){
-				string cmd = "xdg-open '%s'".printf(escape_single_quote(dir_path));
-				status = exec_script_async (cmd);
-				return (status == 0);
-			}
+			string cmd = "xdg-open '%s'".printf(escaped_dir_path);
+			status = exec_script_async (cmd);
+			return (status == 0);
 		}
 
 		foreach(string app_name in
 			new string[]{ "nemo", "nautilus", "thunar", "io.elementary.files", "pantheon-files", "marlin", "dolphin" }){
-				
-			path = get_cmd_path (app_name);
-			if ((path != null)&&(path != "")){
-				string cmd = "%s '%s'".printf(app_name, escape_single_quote(dir_path));
-				status = exec_script_async (cmd);
-				return (status == 0);
+			if(!cmd_exists(app_name)) {
+				continue;
+			}
+
+			string cmd = "%s '%s'".printf(app_name, escaped_dir_path);
+			status = exec_script_async (cmd);
+
+			if(status == 0) {
+				return true;
 			}
 		}
 
-		if (xdg_open_try_first == false){
+		if (!xdg_open_try_first && xdgAvailable){
 			//try using xdg-open
-			path = get_cmd_path ("xdg-open");
-			if ((path != null)&&(path != "")){
-				string cmd = "xdg-open '%s'".printf(escape_single_quote(dir_path));
-				status = exec_script_async (cmd);
-				return (status == 0);
-			}
+			string cmd = "xdg-open '%s'".printf(escaped_dir_path);
+			status = exec_script_async (cmd);
+			return (status == 0);
 		}
 
 		return false;