diff --git a/l/arabica/SlackBuild b/l/arabica/SlackBuild index 03c2e1e8..eab8dbad 100755 --- a/l/arabica/SlackBuild +++ b/l/arabica/SlackBuild @@ -99,4 +99,4 @@ EOF cd $PKG rm -f $PKG/{,usr/}lib$(uname -m | grep -o 64)/*.la -/sbin/makepkg --linkadd y --chown n --prepend $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz} +/sbin/makepkg --linkadd y --chown n --prepend $OUTPUT/$PRGNAM-${VERSION//-/_}-$ARCH-$BUILD$TAG.${PKGTYPE:-txz} diff --git a/rebuild-and-install-all.sh b/rebuild-and-install-all.sh index eb1b0fef..76dd9790 100755 --- a/rebuild-and-install-all.sh +++ b/rebuild-and-install-all.sh @@ -4,12 +4,12 @@ WD=/home/installs/SlackBuilds CAT=${CAT:-$1} cd $WD -./what-s_installed.sh | grep -v "^❌.*" | cut -d\ -f2 | grep "^${CAT}/.*" +./what-s_installed.sh | grep "^| x .*" | cut -d\ -f2 | grep "^${CAT}/.*" echo "Ctrl-C to stop here, enter to continue" read -for p in $(./what-s_installed.sh | grep -v "^❌.*" | cut -d\ -f2 | grep "^${CAT}/.*"); do +for p in $(./what-s_installed.sh | grep "^| x .*" | cut -d\ -f2 | grep "^${CAT}/.*"); do (cd $p bash -e ./SlackBuild || echo "ERROR $p" >> $WD/_errors_rebuild) done diff --git a/what-s_installed.sh b/what-s_installed.sh index 223574e5..2f710048 100755 --- a/what-s_installed.sh +++ b/what-s_installed.sh @@ -4,11 +4,14 @@ cd $(dirname $0) || exit 1 PKGs=$(ls /var/lib/pkgtools/packages/ | sed 's|^\(.*\)-.*-.*-.*$|\1|') +PKG_OK="| x " +PKG_KO="| " + for cat in a ap d fonts l n xap y; do cd $cat for p in $(ls -1); do - echo $PKGs | grep -q " $(echo $p | tr -d /) " && echo -n "✓: " || echo -n "❌: " - echo "$cat/$p" + echo $PKGs | grep -q " $(echo $p | tr -d /) " && echo -n "$PKG_OK" || echo -n "$PKG_KO" + echo "| $cat/$p" done | sort cd .. done