(no commit message)

diff --git a/update.php b/update.php
index 3208fb986e0d4174b4ed7647442e3040f8f60feb..7f3febd0a4665df3c6515bf35f9d11462b5593e3 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,54 +1,61 @@
-<?php\r
-//look for new enigma2-plugin-extensions-mediaportal versions\r
-// download + add source to git\r
-$data = file('http://dhwz.github.io/e2-mediaportal/version.txt');\r
-$debUrl = trim($data[3]);\r
-\r
-function err($msg) {\r
-    file_put_contents('php://stderr', $msg . "\n");\r
-    exit(1);\r
-}\r
-if (substr($debUrl, -4) !== '.deb') {\r
-    err('e2-mediaportal update script broken');\r
-}\r
-$filename = substr($debUrl, strrpos($debUrl, '/') + 1);\r
-$version  = preg_replace('#^.+_([^_]+)_.+$#', '\\1', $filename);\r
-\r
-$dlPath = __DIR__ . '/download/' . $filename;\r
-if (file_exists($dlPath)) {\r
-    echo "No update.\n";\r
-    exit(0);\r
-}\r
-\r
-echo "Download new version $version\n";\r
-exec(\r
-    'wget --quiet'\r
-    . ' -O ' . escapeshellarg($dlPath)\r
-    . ' ' . escapeshellarg($debUrl),\r
-    $output,\r
-    $retval\r
-);\r
-if ($retval != 0) {\r
-    err('Failed to download new version from ' . $debUrl);\r
-}\r
-\r
-echo "Add to git\n";\r
-chdir(__DIR__);\r
-exec(\r
-    'cd source'\r
-    . ' && rm -r *'\r
-    . '; dpkg-deb -x ' . escapeshellarg($dlPath) . ' .'\r
-    . ' && git add . '\r
-    . ' && git commit'\r
-    . ' -m ' . escapeshellarg(\r
-        'import enigma2-plugin-extensions-mediaportal ' . $version\r
-    )\r
-    . ' && git tag ' . escapeshellarg('v' . $version),\r
-    $out,\r
-    $retval\r
-);\r
-if ($retval != 0) {\r
-    err('Failed to add new version to git: ' . $version);\r
-}\r
-echo "Done\n";\r
+<?php
+//look for new enigma2-plugin-extensions-mediaportal versions
+// download + add source to git
+// http://git.cweiske.de/enigma2-mediaportal.git/
+$data = file('http://dhwz.github.io/e2-mediaportal/version.txt');
+$debUrl = trim($data[3]);
+
+function err($msg) {
+    file_put_contents('php://stderr', $msg . "\n");
+    exit(1);
+}
+if (substr($debUrl, -4) !== '.deb') {
+    err('e2-mediaportal update script broken');
+}
+$filename = substr($debUrl, strrpos($debUrl, '/') + 1);
+$version  = preg_replace('#^.+_([^_]+)_.+$#', '\\1', $filename);
+
+$dlPath = __DIR__ . '/download/' . $filename;
+if (file_exists($dlPath)) {
+    echo "No update.\n";
+    exit(0);
+}
+
+echo "Download new version $version\n";
+exec(
+    'wget --quiet'
+    . ' -O ' . escapeshellarg($dlPath)
+    . ' ' . escapeshellarg($debUrl),
+    $output,
+    $retval
+);
+if ($retval != 0) {
+    err('Failed to download new version from ' . $debUrl);
+}
+
+echo "Add to git\n";
+chdir(__DIR__);
+exec(
+    'cd source'
+    . ' && rm -r *'
+    . '; dpkg-deb -x ' . escapeshellarg($dlPath) . ' .'
+    . ' && git add . '
+    . ' && git commit'
+    . ' -m ' . escapeshellarg(
+        'import enigma2-plugin-extensions-mediaportal ' . $version
+    )
+    . ' && git tag ' . escapeshellarg('v' . $version),
+    $out,
+    $retval
+);
+if ($retval != 0) {
+    err('Failed to add new version to git: ' . $version);
+}
+
+exec('git push && git push --tags', $out, $retval);
+if ($retval != 0) {
+    err('Failed to push to git remote');
+}
+
+echo "Done\n";
 ?>
\ No newline at end of file