diff --git a/include/functions.php b/include/functions.php
index 0fc112a..7a534aa 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,144 +1,141 @@
 <?php
 
 /**
  * Require a specific environment variable or scream violently.
  * @param $name string Environment variable name
  * @return Environment variable value
  */
 function require_env($name) {
 	$value = getenv($name);
 	if (!$value) {
 		throw new Exception(sprintf(
 			"Missing ENV variable '%s'",
 			$name
 		));
 	}
 	return $value;
 }
 
 /**
  * Take a file and append a suffix.
- * @param string $file   E.g. '/full/filesystem/asd.apk'
+ * @param string $file   E.g. 'asd.apk'
  * @param string $suffix E.g. '-lol'
- * @return string '/full/filesystem/asd-lol.apk'
+ * @return string 'asd-lol.apk'
  */
 function add_file_suffix($file, $suffix) {
 	// Get the file extension (.apk).
 	$ext = pathinfo($file, PATHINFO_EXTENSION);
 	$ext = ".$ext";
 
 	// Get the filename without the extension.
 	$filenameWithoutExt = basename($file, $ext);
 
-	// Get the directory path.
-	$directory = dirname($file);
-
 	// Return the new file path with the suffix added.
-	return $directory . '/' . $filenameWithoutExt . $suffix . $ext;
+	return $filenameWithoutExt . $suffix . $ext;
 }
 
 /**
  * Execute a command and get standard output, standard error,
  * and exit status code.
  * Credits: https://www.darklaunch.com/php-exec-stderr-stdout-return-code.html
  * @return CommandResult
  */
 function shell_complete(string $cmd, array $args = [], $input = ''): CommandResult {
 
 	// Build a safe command line.
 	$complete_cmd = build_shell_line($cmd, $args);
 
 	$proc = proc_open($complete_cmd, [
 		['pipe', 'r'],
 		['pipe', 'w'],
 		['pipe', 'w']
 	], $pipes);
 	fwrite($pipes[0], $input);
 	fclose($pipes[0]);
 
 	$stdout = stream_get_contents($pipes[1]);
 	fclose($pipes[1]);
 
 	$stderr = stream_get_contents($pipes[2]);
 	fclose($pipes[2]);
 
 	$return_code = (int)proc_close($proc);
 
 	// Don't proceed in case of errors.
 	if ($return_code !== 0) {
 		throw new Exception(sprintf(
 			"Failed executing command starting with: %s and with %d arguments",
 			$cmd,
 			count($args)
 		));
 	}
 
 	// Forward the standard error as-is.
 	if ($stderr !== '') {
 		file_put_contents('php://stderr', $stderr);
 	}
 
 	return new CommandResult($return_code, $stdout, $stderr);
 }
 
 function build_shell_line(string $command, array $args = []): string {
 	$cmd_parts = [];
 	$cmd_parts[] = escapeshellcmd($command);
 	foreach ($args as $arg) {
 		$cmd_parts[] = escapeshellarg($arg);
 	}
 	return implode(' ', $cmd_parts);
 }
 
 /**
  * Execute a shell command and get all output lines.
  * @param string $command e.g. 'git'
  * @param string $args Command line arguments not-escaped (we will escape them) e.g. ['status']
  * @return array All lines of output from git status.
  */
 function shell_lines($command, array $args) {
 	$result = shell_complete($command, $args);
 	return explode("\n", $result->stdout);
 }
 
 /**
  * Execute a shell command and get the first output line.
  * @param string $command e.g. 'git'
  * @param string $args Command line arguments not-escaped (we will escape them) e.g. ['status']
  * @return string First line of output from git status.
  */
 function shell_line(string $command, array $args) {
 	$lines = shell_lines($command, $args);
 	foreach ($lines as $line) {
 		return trim($line);
 	}
 	return null;
 }
 
 /**
  * Show a stupidly formatted log line.
  * @param string $msg
  */
 function print_log($level, $msg) {
 	printf("[%s][%s] %s\n",
 		$level,
 		date('Y-m-d H:i:s'),
 		$msg
 	);
 }
 
 /**
  * Show a stupidly formatted log INFO line.
  * @param string $msg
  */
 function print_log_info($msg) {
 	print_log('INFO', $msg);
 }
 
 /**
  * Show a stupidly formatted log ERROR line.
  * @param string $msg
  */
 function print_log_error($msg) {
 	print_log('ERROR', $msg);
 }