diff options
| author |   Stuart Shelton <stuart@shelton.me> | 2017-02-01 23:21:20 +0000 |
|---|---|---|
| committer | Stuart Shelton <stuart@shelton.me> | 2017-02-01 23:21:20 +0000 |
| commit | 72df2b38b4ad0c27f099c98347a4c491d00074e7 (patch) | |
| tree | 1835bf030880e7247425b71e5a6b43ddb5757613 /www-apps | |
| parent | Add www-apps/nabaztaglives-2.2.0 (diff) | |
| download | srcshelton-72df2b38b4ad0c27f099c98347a4c491d00074e7.tar.gz srcshelton-72df2b38b4ad0c27f099c98347a4c491d00074e7.tar.bz2 srcshelton-72df2b38b4ad0c27f099c98347a4c491d00074e7.zip | |
Update www-apps/nabaztaglives-2.2.0
Diffstat (limited to 'www-apps')
| -rw-r--r-- | www-apps/nabaztaglives/Manifest | 2 | ||||
| -rw-r--r-- | www-apps/nabaztaglives/nabaztaglives-2.2.0.ebuild | 39 |
2 files changed, 31 insertions, 10 deletions
diff --git a/www-apps/nabaztaglives/Manifest b/www-apps/nabaztaglives/Manifest index 949aec4e..a7273720 100644 --- a/www-apps/nabaztaglives/Manifest +++ b/www-apps/nabaztaglives/Manifest @@ -15,4 +15,4 @@ EBUILD nabaztaglives-2.01.ebuild 3148 SHA256 120e1215a875358fbfffca4473176d7fcf9 EBUILD nabaztaglives-2.03.ebuild 3161 SHA256 e98b76cd10de54ab99b8c473ae1a4b64db70db635b198a18c9f0ec1b7986b292 SHA512 e2cd2f6dfc999eb961392acbe66bffdbd0f57345004c33e00e143a34c7cb7dc9957a3f67d255157c1e2df39d35e64c6d05bcf25eccafa57868075a5b2911b5e8 WHIRLPOOL 4c3a95ed33747af8a37dae7f493c05bccc5caeb9669d4117c21e5e296476dec74b0452630a1037bca05fa40b3d154710bce2123a64826ceefb328f417bd24c2b EBUILD nabaztaglives-2.1.2.ebuild 3652 SHA256 78920b15c7be7216bad560256e82028c38fcccac965d8e693bf0b979094c087a SHA512 a5e85b7a6cb6467bbf2b588a676979ddce09682fd909d7021e2aa274ecf83ccd2eb6f125be5c707075da64f5fc095a697bc745a3152c29fdb65dd35c0fc62d5f WHIRLPOOL 15e9f79a06393a41d015e6d5ce4934c96de93aa6aabc9016a061323170d42e6866088dbff3158af9e949dbe62bbe05cb7d51b03111398e26e2176bda4754e03d EBUILD nabaztaglives-2.1.7.ebuild 3941 SHA256 3549eba90b627244c305717eb183d86303a4748e689a1cfbdb4467900dd1de3d SHA512 b8c6a77b1ddac43357618cf7bee26e0612f75a237592e1d3d0cc4e4b7e9de3a759d3df8671cbc6e7f6b060d936595e61cffc1a1d9d40bd6f25aa6bdde0d26714 WHIRLPOOL 15108429bd485a220748f296a656b5a68d52a89f58660fcfd73683cb889090a2f84a997a42cd757080a0c81a6cee5dcfd62b16f22d9033e4ab74767699da6481 -EBUILD nabaztaglives-2.2.0.ebuild 3598 SHA256 51f653e2e9249fed4be23a1a3efed461e8fde7c541faf20d508dc65936c3f5db SHA512 d45915a6d89f3a71fd4243111ee05085d103b5491f9b62df0492076d4e3c0334ae6998da85e01689da73f56123a8bb73be1c45a2982f97eec4c3616fa1d5156f WHIRLPOOL 8d4fa605e09963b5e686906799e5981e43e927e909470f4943060038bfcf5681995e37b602b30cb95a2a3cd96415e289e516c86e6f2ce0097f61e6c5c37e97b8 +EBUILD nabaztaglives-2.2.0.ebuild 4398 SHA256 f2be952ccfc66b03856d21d67a5bddf2fe80dcdba97cec9eb2dd229df54838b8 SHA512 99b8d1ef464d83f65974068d3023266ce95d950129fb99aa712281d36a27831796c605903c3466d1dcf676502f8f818ba011bdbd974f829975c6dbd2e7962052 WHIRLPOOL 1c442d68caf74c6cf26d488750ad78fb123ef35096eabf0c7707c2afa57f4ba6d4e6a31d74722c38cd4bcd215ce4f7a8214191563b666d46f6fbc5c8d7648ea7 diff --git a/www-apps/nabaztaglives/nabaztaglives-2.2.0.ebuild b/www-apps/nabaztaglives/nabaztaglives-2.2.0.ebuild index 844d3c27..7b55021d 100644 --- a/www-apps/nabaztaglives/nabaztaglives-2.2.0.ebuild +++ b/www-apps/nabaztaglives/nabaztaglives-2.2.0.ebuild @@ -48,27 +48,43 @@ src_prepare() { fi sed -si \ + -e 's|<?$|<?php|' \ + www/peek.php \ + || die "PHP patching failed: ${?}" + sed -si \ -e 's|<? |<?php |g' \ - www/*.php \ + www/saveUpdateRabbit.php \ || die "PHP patching failed: ${?}" sed -si \ - -e "s|'../etc/nabaztag_error.log'|'logs/error.log'|" \ - www/*.php www/subroutines/logError.php \ + -e "s|'/var/etc/nabaztag_error.log'|'./logs/error.log'|" \ + www/*.php \ || die "Log-location patching failed: ${?}" sed -si \ - -e 's|../etc/nabaztag_error.log|logs/error.log|' \ - www/vl/p4.php www/vl/FR/p3.jsp \ + -e "s|'/var/etc/nabaztag_error.log'|'../logs/error.log'|" \ + www/subroutines/logError.php www/vl/p4.php \ + || die "Log-location patching failed: ${?}" + sed -si \ + -e "s|'/var/etc/nabaztag_error.log'|'../../logs/error.log'|" \ + www/vl/FR/p3.jsp \ || die "Log-location patching failed: ${?}" sed -si \ - -e "s|../etc/api_calls.log|logs/apicalls.log|" \ - www/*.php \ + -e "s|'/var/etc/api_calls.log'|'../logs/apicalls.log'|" \ + www/api*.php \ || die "API log-location patching failed: ${?}" sed -si \ - -e 's|../etc/nabaztag_db.php|config/db.php|' \ - www/*.php www/subroutines/*.php www/vl/p4.php www/vl/FR/p3.jsp \ + -e 's|'/var/etc/nabaztag_db.php'|'./config/db.php'|' \ + www/*.php \ + || die "Configuration patching failed: ${?}" + sed -si \ + -e 's|'/var/etc/nabaztag_db.php'|'../config/db.php'|' \ + www/subroutines/*.php www/vl/p4.php www/vl/FR/p3.jsp \ + || die "Configuration patching failed: ${?}" + sed -si \ + -e 's|'/var/etc/nabaztag_db.php'|'../../config/db.php'|' \ + www/vl/FR/p3.jsp \ || die "Configuration patching failed: ${?}" sed -rsi \ @@ -105,6 +121,11 @@ src_prepare() { epatch "${FILESDIR}/${PN}-2.1.2-api.patch" || die "Patch failed" epatch "${FILESDIR}/${PN}-2.00.patch" || die "Patch failed" + + sed -si \ + -e "/Could not connect: /s|'[^']*Could not connect: '|__FILE__ . ': Could not connect to host \"' . \$host . '\" database \"' . \$db . '\" as ' . \$user . ':' . \$pass . ' - ' |" \ + www/*.php www/subroutines/*.php \ + || die "Logging improvement patching failed: ${?}" } src_install() { |