diff --git a/tcsh.spec b/tcsh.spec index d35c212..6260a36 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -76,20 +76,20 @@ make %{?_smp_mflags} -C nls catalogs %install -rm -rf $RPM_BUILD_ROOT +rm -rf ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 ${RPM_BUILD_ROOT}%{_bindir} -install -p -m 755 tcsh ${RPM_BUILD_ROOT}%{_bindir}/tcsh +install -p -m 755 tcsh ${RPM_BUILD_ROOT}%{_bindir}/tcsh install -p -m 644 tcsh.man ${RPM_BUILD_ROOT}%{_mandir}/man1/tcsh.1 -ln -sf tcsh ${RPM_BUILD_ROOT}%{_bindir}/csh -ln -sf tcsh.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/csh.1 +ln -sf tcsh ${RPM_BUILD_ROOT}%{_bindir}/csh +ln -sf tcsh.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/csh.1 while read lang language ; do - dest=${RPM_BUILD_ROOT}%{_datadir}/locale/$lang/LC_MESSAGES - if test -f nls/$language.cat ; then - mkdir -p $dest - install -p -m 644 nls/$language.cat $dest/tcsh - echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/tcsh" - fi + dest=${RPM_BUILD_ROOT}%{_datadir}/locale/$lang/LC_MESSAGES + if test -f nls/$language.cat ; then + mkdir -p $dest + install -p -m 644 nls/$language.cat $dest/tcsh + echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/tcsh" + fi done > tcsh.lang << _EOF de german el greek @@ -116,30 +116,26 @@ rm -rf $RPM_BUILD_ROOT %post if [ ! -f /etc/shells ]; then - echo "%{_bindir}/tcsh" >> /etc/shells - echo "/bin/tcsh" >> /etc/shells - echo "%{_bindir}/csh" >> /etc/shells - echo "/bin/csh" >> /etc/shells + echo "%{_bindir}/tcsh" >> /etc/shells + echo "/bin/tcsh" >> /etc/shells + echo "%{_bindir}/csh" >> /etc/shells + echo "/bin/csh" >> /etc/shells else - grep -q '^%{_bindir}/tcsh$' /etc/shells || \ - echo "%{_bindir}/tcsh" >> /etc/shells - grep -q '^/bin/tcsh$' /etc/shells || \ - echo "/bin/tcsh" >> /etc/shells - grep -q '^%{_bindir}/csh$' /etc/shells || \ - echo "%{_bindir}/csh" >> /etc/shells - grep -q '^/bin/csh$' /etc/shells || \ - echo "/bin/csh" >> /etc/shells + grep -q '^%{_bindir}/tcsh$' /etc/shells || echo "%{_bindir}/tcsh" >> /etc/shells + grep -q '^/bin/tcsh$' /etc/shells || echo "/bin/tcsh" >> /etc/shells + grep -q '^%{_bindir}/csh$' /etc/shells || echo "%{_bindir}/csh" >> /etc/shells + grep -q '^/bin/csh$' /etc/shells || echo "/bin/csh" >> /etc/shells fi %postun if [ ! -x %{_bindir}/tcsh ]; then - grep -v '^%{_bindir}/tcsh$' /etc/shells | \ - grep -v '^%{_bindir}/csh$' > /etc/shells.rpm && \ - grep -v '^/bin/tcsh$' /etc/shells | \ - grep -v '^%{_bindir}/csh$' | \ - grep -v '^/bin/csh$' > /etc/shells.rpm && \ - mv /etc/shells.rpm /etc/shells + grep -v '^%{_bindir}/tcsh$' /etc/shells | \ + grep -v '^%{_bindir}/csh$' > /etc/shells.rpm && \ + grep -v '^/bin/tcsh$' /etc/shells | \ + grep -v '^%{_bindir}/csh$' | \ + grep -v '^/bin/csh$' > /etc/shells.rpm && \ + mv /etc/shells.rpm /etc/shells fi