CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed makepackage to make subscripts use bash instead o sh

Browse source
This commit is contained in:
Rubén Rodríguez 2012-11-25 09:44:08 +01:00
parent 5ad5bd0759
commit b22c955e99
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
makepackage
View file

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# #
# Copyright (C) 2011 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2011 Ruben Rodriguez <ruben@trisquel.info>
# #
@ -147,7 +147,7 @@ EOF
[ -f $CHROOT/$BIN ] || continue [ -f $CHROOT/$BIN ] || continue
mv $CHROOT/$BIN $CHROOT/$BIN.orig mv $CHROOT/$BIN $CHROOT/$BIN.orig
cat << EOF > $CHROOT/$BIN cat << EOF > $CHROOT/$BIN
#!/bin/sh #!/bin/bash
if [ \$# -eq 0 ] if [ \$# -eq 0 ]
then then
@ -178,7 +178,7 @@ done
apt-get --force-yes -y dist-upgrade apt-get --force-yes -y dist-upgrade
umount /proc umount /proc
EOF EOF
chroot jails/$UPSTREAM-$ARCH sh /tmp/update chroot jails/$UPSTREAM-$ARCH bash /tmp/update
if [ -f jails/$UPSTREAM-$ARCH/CurrentlyBuilding ] if [ -f jails/$UPSTREAM-$ARCH/CurrentlyBuilding ]
then then
echo The $UPSTREAM-$ARCH jail appears to be running $(cat jails/$UPSTREAM-$ARCH/CurrentlyBuilding |grep Package: |sed 's/Package:\ //'), aborting. echo The $UPSTREAM-$ARCH jail appears to be running $(cat jails/$UPSTREAM-$ARCH/CurrentlyBuilding |grep Package: |sed 's/Package:\ //'), aborting.
@ -206,7 +206,7 @@ tmpmount
cp -a helpers/ jails/$UPSTREAM-$ARCH/$WORKDIR/ cp -a helpers/ jails/$UPSTREAM-$ARCH/$WORKDIR/
cat << EOF > jails/$UPSTREAM-$ARCH/usr/local/sbin/makepackage-handler cat << EOF > jails/$UPSTREAM-$ARCH/usr/local/sbin/makepackage-handler
#!/bin/sh #!/bin/bash
WORKDIR=$WORKDIR WORKDIR=$WORKDIR
PACKAGE=$PACKAGE PACKAGE=$PACKAGE
cd $WORKDIR cd $WORKDIR
@ -214,7 +214,7 @@ cd $WORKDIR
[ -d PACKAGES ] || mkdir PACKAGES [ -d PACKAGES ] || mkdir PACKAGES
export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libeatmydata/libeatmydata.so" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libeatmydata/libeatmydata.so"
export PATH="/usr/lib/ccache:${PATH}" export PATH="/usr/lib/ccache:${PATH}"
sh -e make-$PACKAGE 2>&1 || exit 1 bash -e make-$PACKAGE 2>&1 || exit 1
EOF EOF
cat << EOF > jails/$UPSTREAM-$ARCH/etc/pkgbinarymangler/striptranslations.conf cat << EOF > jails/$UPSTREAM-$ARCH/etc/pkgbinarymangler/striptranslations.conf