From b266abc95933f1ea21c22afbd6123056087c7d82 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Fri, 26 Dec 2008 17:12:22 +0100 Subject: Few bashism updates. --- eclass/kde4-meta.eclass | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'eclass/kde4-meta.eclass') diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 16abdcd2dcf..3d5ba73bb61 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -206,17 +206,17 @@ kde4-meta_src_extract() { # Copy all subdirectories for subdir in $(__list_needed_subdirectories); do targetdir="" - if [[ ${subdir} == doc/* && ! -e "${ESVN_WC_PATH}/${kmnamedir}${subdir}" ]]; then + if [[ $subdir = doc/* && ! -e "$ESVN_WC_PATH/$kmnamedir$subdir" ]]; then continue fi - [[ ${subdir%/} == */* ]] && targetdir=${subdir%/} && targetdir=${targetdir%/*} && mkdir -p "${S}/${targetdir}" + [[ ${subdir%/} = */* ]] && targetdir=${subdir%/} && targetdir=${targetdir%/*} && mkdir -p "${S}/${targetdir}" rsync --recursive ${rsync_options} "${ESVN_WC_PATH}/${kmnamedir}${subdir%/}" "${S}/${targetdir}" \ || die "${ESVN}: can't export subdirectory '${subdir}' to '${S}/${targetdir}'." done - [[ "${KMNAME}" == kdebase* ]] && kdebase_toplevel_cmakelist + [[ $KMNAME = kdebase* ]] && kdebase_toplevel_cmakelist - if [[ ${KMNAME} == kdebase-runtime && ${PN} != kdebase-data ]]; then + if [[ $KMNAME = kdebase-runtime && $PN != kdebase-data ]]; then sed -i -e '/^install(PROGRAMS[[:space:]]*[^[:space:]]*\/kde4[[:space:]]/s/^/#DONOTINSTALL /' \ "${S}"/CMakeLists.txt || die "Sed to exclude bin/kde4 failed" fi @@ -225,7 +225,7 @@ kde4-meta_src_extract() { tarball="${KMNAME}-${PV}.tar.bz2" tarfile="${DISTDIR}"/${tarball} - echo "Unpacking parts of ${tarball} to ${WORKDIR}" + ebegin "Unpacking parts of ${tarball} to ${WORKDIR}" kde4-meta_create_extractlists @@ -246,6 +246,8 @@ kde4-meta_src_extract() { popd > /dev/null + eend $? + if [[ -n ${KDE4_STRICTER} ]]; then for f in $(__list_needed_subdirectories fatal); do if [[ ! -e ${S}/${f#*/} ]]; then -- cgit v1.2.3