openmamba/autospec
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

templates: avoid &>/dev/null

Browse Source 
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2012-01-18 21:23:10 +01:00
parent e77d5e88a3
commit 31416288b6
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -69,6 +69,10 @@ Sun Jan 15 2012 Davide Madrisan <davide.madrisan(a)gmail.com>
* tests/test01_pkgquality - Davide Madrisan: * tests/test01_pkgquality - Davide Madrisan:
Avoid pipes otherwise the error counter will not display a correct value. Avoid pipes otherwise the error counter will not display a correct value.
+ update
* templates/kde4, templates/standard-daemon
Do not use '&>/dev/null'. It's not dash compatible.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 1.8.2 Changes in version 1.8.2

24
templates/kde4
View File

@ -52,9 +52,9 @@ BuildRoot: @rpm_default_buildroot@
@fi:shared_libraries @fi:shared_libraries
@if:icons_mimetypes @if:icons_mimetypes
## remove the following line if this package has no hicolor icons ## remove the following line if this package has no hicolor icons
touch --no-create %{_kde4_icondir}/hicolor &>/dev/null touch --no-create %{_kde4_icondir}/hicolor >/dev/null 2>&1
## remove the following line if this package has no oxygen icons ## remove the following line if this package has no oxygen icons
touch --no-create %{_kde4_icondir}/oxygen &>/dev/null touch --no-create %{_kde4_icondir}/oxygen >/dev/null 2>&1
@fi:icons_mimetypes @fi:icons_mimetypes
exit 0 exit 0
@ -64,12 +64,12 @@ exit 0
## remove the following line if no dynamic libraries are provided by this package ## remove the following line if no dynamic libraries are provided by this package
/sbin/ldconfig /sbin/ldconfig
@fi:shared_libraries @fi:shared_libraries
update-desktop-database -q &>/dev/null update-desktop-database -q >/dev/null 2>&1
update-mime-database %{_kde4_mimedir} &>/dev/null update-mime-database %{_kde4_mimedir} >/dev/null 2>&1
## remove the following line if this package has no hicolor icons ## remove the following line if this package has no hicolor icons
gtk-update-icon-cache %{_kde4_icondir}/hicolor &>/dev/null gtk-update-icon-cache %{_kde4_icondir}/hicolor >/dev/null 2>&1
## remove the following line if this package has no oxygen icons ## remove the following line if this package has no oxygen icons
gtk-update-icon-cache %{_kde4_icondir}/oxygen &>/dev/null gtk-update-icon-cache %{_kde4_icondir}/oxygen >/dev/null 2>&1
exit 0 exit 0
@fi:icons_mimetypes @fi:icons_mimetypes
@ -80,14 +80,14 @@ exit 0
@fi:shared_libraries @fi:shared_libraries
@if:icons_mimetypes @if:icons_mimetypes
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
\ update-desktop-database -q &>/dev/null \ update-desktop-database -q >/dev/null 2>&1
\ update-mime-database %{_kde4_mimedir} &>/dev/null \ update-mime-database %{_kde4_mimedir} >/dev/null 2>&1
## remove the following two lines if this package has no hicolor icons ## remove the following two lines if this package has no hicolor icons
\ touch --no-create %{_kde4_icondir}/hicolor &>/dev/null \ touch --no-create %{_kde4_icondir}/hicolor >/dev/null 2>&1
\ gtk-update-icon-cache %{_kde4_icondir}/hicolor &>/dev/null \ gtk-update-icon-cache %{_kde4_icondir}/hicolor >/dev/null 2>&1
## remove the following two lines if this package has no oxygen icons ## remove the following two lines if this package has no oxygen icons
\ touch --no-create %{_kde4_icondir}/oxygen &>/dev/null \ touch --no-create %{_kde4_icondir}/oxygen >/dev/null 2>&1
\ gtk-update-icon-cache %{_kde4_icondir}/oxygen &>/dev/null \ gtk-update-icon-cache %{_kde4_icondir}/oxygen >/dev/null 2>&1
fi fi
@fi:icons_mimetypes @fi:icons_mimetypes
exit 0 exit 0

6
templates/standard-daemon
View File

@ -61,7 +61,7 @@ This package includes the %{name} API documentation.
%pre %pre
/usr/sbin/useradd -s /bin/false -r -d <service_homedir> \\ /usr/sbin/useradd -s /bin/false -r -d <service_homedir> \\
\ -c "service description" <service_name> &>/dev/null || : \ -c "service description" <service_name> >/dev/null 2>&1 || :
%post %post
if [ $1 -eq 1 ]; then if [ $1 -eq 1 ]; then
@ -76,7 +76,7 @@ exit 0
%preun %preun
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
\ /sbin/service <daemon_name> stop &>/dev/null || : \ /sbin/service <daemon_name> stop >/dev/null 2>&1 || :
\ /sbin/chkconfig --del <daemon_name> \ /sbin/chkconfig --del <daemon_name>
fi fi
@if:infopages @if:infopages
@ -87,7 +87,7 @@ exit 0
%postun %postun
if [ $1 -ge 1 ]; then if [ $1 -ge 1 ]; then
\ /sbin/service <daemon_name> condrestart &>/dev/null || : \ /sbin/service <daemon_name> condrestart >/dev/null 2>&1 || :
fi fi
exit 0 exit 0