From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by nuthatch.gentoo.org with esmtp (Exim 4.62) (envelope-from ) id 1I6R2j-0008Fx-RR for garchives@archives.gentoo.org; Thu, 05 Jul 2007 13:06:46 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.14.0/8.14.0) with SMTP id l65D6hPG006521; Thu, 5 Jul 2007 13:06:43 GMT Received: from mail.bawue.net (phoenix.bawue.net [193.7.176.60]) by robin.gentoo.org (8.14.0/8.14.0) with ESMTP id l65D6gqN006498 for ; Thu, 5 Jul 2007 13:06:42 GMT Received: from my.bawue.net (imap.bawue.net [193.7.176.64]) by mail.bawue.net (Postfix) with ESMTP id 845B3B8860 for ; Thu, 5 Jul 2007 15:05:46 +0200 (CEST) Received: from 130.230.11.107 (SquirrelMail authenticated user stoile) by my.bawue.net with HTTP; Thu, 5 Jul 2007 16:05:46 +0300 (EEST) Message-ID: <44043.130.230.11.107.1183640746.squirrel@my.bawue.net> In-Reply-To: <59506.130.230.11.107.1183640031.squirrel@my.bawue.net> References: <59506.130.230.11.107.1183640031.squirrel@my.bawue.net> Date: Thu, 5 Jul 2007 16:05:46 +0300 (EEST) Subject: [gnap-dev] 03-split-gnap_remaster.patch From: "Philipp Riegger" To: gnap-dev@lists.gentoo.org User-Agent: SquirrelMail/1.4.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo GNAP development X-BeenThere: gnap-dev@gentoo.org Reply-to: gnap-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 Importance: Normal X-Archives-Salt: 3526e3db-0fd0-4a16-8338-1af5762490d3 X-Archives-Hash: 520a2c6d350c11f7d3388b8512599df2 Index: tools/gnap_shared.sh =================================================================== --- tools/gnap_shared.sh (revision 54) +++ tools/gnap_shared.sh (working copy) @@ -1,9 +1,10 @@ GNAPNAME=$(basename "$0") case ${GNAPNAME} in - gnap_make ) GNAPPRODUCT="Build";; - gnap_overlay ) GNAPPRODUCT="Overlay";; - * ) GNAPPRODUCT="Something";; + gnap_make ) GNAPPRODUCT="Build";; + gnap_overlay ) GNAPPRODUCT="Overlay";; + gnap_remaster ) GNAPPRODUCT="Remaster";; + * ) GNAPPRODUCT="Something";; esac GNAPLIBDIR='/usr/lib/gnap' @@ -12,6 +13,8 @@ SPECS="${GNAPLIBDIR}/gnap-specs.tar.bz2" GNAPCORE="${GNAPLIBDIR}/gnap-core.tar" GNAPMBR="${GNAPLIBDIR}/mbr/mbr.bin" +GNAPEXTDIR="${GNAPLIBDIR}/extensions" +GNAPBASEFS="${GNAPLIBDIR}/gnap-basefs.tar.bz2" LOOP='' Index: tools/gnap_remaster =================================================================== --- tools/gnap_remaster (revision 52) +++ tools/gnap_remaster (working copy) @@ -1,72 +1,11 @@ #!/bin/bash VERSION='2.0' -GNAPNAME=$(basename "$0") +source "gnap_shared.sh" echo "GNAP remastering tool ${GNAPNAME} ${VERSION}" -GNAPLIBDIR='/usr/lib/gnap' -GNAPEXTDIR="${GNAPLIBDIR}/extensions" -TEMPDIR='' -GNAPCORE="${GNAPLIBDIR}/gnap-core.tar" -GNAPBASEFS="${GNAPLIBDIR}/gnap-basefs.tar.bz2" + OUTPUT='mygnap-core.tar' -G=$'\e[32;01m' -B=$'\e[31;01m' -N=$'\e[0m' -W=$'\e[33;01m' -K=$'\e[34;01m' -C="$[$(set -- $(stty size 2>/dev/null); echo ${2}) - 7]" -E=$'\e['${C}'G' - -gwarn() { - echo -e " ${W}*${N} ${*}" -} - -gconfirm() { - if [[ "${FORCEYES}" -eq 1 ]]; then - gwarn "${*} forced to yes" - else - read -ep " ${W}*${N} ${*} [N]: " answer - if [[ "${answer}" != 'y' && "${answer}" != 'Y' ]]; then - if [[ -n "${TEMPDIR}" ]]; then - cleanup - fi - echo 'Remaster aborted !' - exit 2 - fi - fi -} - -gbegin() { - echo -ne " ${G}*${N} ${*}..." -} - -gtest() { - continued=0 - if [[ "$#" -gt 0 && "${1}" == 'continued' ]]; then - shift - continued=1 - fi - - if [[ "${#}" -eq 0 || "${1}" -eq 0 ]]; then - if [[ "${continued}" -eq 0 ]]; then - echo -e "${E} ${K}[ ${G}ok${K} ]${N}" - fi - else - echo -e "${E} ${K}[ ${B}!!${K} ]${N}" - if [[ "$#" -ge 2 ]]; then - shift - echo -en " ${B}*${N} ${*}" - echo -e "${E} ${K}[ ${B}!!${K} ]${N}" - fi - if [[ -n "${TEMPDIR}" ]]; then - cleanup - fi - echo "Remaster failed, try ${GNAPNAME} -h for more help" - exit 1 - fi -} - usage() { echo echo 'Usage:' @@ -85,18 +24,6 @@ echo "Please man ${GNAPNAME} for more details." } -cleanup() { - gbegin 'Cleaning temporary directories' - if [[ -d "${TEMPDIR}" ]]; then - DIRTOREMOVE="${TEMPDIR}" - TEMPDIR='' - rm -rf "${DIRTOREMOVE}" - gtest $? "Failed to remove ${DIRTOREMOVE}" - else - gtest 0 - fi -} - if [[ "$#" -eq 0 || "${1}" == '-h' ]]; then usage exit 0 Index: src/gnap_shared.sh =================================================================== --- src/gnap_shared.sh (revision 54) +++ src/gnap_shared.sh (working copy) @@ -1,9 +1,10 @@ GNAPNAME=$(basename "$0") case ${GNAPNAME} in - gnap_make ) GNAPPRODUCT="Build";; - gnap_overlay ) GNAPPRODUCT="Overlay";; - * ) GNAPPRODUCT="Something";; + gnap_make ) GNAPPRODUCT="Build";; + gnap_overlay ) GNAPPRODUCT="Overlay";; + gnap_remaster ) GNAPPRODUCT="Remaster";; + * ) GNAPPRODUCT="Something";; esac GNAPLIBDIR='/usr/lib/gnap' @@ -12,6 +13,8 @@ SPECS="${GNAPLIBDIR}/gnap-specs.tar.bz2" GNAPCORE="${GNAPLIBDIR}/gnap-core.tar" GNAPMBR="${GNAPLIBDIR}/mbr/mbr.bin" +GNAPEXTDIR="${GNAPLIBDIR}/extensions" +GNAPBASEFS="${GNAPLIBDIR}/gnap-basefs.tar.bz2" LOOP='' -- gnap-dev@gentoo.org mailing list