| 1 |
Index: tools/gnap_shared.sh |
| 2 |
=================================================================== |
| 3 |
--- tools/gnap_shared.sh (revision 0) |
| 4 |
+++ tools/gnap_shared.sh (revision 0) |
| 5 |
@@ -0,0 +1,79 @@ |
| 6 |
+GNAPNAME=$(basename "$0") |
| 7 |
+ |
| 8 |
+case ${GNAPNAME} in |
| 9 |
+ gnap_make ) GNAPPRODUCT="Build";; |
| 10 |
+ * ) GNAPPRODUCT="Something";; |
| 11 |
+esac |
| 12 |
+ |
| 13 |
+GNAPLIBDIR='/usr/lib/gnap' |
| 14 |
+STAGE3FILE="${GNAPLIBDIR}/gnap-stage3seed.tar.bz2" |
| 15 |
+SNAPSHOTFILE="${GNAPLIBDIR}/gnap-portagesnapshot.tar.bz2" |
| 16 |
+SPECS="${GNAPLIBDIR}/gnap-specs.tar.bz2" |
| 17 |
+ |
| 18 |
+G=$'\e[32;01m' |
| 19 |
+B=$'\e[31;01m' |
| 20 |
+N=$'\e[0m' |
| 21 |
+W=$'\e[33;01m' |
| 22 |
+K=$'\e[34;01m' |
| 23 |
+C="$[$(set -- $(stty size 2>/dev/null); echo ${2}) - 7]" |
| 24 |
+E=$'\e['${C}'G' |
| 25 |
+ |
| 26 |
+gwarn() { |
| 27 |
+ echo -e " ${W}*${N} ${*}" |
| 28 |
+} |
| 29 |
+ |
| 30 |
+gconfirm() { |
| 31 |
+ if [[ "${FORCEYES}" -eq 1 ]]; then |
| 32 |
+ gwarn "${*} forced to yes" |
| 33 |
+ else |
| 34 |
+ read -ep " ${W}*${N} ${*} [N]: " answer |
| 35 |
+ if [[ "${answer}" != 'y' && "${answer}" != 'Y' ]]; then |
| 36 |
+ if [[ -n "${TEMPDIR}" ]]; then |
| 37 |
+ cleanup |
| 38 |
+ fi |
| 39 |
+ echo "${GNAPPRODUCT} aborted !" |
| 40 |
+ exit 2 |
| 41 |
+ fi |
| 42 |
+ fi |
| 43 |
+} |
| 44 |
+ |
| 45 |
+gbegin() { |
| 46 |
+ echo -ne " ${G}*${N} ${*}..." |
| 47 |
+} |
| 48 |
+ |
| 49 |
+gtest() { |
| 50 |
+ continued=0 |
| 51 |
+ if [[ "${#}" -gt 0 && "${1}" == 'continued' ]]; then |
| 52 |
+ shift |
| 53 |
+ continued=1 |
| 54 |
+ fi |
| 55 |
+ if [[ "${#}" -eq 0 || "${1}" -eq 0 ]]; then |
| 56 |
+ if [[ "${continued}" -eq 0 ]]; then |
| 57 |
+ echo -e "${E} ${K}[ ${G}ok${K} ]${N}" |
| 58 |
+ fi |
| 59 |
+ else |
| 60 |
+ echo -e "${E} ${K}[ ${B}!!${K} ]${N}" |
| 61 |
+ if [[ "${#}" -ge 2 ]]; then |
| 62 |
+ shift |
| 63 |
+ echo -en " ${B}*${N} ${*}" |
| 64 |
+ echo -e "${E} ${K}[ ${B}!!${K} ]${N}" |
| 65 |
+ fi |
| 66 |
+ if [[ -n "${TEMPDIR}" ]]; then |
| 67 |
+ cleanup |
| 68 |
+ fi |
| 69 |
+ echo "${GNAPPRODUCT} failed, try ${GNAPNAME} -h for more help" |
| 70 |
+ exit 1 |
| 71 |
+ fi |
| 72 |
+} |
| 73 |
+ |
| 74 |
+cleanup() { |
| 75 |
+ gbegin 'Cleaning temporary directories' |
| 76 |
+ if [[ -d "${TEMPDIR}" ]]; then |
| 77 |
+ DIRTOREMOVE="${TEMPDIR}" |
| 78 |
+ TEMPDIR='' |
| 79 |
+ rm -rf "${DIRTOREMOVE}" |
| 80 |
+ gtest $? "Failed to remove ${DIRTOREMOVE}" |
| 81 |
+ else |
| 82 |
+ gtest 0 |
| 83 |
+ fi |
| 84 |
+} |
| 85 |
Index: src/gnap_make |
| 86 |
=================================================================== |
| 87 |
--- src/gnap_make (revision 52) |
| 88 |
+++ src/gnap_make (working copy) |
| 89 |
@@ -1,70 +1,9 @@ |
| 90 |
#!/bin/bash |
| 91 |
GNAPVERSION='2.0' |
| 92 |
|
| 93 |
-GNAPNAME=$(basename "$0") |
| 94 |
+source "gnap_shared.sh" |
| 95 |
echo "GNAP Core Building tool ${GNAPNAME} version ${GNAPVERSION}" |
| 96 |
-GNAPLIBDIR='/usr/lib/gnap' |
| 97 |
-STAGE3FILE="${GNAPLIBDIR}/gnap-stage3seed.tar.bz2" |
| 98 |
-SNAPSHOTFILE="${GNAPLIBDIR}/gnap-portagesnapshot.tar.bz2" |
| 99 |
-SPECS="${GNAPLIBDIR}/gnap-specs.tar.bz2" |
| 100 |
-TEMPDIR='' |
| 101 |
|
| 102 |
-G=$'\e[32;01m' |
| 103 |
-B=$'\e[31;01m' |
| 104 |
-N=$'\e[0m' |
| 105 |
-W=$'\e[33;01m' |
| 106 |
-K=$'\e[34;01m' |
| 107 |
-C="$[$(set -- $(stty size 2>/dev/null); echo ${2}) - 7]" |
| 108 |
-E=$'\e['${C}'G' |
| 109 |
- |
| 110 |
-gwarn() { |
| 111 |
- echo -e " ${W}*${N} ${*}" |
| 112 |
-} |
| 113 |
- |
| 114 |
-gconfirm() { |
| 115 |
- if [[ "${FORCEYES}" -eq 1 ]]; then |
| 116 |
- gwarn "${*} forced to yes" |
| 117 |
- else |
| 118 |
- read -ep " ${W}*${N} ${*} [N]: " answer |
| 119 |
- if [[ "${answer}" != 'y' && "${answer}" != 'Y' ]]; then |
| 120 |
- if [[ -n "${TEMPDIR}" ]]; then |
| 121 |
- cleanup |
| 122 |
- fi |
| 123 |
- echo Build aborted ! |
| 124 |
- exit 2 |
| 125 |
- fi |
| 126 |
- fi |
| 127 |
-} |
| 128 |
- |
| 129 |
-gbegin() { |
| 130 |
- echo -ne " ${G}*${N} ${*}..." |
| 131 |
-} |
| 132 |
- |
| 133 |
-gtest() { |
| 134 |
- continued=0 |
| 135 |
- if [[ "$#" -gt 0 && "${1}" == 'continued' ]]; then |
| 136 |
- shift |
| 137 |
- continued=1 |
| 138 |
- fi |
| 139 |
- if [[ "$#" -eq 0 || "${1}" -eq 0 ]]; then |
| 140 |
- if [[ "${continued}" -eq 0 ]]; then |
| 141 |
- echo -e "${E} ${K}[ ${G}ok${K} ]${N}" |
| 142 |
- fi |
| 143 |
- else |
| 144 |
- echo -e "${E} ${K}[ ${B}!!${K} ]${N}" |
| 145 |
- if [[ "$#" -ge 2 ]]; then |
| 146 |
- shift |
| 147 |
- echo -en " ${B}*${N} ${*}" |
| 148 |
- echo -e "${E} ${K}[ ${B}!!${K} ]${N}" |
| 149 |
- fi |
| 150 |
- if [[ -n "${TEMPDIR}" ]]; then |
| 151 |
- cleanup |
| 152 |
- fi |
| 153 |
- echo "Build failed, try man ${GNAPNAME} for more help" |
| 154 |
- exit 1 |
| 155 |
- fi |
| 156 |
-} |
| 157 |
- |
| 158 |
usage() { |
| 159 |
echo 'Options:' |
| 160 |
echo ' -t stage Build stage to execute (or "all")' |
| 161 |
@@ -80,18 +19,6 @@ |
| 162 |
echo "Please man ${GNAPNAME} for more details." |
| 163 |
} |
| 164 |
|
| 165 |
-cleanup() { |
| 166 |
- gbegin 'Cleaning temporary directories' |
| 167 |
- if [[ -d "${TEMPDIR}" ]]; then |
| 168 |
- DIRTOREMOVE="${TEMPDIR}" |
| 169 |
- TEMPDIR='' |
| 170 |
- rm -rf "${DIRTOREMOVE}" |
| 171 |
- gtest $? "Failed to remove ${DIRTOREMOVE}" |
| 172 |
- else |
| 173 |
- gtest 0 |
| 174 |
- fi |
| 175 |
-} |
| 176 |
- |
| 177 |
if [[ "$#" -eq 0 || "${1}" == '-h' ]]; then |
| 178 |
usage |
| 179 |
exit 0 |
| 180 |
Index: src/gnap_shared.sh |
| 181 |
=================================================================== |
| 182 |
--- src/gnap_shared.sh (revision 0) |
| 183 |
+++ src/gnap_shared.sh (revision 0) |
| 184 |
@@ -0,0 +1,79 @@ |
| 185 |
+GNAPNAME=$(basename "$0") |
| 186 |
+ |
| 187 |
+case ${GNAPNAME} in |
| 188 |
+ gnap_make ) GNAPPRODUCT="Build";; |
| 189 |
+ * ) GNAPPRODUCT="Something";; |
| 190 |
+esac |
| 191 |
+ |
| 192 |
+GNAPLIBDIR='/usr/lib/gnap' |
| 193 |
+STAGE3FILE="${GNAPLIBDIR}/gnap-stage3seed.tar.bz2" |
| 194 |
+SNAPSHOTFILE="${GNAPLIBDIR}/gnap-portagesnapshot.tar.bz2" |
| 195 |
+SPECS="${GNAPLIBDIR}/gnap-specs.tar.bz2" |
| 196 |
+ |
| 197 |
+G=$'\e[32;01m' |
| 198 |
+B=$'\e[31;01m' |
| 199 |
+N=$'\e[0m' |
| 200 |
+W=$'\e[33;01m' |
| 201 |
+K=$'\e[34;01m' |
| 202 |
+C="$[$(set -- $(stty size 2>/dev/null); echo ${2}) - 7]" |
| 203 |
+E=$'\e['${C}'G' |
| 204 |
+ |
| 205 |
+gwarn() { |
| 206 |
+ echo -e " ${W}*${N} ${*}" |
| 207 |
+} |
| 208 |
+ |
| 209 |
+gconfirm() { |
| 210 |
+ if [[ "${FORCEYES}" -eq 1 ]]; then |
| 211 |
+ gwarn "${*} forced to yes" |
| 212 |
+ else |
| 213 |
+ read -ep " ${W}*${N} ${*} [N]: " answer |
| 214 |
+ if [[ "${answer}" != 'y' && "${answer}" != 'Y' ]]; then |
| 215 |
+ if [[ -n "${TEMPDIR}" ]]; then |
| 216 |
+ cleanup |
| 217 |
+ fi |
| 218 |
+ echo "${GNAPPRODUCT} aborted !" |
| 219 |
+ exit 2 |
| 220 |
+ fi |
| 221 |
+ fi |
| 222 |
+} |
| 223 |
+ |
| 224 |
+gbegin() { |
| 225 |
+ echo -ne " ${G}*${N} ${*}..." |
| 226 |
+} |
| 227 |
+ |
| 228 |
+gtest() { |
| 229 |
+ continued=0 |
| 230 |
+ if [[ "${#}" -gt 0 && "${1}" == 'continued' ]]; then |
| 231 |
+ shift |
| 232 |
+ continued=1 |
| 233 |
+ fi |
| 234 |
+ if [[ "${#}" -eq 0 || "${1}" -eq 0 ]]; then |
| 235 |
+ if [[ "${continued}" -eq 0 ]]; then |
| 236 |
+ echo -e "${E} ${K}[ ${G}ok${K} ]${N}" |
| 237 |
+ fi |
| 238 |
+ else |
| 239 |
+ echo -e "${E} ${K}[ ${B}!!${K} ]${N}" |
| 240 |
+ if [[ "${#}" -ge 2 ]]; then |
| 241 |
+ shift |
| 242 |
+ echo -en " ${B}*${N} ${*}" |
| 243 |
+ echo -e "${E} ${K}[ ${B}!!${K} ]${N}" |
| 244 |
+ fi |
| 245 |
+ if [[ -n "${TEMPDIR}" ]]; then |
| 246 |
+ cleanup |
| 247 |
+ fi |
| 248 |
+ echo "${GNAPPRODUCT} failed, try ${GNAPNAME} -h for more help" |
| 249 |
+ exit 1 |
| 250 |
+ fi |
| 251 |
+} |
| 252 |
+ |
| 253 |
+cleanup() { |
| 254 |
+ gbegin 'Cleaning temporary directories' |
| 255 |
+ if [[ -d "${TEMPDIR}" ]]; then |
| 256 |
+ DIRTOREMOVE="${TEMPDIR}" |
| 257 |
+ TEMPDIR='' |
| 258 |
+ rm -rf "${DIRTOREMOVE}" |
| 259 |
+ gtest $? "Failed to remove ${DIRTOREMOVE}" |
| 260 |
+ else |
| 261 |
+ gtest 0 |
| 262 |
+ fi |
| 263 |
+} |
| 264 |
|
| 265 |
-- |
| 266 |
gnap-dev@g.o mailing list |
Archives