X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=functions;h=3ca8396f2dc69ef499a65e957e00cf34be4f1ba2;hb=eb29a384d8d1bcb7efdb7ce9d41666f1bbe02d46;hp=1107738f57c0b7757f91e68d2c0583845343c08c;hpb=b51ceee0b72987ab3a9533c6560dd538b6332476;p=hvlinux.git diff --git a/functions b/functions index 1107738..3ca8396 100644 --- a/functions +++ b/functions @@ -24,6 +24,8 @@ TAR_OPTS="-b8" HV_FONTS_PATH="/usr/share/fonts" +DEFAULT_EDITOR=nano + # It seems that when compiling bash-4.0, using # "make -j 1" is causing problems... if [ "x${MAKEJOBS}" = "x1" ]; then @@ -543,7 +545,9 @@ static_decompressed_dirname() tar.bz2|tar.gz|tgz|tar.Z) # Remove optional "./" leading component with sed # and extract base directory name with awk. - local DIRNAME=$(tar ${TAR_OPTS} -tf ${LFS_PKG_DIR}/${PACKAGE}.tar.bz2 | head -n1 | sed 's!^\./!!' | awk -F \/ '{print $1}') + # tar 1.23 reports an error when using pipes, so + # remove error message with "2> /dev/null" + local DIRNAME=$(tar ${TAR_OPTS} -tf ${LFS_PKG_DIR}/${PACKAGE}.tar.bz2 2> /dev/null | head -n1 | sed 's!^\./!!' | awk -F \/ '{print $1}') echo ${DIRNAME} ;; zip)