Note: Due to technical difficulties, the Archives are currently not up to date.
GMANE provides an alternative service for most mailing lists. c.f. bug 424647
Index: tools/gnap_shared.sh
===================================================================
--- tools/gnap_shared.sh (revision 0)
+++ tools/gnap_shared.sh (revision 0)
@@ -0,0 +1,79 @@
+GNAPNAME=$(basename "$0")
+
+case ${GNAPNAME} in
+ gnap_make ) GNAPPRODUCT="Build";;
+ * ) GNAPPRODUCT="Something";;
+esac
+
+GNAPLIBDIR='/usr/lib/gnap'
+STAGE3FILE="${GNAPLIBDIR}/gnap-stage3seed.tar.bz2"
+SNAPSHOTFILE="${GNAPLIBDIR}/gnap-portagesnapshot.tar.bz2"
+SPECS="${GNAPLIBDIR}/gnap-specs.tar.bz2"
+
+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 "${GNAPPRODUCT} 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 "${GNAPPRODUCT} failed, try ${GNAPNAME} -h for more help"
+ exit 1
+ fi
+}
+
+cleanup() {
+ gbegin 'Cleaning temporary directories'
+ if [[ -d "${TEMPDIR}" ]]; then
+ DIRTOREMOVE="${TEMPDIR}"
+ TEMPDIR=''
+ rm -rf "${DIRTOREMOVE}"
+ gtest $? "Failed to remove ${DIRTOREMOVE}"
+ else
+ gtest 0
+ fi
+}
Index: src/gnap_make
===================================================================
--- src/gnap_make (revision 52)
+++ src/gnap_make (working copy)
@@ -1,70 +1,9 @@
#!/bin/bash
GNAPVERSION='2.0'
-GNAPNAME=$(basename "$0")
+source "gnap_shared.sh"
echo "GNAP Core Building tool ${GNAPNAME} version ${GNAPVERSION}"
-GNAPLIBDIR='/usr/lib/gnap'
-STAGE3FILE="${GNAPLIBDIR}/gnap-stage3seed.tar.bz2"
-SNAPSHOTFILE="${GNAPLIBDIR}/gnap-portagesnapshot.tar.bz2"
-SPECS="${GNAPLIBDIR}/gnap-specs.tar.bz2"
-TEMPDIR=''
-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 Build 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 "Build failed, try man ${GNAPNAME} for more help"
- exit 1
- fi
-}
-
usage() {
echo 'Options:'
echo ' -t stage Build stage to execute (or "all")'
@@ -80,18 +19,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 0)
+++ src/gnap_shared.sh (revision 0)
@@ -0,0 +1,79 @@
+GNAPNAME=$(basename "$0")
+
+case ${GNAPNAME} in
+ gnap_make ) GNAPPRODUCT="Build";;
+ * ) GNAPPRODUCT="Something";;
+esac
+
+GNAPLIBDIR='/usr/lib/gnap'
+STAGE3FILE="${GNAPLIBDIR}/gnap-stage3seed.tar.bz2"
+SNAPSHOTFILE="${GNAPLIBDIR}/gnap-portagesnapshot.tar.bz2"
+SPECS="${GNAPLIBDIR}/gnap-specs.tar.bz2"
+
+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 "${GNAPPRODUCT} 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 "${GNAPPRODUCT} failed, try ${GNAPNAME} -h for more help"
+ exit 1
+ fi
+}
+
+cleanup() {
+ gbegin 'Cleaning temporary directories'
+ if [[ -d "${TEMPDIR}" ]]; then
+ DIRTOREMOVE="${TEMPDIR}"
+ TEMPDIR=''
+ rm -rf "${DIRTOREMOVE}"
+ gtest $? "Failed to remove ${DIRTOREMOVE}"
+ else
+ gtest 0
+ fi
+}
--
gnap-dev@g.o mailing list
|
|
