From b58720047fc7002a75b85dc6c7fff9f5037b43cf Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Thu, 3 Mar 2022 16:01:33 +0100 Subject: [PATCH] fix errors found by bash -e Signed-off-by: Gwenhael Le Moine --- d/chruby/SlackBuild | 12 ++++++------ d/gforth/SlackBuild | 2 +- d/rpn/SlackBuild | 10 +++++----- d/ruby-install/SlackBuild | 10 +++++----- d/wabt/SlackBuild | 8 ++++---- xap/gammastep/SlackBuild | 2 +- xap/i3status-rust/SlackBuild | 2 +- xap/makemkv/SlackBuild | 2 +- xap/x48/SlackBuild | 8 +++++--- xap/x49gp/SlackBuild | 7 ++++--- y/steam/SlackBuild | 4 ++-- 11 files changed, 35 insertions(+), 32 deletions(-) diff --git a/d/chruby/SlackBuild b/d/chruby/SlackBuild index fa89423c..01e138d1 100755 --- a/d/chruby/SlackBuild +++ b/d/chruby/SlackBuild @@ -43,7 +43,7 @@ make -j3 PREFIX=$PREFIX # installation mkdir -p $PKG -PREFIX=$PREFIX DOC_DIR=$PREFIX/doc/$PRGNAM DESTDIR=$PKG make install PREFIX=$PREFIX DOC_DIR=$PREFIX/doc/$PRGNAM DESTDIR=$PKG +PREFIX=$PKG$PREFIX DOC_DIR=$PKG$PREFIX/doc/$PRGNAM DESTDIR=$PKG make install PREFIX=$PKG$PREFIX DOC_DIR=$PKG$PREFIX/doc/$PRGNAM DESTDIR=$PKG [ -d $PKG$PREFIX/share/man ] && mv $PKG$PREFIX/share/man $PKG$PREFIX/man # correction @@ -52,11 +52,11 @@ chown -R root:root * [ -d $PKG/usr/man ] && find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; -# Strip binaries -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -) +# # Strip binaries +# ( cd $PKG +# find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# ) # embaumement diff --git a/d/gforth/SlackBuild b/d/gforth/SlackBuild index 3df717ae..19a54381 100755 --- a/d/gforth/SlackBuild +++ b/d/gforth/SlackBuild @@ -49,7 +49,7 @@ make install DESTDIR=$PKG rm $PKG$PREFIX/info/dir mkdir -p $PKG$PREFIX/doc/$PRGNAM -cp -R test/ doc/ *.md LICENSE $PKG$PREFIX/doc/$PRGNAM +cp -R AUTHORS Agenda BUGS BUILD-FROM-SCRATCH COPYING* ChangeLog* INSTALL* NEWS* README* ToDo* test/ doc/ *.md $PKG$PREFIX/doc/$PRGNAM # correction cd $PKG diff --git a/d/rpn/SlackBuild b/d/rpn/SlackBuild index 9282184b..b38c777b 100755 --- a/d/rpn/SlackBuild +++ b/d/rpn/SlackBuild @@ -38,7 +38,7 @@ cd $TMP/$PRGNAM [ "x$VERSION" == "xdevelop" ] && git checkout develop && VERSION=trunk [ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION -sed -i 's|git@github.com:|https://github.com/|g' $(grep -l git@ .*) +# sed -i 's|git@github.com:|https://github.com/|g' $(grep -l git@ .*) # configuration cmake \ @@ -62,10 +62,10 @@ find $PKG -name \.git\* -exec rm -fr {} \; [ -d $PKG/usr/man ] && find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; -# Strip binaries -cd $PKG -find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# # Strip binaries +# cd $PKG +# find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null # embaumement mkdir -p $PKG/install diff --git a/d/ruby-install/SlackBuild b/d/ruby-install/SlackBuild index 1a42624b..4d79cadc 100755 --- a/d/ruby-install/SlackBuild +++ b/d/ruby-install/SlackBuild @@ -48,11 +48,11 @@ chown -R root:root * [ -d $PKG/usr/man ] && find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; -# Strip binaries -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -) +# # Strip binaries +# ( cd $PKG +# find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# ) # embaumement diff --git a/d/wabt/SlackBuild b/d/wabt/SlackBuild index 1654e122..b0bd31cf 100755 --- a/d/wabt/SlackBuild +++ b/d/wabt/SlackBuild @@ -62,10 +62,10 @@ find $PKG -name \.git\* -exec rm -fr {} \; [ -d $PKG/usr/man ] && find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; -# Strip binaries -cd $PKG -find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# # Strip binaries +# cd $PKG +# find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null # embaumement mkdir -p $PKG/install diff --git a/xap/gammastep/SlackBuild b/xap/gammastep/SlackBuild index e0eed8e6..f15b026b 100755 --- a/xap/gammastep/SlackBuild +++ b/xap/gammastep/SlackBuild @@ -47,7 +47,7 @@ make install DESTDIR=$PKG # move doc/ to the appropriate location mkdir -p $PKG$PREFIX/doc/$PRGNAM -cp LICENSE* *.md $PKG$PREFIX/doc/$PRGNAM +cp *.md $PKG$PREFIX/doc/$PRGNAM # correction cd $PKG diff --git a/xap/i3status-rust/SlackBuild b/xap/i3status-rust/SlackBuild index 155636d7..16d72236 100755 --- a/xap/i3status-rust/SlackBuild +++ b/xap/i3status-rust/SlackBuild @@ -46,7 +46,7 @@ cp -R files/* $PKG$PREFIX/share/$PRGNAM # move doc/ to the appropriate location mkdir -p $PKG$PREFIX/doc/$PRGNAM -cp -R doc/ example/ LICENSE *.md $PKG$PREFIX/doc/$PRGNAM +cp -R doc/ examples/ LICENSE *.md $PKG$PREFIX/doc/$PRGNAM mkdir -p $PKG$PREFIX/man cp man/i3status-rs.1 $PKG$PREFIX/man diff --git a/xap/makemkv/SlackBuild b/xap/makemkv/SlackBuild index cb3de1e5..b6885cd4 100755 --- a/xap/makemkv/SlackBuild +++ b/xap/makemkv/SlackBuild @@ -4,7 +4,7 @@ set -x PRGNAM=$(basename $(pwd)) # Fetching sources -VERSION=${VERSION:-1.16.5} +VERSION=${VERSION:-1.16.7} BUILD=1 diff --git a/xap/x48/SlackBuild b/xap/x48/SlackBuild index fff077ed..696185f3 100755 --- a/xap/x48/SlackBuild +++ b/xap/x48/SlackBuild @@ -65,10 +65,12 @@ cd $PKG$PREFIX/share/$PRGNAM cp $TMP/$PRGNAM/ROMs/*rom*.bz2 . find . -name "*.bz2" -exec bunzip2 {} \; -# Cleaning +# # Cleaning +# cd $PKG +# find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + cd $PKG -find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null [ -d $PKG$PREFIX/man ] && find $PKG$PREFIX/man -type f -name "*.?" -exec gzip -9 {} \; diff --git a/xap/x49gp/SlackBuild b/xap/x49gp/SlackBuild index 8c9adc23..99f31235 100755 --- a/xap/x49gp/SlackBuild +++ b/xap/x49gp/SlackBuild @@ -74,10 +74,11 @@ wget -c -O $PREFIX/share/$PRGNAM/newrpl/newrplfw.bin https://www.hpgcc3.org/down echo "newrplfw.bin" > $PREFIX/share/$PRGNAM/newrpl/update.scp EOF -# Cleaning +# # Cleaning +# cd $PKG +# find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null cd $PKG -find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null [ -d $PKG$PREFIX/man ] && find $PKG$PREFIX/man -type f -name "*.?" -exec gzip -9 {} \; diff --git a/y/steam/SlackBuild b/y/steam/SlackBuild index dc395c2a..157b1594 100755 --- a/y/steam/SlackBuild +++ b/y/steam/SlackBuild @@ -64,7 +64,7 @@ cd ${PRGNAM}-launcher VERSION=$(cat client-versions.json | grep -o "[0-9.]*" | sed 'N;s/\n/_/') # Use Slackware-specific installation directories -patch -p0 < $REPOSITORY/patch-slackdirs.diff +patch -p0 < $CWD/patch-slackdirs.diff chown -R root:root . find -L . \ @@ -93,7 +93,7 @@ install -p -m 0644 subprojects/steam-devices/*.rules $PKG/lib/udev/rules.d/ sed -i -e 's/^KERNEL=="uinput".*/& GROUP="plugdev"/' $PKG/lib/udev/rules.d/60-steam-input.rules mkdir -p $PKG/usr/doc/$PRGNAM -cp subprojects/steam-devices/LICENSE $REPOSITORY/SlackBuild $PKG/usr/doc/$PRGNAM/ +cp subprojects/steam-devices/LICENSE $PKG/usr/doc/$PRGNAM/ mkdir -p $PKG/install cat < $PKG/install/slack-desc