X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fpharext%2FCli%2FCommand.php;h=e19ce93a444ffd3d4d87a2be90ed589f897e86a8;hb=8b991a8b633610f7309d76f15b388bffd073d1f7;hp=706cb850efd29c58510fc3d7916f43f4c7689fb4;hpb=c8adc57c38cc535e0dcda979565b7639896e7370;p=pharext%2Fpharext

diff --git a/src/pharext/Cli/Command.php b/src/pharext/Cli/Command.php
index 706cb85..e19ce93 100644
--- a/src/pharext/Cli/Command.php
+++ b/src/pharext/Cli/Command.php
@@ -30,6 +30,16 @@ trait Command
 			\pharext\VERSION);
 	}
 	
+	/**
+	 * @inheritdoc
+	 * @see \pharext\Command::debug()
+	 */
+	public function debug($fmt) {
+		if ($this->args->verbose) {
+			vprintf($fmt, array_slice(func_get_args(), 1));
+		}
+	}
+	
 	/**
 	 * @inheritdoc
 	 * @see \pharext\Command::info()
@@ -117,34 +127,6 @@ trait Command
 		printf("\n");
 	}
 	
-	/**
-	 * Create temporary file/directory name
-	 * @param string $prefix
-	 * @param string $suffix
-	 */
-	private function tempname($prefix, $suffix = null) {
-		if (!isset($suffix)) {
-			$suffix = uniqid();
-		}
-		return sprintf("%s/%s.%s", sys_get_temp_dir(), $prefix, $suffix);
-	}
-
-	/**
-	 * Create a new temp directory
-	 * @param string $prefix
-	 * @return string
-	 */
-	private function newtemp($prefix) {
-		$temp = $this->tempname($prefix);
-		if (!is_dir($temp)) {
-			if (!mkdir($temp, 0700, true)) {
-				$this->error(null);
-				exit(3);
-			}
-		}
-		return $temp;
-	}
-
 	/**
 	 * rm -r
 	 * @param string $dir
@@ -163,74 +145,4 @@ trait Command
 			$this->error(null);
 		}
 	}
-
-	/**
-	 * Execute a program with escalated privileges handling interactive password prompt
-	 * @param string $command
-	 * @param string $output
-	 * @return int
-	 */
-	private function sudo($command, &$output) {
-		if (!($proc = proc_open($command, [STDIN,["pipe","w"],["pipe","w"]], $pipes))) {
-			return -1;
-		}
-		$stdout = $pipes[1];
-		$passwd = 0;
-		while (!feof($stdout)) {
-			$R = [$stdout]; $W = []; $E = [];
-			if (!stream_select($R, $W, $E, null)) {
-				continue;
-			}
-			$data = fread($stdout, 0x1000);
-			/* only check a few times */
-			if ($passwd++ < 10) {
-				if (stristr($data, "password")) {
-					printf("\n%s", $data);
-				}
-			}
-			$output .= $data;
-		}
-		return proc_close($proc);
-	}
-
-	/**
-	 * Execute a system command
-	 * @param string $name pretty name
-	 * @param string $command command
-	 * @param array $args command arguments
-	 * @param bool $sudo whether the command may need escalated privileges
-	 */
-	private function exec($name, $command, array $args = null, $sudo = false) {
-		$exec = escapeshellcmd($command);
-		if ($args) {
-			$exec .= " ". implode(" ", array_map("escapeshellarg", (array) $args));
-		}
-
-		if ($this->args->verbose) {
-			$this->info("Running %s ...\n", $exec);
-		} else {
-			$this->info("Running %s ... ", $name);
-		}
-
-		if ($sudo && isset($this->args->sudo)) {
-			$retval = $this->sudo(sprintf($this->args->sudo." 2>&1", $exec), $output);
-		} elseif ($this->args->verbose) {
-			passthru($exec ." 2>&1", $retval);
-		} else {
-			exec($exec ." 2>&1", $output, $retval);
-			$output = implode("\n", $output);
-		}
-
-		if ($retval) {
-			$this->error("Command %s failed with (%s)\n", $command, $retval);
-			if (isset($output) && !$this->args->quiet) {
-				printf("%s\n", $output);
-			}
-			exit(2);
-		}
-		if (!$this->args->verbose) {
-			// we already have a bunch of output
-			$this->info("OK\n");
-		}
-	}
 }