ben/handbrake-cluster-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release-0.4.1'

Browse Source
This commit is contained in:
Ben Roberts
2012-01-22 17:46:13 +00:00
parent 311b93772c b9d624c345
commit d2f678427b
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/ripping-cluster-worker.init-gentoo
View File

@@ -11,7 +11,7 @@ start() {
ebegin "Starting ripping-cluster-worker"
start-stop-daemon --start --quiet \
--background --make-pidfile --pidfile ${PID_FILE} \
--chuid ${USER} --user ${USER} \
--user ${USER} \
--exec /usr/bin/php /usr/lib/ripping-cluster/source/worker/ripping-cluster-worker.php
eend $? "Failed to start ripping-cluster-worker"
}
@@ -23,7 +23,9 @@ stop() {
local ret=$?
eend ${ret} "Failed to stop ripping-cluster-worker"
${ret} || rm -f ${PID_FILE}
if [[ "${ret}" == 0 ]]; then
rm -f ${PID_FILE}
fi
return ${ret}
}

2
source/lib/RippingCluster/Main.class.php
View File

@@ -37,7 +37,7 @@ class RippingCluster_Main extends SihnonFramework_Main {
$this->smarty->registerPlugin('modifier', 'formatDuration', array('RippingCluster_Main', 'formatDuration'));
$this->smarty->registerPlugin('modifier', 'formatFilesize', array('RippingCluster_Main', 'formatFilesize'));
$this->smarty->assign('version', '0.4');
$this->smarty->assign('version', '0.4.1');
$this->smarty->assign('messages', array());
$this->smarty->assign('base_uri', $this->base_uri);

6
source/webui/templates/index.tpl
View File

@@ -85,11 +85,11 @@
<footer class="no-print">
<p>
Powered by RippingCluster WebUI {$version}. Written by Ben Roberts.
Powered by RippingCluster WebUI {$version}. Written by
<a xmlns:cc="http://creativecommons.org/ns#" href="http://benroberts.net" property="cc:attributionName" rel="cc:attributionURL">Ben Roberts</a>
</p>
<p>
This work by <a xmlns:cc="http://creativecommons.org/ns#" href="http://benroberts.net" property="cc:attributionName" rel="cc:attributionURL">Ben Roberts</a>
is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.
This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.
<br />
<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">