From d45520ef98aec99108f416c69ef79a54b7415c17fadb5de73ab0d2a7fd57aba5 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sat, 22 Jun 2024 21:42:57 +0300 Subject: [PATCH] Use rm -f for removing of possible Info's index That depends on your build system available packages if Info's index will appear or not. --- build/skel/archivers/lzip-1.24.do | 2 +- build/skel/crypto/gnupg-2.4.5.do | 2 +- build/skel/crypto/gnutls-3.7.10.do | 2 +- build/skel/crypto/gpgme-1.23.2.do | 2 +- build/skel/crypto/libassuan-2.5.7.do | 2 +- build/skel/crypto/libgcrypt-1.11.0.do | 2 +- build/skel/crypto/libgpg-error-1.49.do | 2 +- build/skel/crypto/libksba-1.6.6.do | 2 +- build/skel/crypto/nettle-3.9.1.do | 2 +- build/skel/crypto/pinentry-1.3.0.do | 2 +- build/skel/databases/recutils-1.9.do | 2 +- build/skel/devel/autotools.do | 2 +- build/skel/devel/readline-8.2.do | 2 +- build/skel/dns/libidn2-2.3.7.do | 2 +- build/skel/lang/gcc-8.5.0.do | 2 +- build/skel/lang/gm4-1.4.19.do | 2 +- build/skel/mail/mutt-2.2.13.do | 2 +- build/skel/math/gmp-6.3.0.do | 2 +- build/skel/math/mpc-1.3.1.do | 2 +- build/skel/math/mpfr-4.2.1.do | 2 +- build/skel/textproc/texinfo-7.1.do | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/build/skel/archivers/lzip-1.24.do b/build/skel/archivers/lzip-1.24.do index f0429aa..2ba1294 100644 --- a/build/skel/archivers/lzip-1.24.do +++ b/build/skel/archivers/lzip-1.24.do @@ -16,7 +16,7 @@ cd $NAME ./configure --prefix "$SKELBINS"/$ARCH/$NAME-$hsh >&2 make -j$MAKE_JOBS >&2 make install-strip >&2 -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir cd "$SKELBINS"/$ARCH "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/crypto/gnupg-2.4.5.do b/build/skel/crypto/gnupg-2.4.5.do index 4be6be1..1bcaf11 100644 --- a/build/skel/crypto/gnupg-2.4.5.do +++ b/build/skel/crypto/gnupg-2.4.5.do @@ -26,6 +26,6 @@ make -j$MAKE_JOBS >&2 make install >&2 cd "$SKELBINS"/$ARCH -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir "$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/crypto/gnutls-3.7.10.do b/build/skel/crypto/gnutls-3.7.10.do index 0f178c1..dc8f3e7 100644 --- a/build/skel/crypto/gnutls-3.7.10.do +++ b/build/skel/crypto/gnutls-3.7.10.do @@ -18,6 +18,6 @@ make -j$MAKE_JOBS >&2 make install >&2 cd "$SKELBINS"/$ARCH -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir "$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/crypto/gpgme-1.23.2.do b/build/skel/crypto/gpgme-1.23.2.do index d4e82ed..6dcf2e7 100644 --- a/build/skel/crypto/gpgme-1.23.2.do +++ b/build/skel/crypto/gpgme-1.23.2.do @@ -18,6 +18,6 @@ make -j$MAKE_JOBS >&2 make install >&2 cd "$SKELBINS"/$ARCH -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir "$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/crypto/libassuan-2.5.7.do b/build/skel/crypto/libassuan-2.5.7.do index 82476ab..d43ac23 100644 --- a/build/skel/crypto/libassuan-2.5.7.do +++ b/build/skel/crypto/libassuan-2.5.7.do @@ -17,5 +17,5 @@ make -j$MAKE_JOBS >&2 make install >&2 cd "$SKELBINS"/$ARCH -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/crypto/libgcrypt-1.11.0.do b/build/skel/crypto/libgcrypt-1.11.0.do index abc7fe5..c89724c 100644 --- a/build/skel/crypto/libgcrypt-1.11.0.do +++ b/build/skel/crypto/libgcrypt-1.11.0.do @@ -19,6 +19,6 @@ make -j$MAKE_JOBS >&2 make install >&2 cd "$SKELBINS"/$ARCH -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir "$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/crypto/libgpg-error-1.49.do b/build/skel/crypto/libgpg-error-1.49.do index 82476ab..d43ac23 100644 --- a/build/skel/crypto/libgpg-error-1.49.do +++ b/build/skel/crypto/libgpg-error-1.49.do @@ -17,5 +17,5 @@ make -j$MAKE_JOBS >&2 make install >&2 cd "$SKELBINS"/$ARCH -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/crypto/libksba-1.6.6.do b/build/skel/crypto/libksba-1.6.6.do index e43ce6d..cf7cf1e 100644 --- a/build/skel/crypto/libksba-1.6.6.do +++ b/build/skel/crypto/libksba-1.6.6.do @@ -18,5 +18,5 @@ make -j$MAKE_JOBS >&2 make install >&2 cd "$SKELBINS"/$ARCH -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/crypto/nettle-3.9.1.do b/build/skel/crypto/nettle-3.9.1.do index 84f45d0..1ff10b1 100644 --- a/build/skel/crypto/nettle-3.9.1.do +++ b/build/skel/crypto/nettle-3.9.1.do @@ -17,5 +17,5 @@ gmake -j$MAKE_JOBS >&2 gmake install >&2 cd "$SKELBINS"/$ARCH -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/crypto/pinentry-1.3.0.do b/build/skel/crypto/pinentry-1.3.0.do index 8c10428..65dcd59 100644 --- a/build/skel/crypto/pinentry-1.3.0.do +++ b/build/skel/crypto/pinentry-1.3.0.do @@ -29,6 +29,6 @@ make -j$MAKE_JOBS >&2 make install >&2 cd "$SKELBINS"/$ARCH -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir "$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/databases/recutils-1.9.do b/build/skel/databases/recutils-1.9.do index b37cfac..7a22b0e 100644 --- a/build/skel/databases/recutils-1.9.do +++ b/build/skel/databases/recutils-1.9.do @@ -17,5 +17,5 @@ make -j$MAKE_JOBS >&2 make install >&2 cd "$SKELBINS"/$ARCH -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/devel/autotools.do b/build/skel/devel/autotools.do index 24ac8c8..d9b6bac 100644 --- a/build/skel/devel/autotools.do +++ b/build/skel/devel/autotools.do @@ -21,7 +21,7 @@ for dep in $deps ; do make -j$MAKE_JOBS >&2 make install >&2 done -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir perl -i -npe "s#$tmp/local/bin/perl#/usr/bin/env perl#g" \ "$SKELBINS"/$ARCH/$NAME-$hsh/bin/* diff --git a/build/skel/devel/readline-8.2.do b/build/skel/devel/readline-8.2.do index 0789e77..2e3a5f0 100644 --- a/build/skel/devel/readline-8.2.do +++ b/build/skel/devel/readline-8.2.do @@ -18,6 +18,6 @@ make -j$MAKE_JOBS >&2 make install >&2 cd "$SKELBINS"/$ARCH -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir "$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/dns/libidn2-2.3.7.do b/build/skel/dns/libidn2-2.3.7.do index ed357c2..eaacb8a 100644 --- a/build/skel/dns/libidn2-2.3.7.do +++ b/build/skel/dns/libidn2-2.3.7.do @@ -17,5 +17,5 @@ make -j$MAKE_JOBS >&2 make install >&2 cd "$SKELBINS"/$ARCH -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/lang/gcc-8.5.0.do b/build/skel/lang/gcc-8.5.0.do index a3b30e5..1c8a0a1 100644 --- a/build/skel/lang/gcc-8.5.0.do +++ b/build/skel/lang/gcc-8.5.0.do @@ -25,7 +25,7 @@ CXX=$tmp/local/gcc4.7/bin/g++ ../configure \ --with-mpc=$tmp/local >&2 make -j$MAKE_JOBS >&2 make install >&2 -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir cd "$SKELBINS"/$ARCH "$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps diff --git a/build/skel/lang/gm4-1.4.19.do b/build/skel/lang/gm4-1.4.19.do index 8c79df3..cf9809c 100644 --- a/build/skel/lang/gm4-1.4.19.do +++ b/build/skel/lang/gm4-1.4.19.do @@ -15,7 +15,7 @@ cd ${NAME#g} ./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh --disable-nls >&2 make -j$MAKE_JOBS >&2 make install >&2 -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir mv "$SKELBINS"/$ARCH/$NAME-$hsh/bin/m4 "$SKELBINS"/$ARCH/$NAME-$hsh/bin/gm4 cd "$SKELBINS"/$ARCH diff --git a/build/skel/mail/mutt-2.2.13.do b/build/skel/mail/mutt-2.2.13.do index 34894a2..a0cf9b2 100644 --- a/build/skel/mail/mutt-2.2.13.do +++ b/build/skel/mail/mutt-2.2.13.do @@ -28,6 +28,6 @@ make -j$MAKE_JOBS >&2 make install >&2 cd "$SKELBINS"/$ARCH -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir "$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/math/gmp-6.3.0.do b/build/skel/math/gmp-6.3.0.do index f92c9d2..410ddc2 100644 --- a/build/skel/math/gmp-6.3.0.do +++ b/build/skel/math/gmp-6.3.0.do @@ -15,7 +15,7 @@ cd $NAME ./configure --enable-alloca=malloc-reentrant --prefix="$SKELBINS"/$ARCH/$NAME-$hsh >&2 make -j$MAKE_JOBS >&2 make install-strip >&2 -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir cd "$SKELBINS"/$ARCH "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/math/mpc-1.3.1.do b/build/skel/math/mpc-1.3.1.do index 98294f5..bc84fa4 100644 --- a/build/skel/math/mpc-1.3.1.do +++ b/build/skel/math/mpc-1.3.1.do @@ -16,7 +16,7 @@ cd $NAME ./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh >&2 make -j$MAKE_JOBS >&2 make install-strip >&2 -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir cd "$SKELBINS"/$ARCH "$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps diff --git a/build/skel/math/mpfr-4.2.1.do b/build/skel/math/mpfr-4.2.1.do index deda564..4afa5cb 100644 --- a/build/skel/math/mpfr-4.2.1.do +++ b/build/skel/math/mpfr-4.2.1.do @@ -16,7 +16,7 @@ cd $NAME ./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh >&2 make -j$MAKE_JOBS >&2 make install-strip >&2 -rm "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir +rm -f "$SKELBINS"/$ARCH/$NAME-$hsh/share/info/dir cd "$SKELBINS"/$ARCH "$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps diff --git a/build/skel/textproc/texinfo-7.1.do b/build/skel/textproc/texinfo-7.1.do index dc42d3c..8168fc4 100644 --- a/build/skel/textproc/texinfo-7.1.do +++ b/build/skel/textproc/texinfo-7.1.do @@ -24,6 +24,6 @@ cd "$SKELBINS"/$ARCH/$NAME-$hsh/share/texinfo/Texinfo/Convert patch <"$BASS_ROOT"/build/skel/textproc/texinfo-bordered-table.patch >&2 cd "$SKELBINS"/$ARCH -rm $NAME-$hsh/share/info/dir +rm -f $NAME-$hsh/share/info/dir "$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh -- 2.48.1