Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix in shell logic for ARCH detection; make sure we don't have a 

non-zero exit code, as build.sh will fail then.
This commit is contained in:
Steve McIntyre 2006-06-08 00:46:58 +00:00
parent 0376061922
commit f74103a020
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CONF.sh
View File

@ -74,13 +74,13 @@ export OFFICIAL="Unofficial"
#export OFFICIAL="Official" #export OFFICIAL="Official"
#export OFFICIAL="Official Beta" #export OFFICIAL="Official Beta"
# ... for arch # ... for arch
CPU=`dpkg-architecture -qDEB_HOST_DPKG_CPU 2>/dev/null` CPU=`dpkg-architecture -qDEB_HOST_DPKG_CPU 2>/dev/null || true`
if [ $? -ne 0 ] ; then if [ "$CPU"x = ""x ] ; then
CPU=`dpkg-architecture -qDEB_HOST_ARCH` CPU=`dpkg-architecture -qDEB_HOST_ARCH`
fi fi
KERNEL=`dpkg-architecture -qDEB_HOST_DPKG_OS 2>/dev/null` KERNEL=`dpkg-architecture -qDEB_HOST_DPKG_OS 2>/dev/null || true`
if [ $? -ne 0 ] ; then if [ "$KERNEL"x = ""x ] ; then
KERNEL=linux KERNEL=linux
fi fi
if [ $KERNEL = linux ] ; then if [ $KERNEL = linux ] ; then

10
debian/CONF.sh vendored
View File

@ -74,13 +74,13 @@ export OFFICIAL="Unofficial"
#export OFFICIAL="Official" #export OFFICIAL="Official"
#export OFFICIAL="Official Beta" #export OFFICIAL="Official Beta"
# ... for arch # ... for arch
CPU=`dpkg-architecture -qDEB_HOST_DPKG_CPU 2>/dev/null` CPU=`dpkg-architecture -qDEB_HOST_DPKG_CPU 2>/dev/null || true`
if [ $? -ne 0 ] ; then if [ "$CPU"x = ""x ] ; then
CPU=`dpkg-architecture -qDEB_HOST_ARCH` CPU=`dpkg-architecture -qDEB_HOST_ARCH`
fi fi
KERNEL=`dpkg-architecture -qDEB_HOST_DPKG_OS 2>/dev/null` KERNEL=`dpkg-architecture -qDEB_HOST_DPKG_OS 2>/dev/null || true`
if [ $? -ne 0 ] ; then if [ "$KERNEL"x = ""x ] ; then
KERNEL=linux KERNEL=linux
fi fi
if [ $KERNEL = linux ] ; then if [ $KERNEL = linux ] ; then