summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-06-01 17:05:31 -0400
committerMichael Larabel <michael@phx-laptop.(none)>2008-06-01 17:05:31 -0400
commit056029cafc4fc849f39aafe9a67e39fbe86b1be2 (patch)
tree2809e027c30386babce0e31331d084093f55e3b5
parent12c1f2c81e607a93c95f18d83fb8fa245debce58 (diff)
downloadphoronix-test-suite-upstream-056029cafc4fc849f39aafe9a67e39fbe86b1be2.tar.gz
phoronix-test-suite-upstream-056029cafc4fc849f39aafe9a67e39fbe86b1be2.tar.xz
phoronix-test-suite-upstream-056029cafc4fc849f39aafe9a67e39fbe86b1be2.zip
Move launch-browser.sh from pts/ to pts-core/scripts/ and Debian package
generator now at pts-core/scripts/build-package-deb.php
-rw-r--r--CHANGE-LOG2
-rw-r--r--documentation/install.html2
-rw-r--r--pts-core/functions/pts-functions.php2
-rw-r--r--pts-core/pts-run-cmd.php2
-rw-r--r--pts-core/scripts/build-package-deb.php (renamed from pts/etc/scripts/package-build-deb.php)0
-rwxr-xr-xpts-core/scripts/launch-browser.sh (renamed from pts/launch-browser.sh)0
6 files changed, 5 insertions, 3 deletions
diff --git a/CHANGE-LOG b/CHANGE-LOG
index 4f4a9cc..5b84f57 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -26,6 +26,8 @@ Phoronix Test Suite
- Add more screen resolutions to all relevant tests
- Add mafft test profile: a computational biology tools for aligning biological sequence data
- Add computational-biology test suite
+- Move launch-browser.sh from pts/ to pts-core/scripts/
+- Debian package generator now at pts-core/scripts/build-package-deb.php
- Miscellaneous fixes and other improvements
diff --git a/documentation/install.html b/documentation/install.html
index 540d3fe..c091b91 100644
--- a/documentation/install.html
+++ b/documentation/install.html
@@ -56,7 +56,7 @@ Suite in your home directory).</p>
<h2>Debian/Ubuntu Installation</h2>
<p>Debian/Ubuntu users are able to follow the Generic Installation instructions
or optionally can generate their own Debian package. If <em>dpkg-dev</em> is installed,
-run <em>php pts/etc/scripts/package-build-deb.php</em> and a Debian package will
+run <em>php pts-core/scripts/build-package-deb.php</em> and a Debian package will
be generated which can be subsequently installed. This package contains the <em>phoronix-test-suite</em>
exectable in /usr/bin/, the Phoronix Test Suite files in <em>/usr/share/phoronix-test-suite/</em>,
and the documentation in <em>/usr/share/doc/phoronix-test-suite/</em>.</p>
diff --git a/pts-core/functions/pts-functions.php b/pts-core/functions/pts-functions.php
index 39d41fd..4c40600 100644
--- a/pts-core/functions/pts-functions.php
+++ b/pts-core/functions/pts-functions.php
@@ -391,7 +391,7 @@ function display_web_browser($URL, $alt_text = NULL, $default_open = FALSE)
$view_results = pts_bool_question($text . " (Y/n)?", true, "OPEN_BROWSER");
if($view_results)
- shell_exec("./pts/launch-browser.sh \"$URL\" &");
+ shell_exec("sh pts-core/scripts/launch-browser.sh \"$URL\" &");
}
function pts_env_variables()
{
diff --git a/pts-core/pts-run-cmd.php b/pts-core/pts-run-cmd.php
index ea94a2b..2e08a3c 100644
--- a/pts-core/pts-run-cmd.php
+++ b/pts-core/pts-run-cmd.php
@@ -298,7 +298,7 @@ switch($COMMAND)
$URL = false;
if($URL != FALSE)
- shell_exec("./pts/launch-browser.sh $URL &");
+ shell_exec("sh pts-core/scripts/launch-browser.sh $URL &");
else
echo "\n$ARG_1 was not found.\n";
break;
diff --git a/pts/etc/scripts/package-build-deb.php b/pts-core/scripts/build-package-deb.php
index 55efa2d..55efa2d 100644
--- a/pts/etc/scripts/package-build-deb.php
+++ b/pts-core/scripts/build-package-deb.php
diff --git a/pts/launch-browser.sh b/pts-core/scripts/launch-browser.sh
index fe76e44..fe76e44 100755
--- a/pts/launch-browser.sh
+++ b/pts-core/scripts/launch-browser.sh