| 1 |
Index: src/gnap_make |
| 2 |
=================================================================== |
| 3 |
--- src/gnap_make (revision 81) |
| 4 |
+++ src/gnap_make (working copy) |
| 5 |
@@ -29,7 +29,6 @@ |
| 6 |
|
| 7 |
# Read options |
| 8 |
NOTARGET=1 |
| 9 |
-ALLTARGET=0 |
| 10 |
STAGE3=0 |
| 11 |
LIVECD1=0 |
| 12 |
LIVECD2=0 |
| 13 |
@@ -47,7 +46,13 @@ |
| 14 |
v ) GNAP_STAMP="${OPTARG}";; |
| 15 |
t ) |
| 16 |
case "${OPTARG}" in |
| 17 |
- all ) ALLTARGET=1;; |
| 18 |
+ all ) |
| 19 |
+ STAGE3=1 |
| 20 |
+ LIVECD1=1 |
| 21 |
+ LIVECD2=1 |
| 22 |
+ TARBALL=1 |
| 23 |
+ MODULES=1 |
| 24 |
+ NEEDS_SNAPSHOT=1;; |
| 25 |
stage3 ) |
| 26 |
STAGE3=1 |
| 27 |
NEEDS_SNAPSHOT=1;; |
| 28 |
@@ -57,10 +62,13 @@ |
| 29 |
livecd-stage2 ) |
| 30 |
LIVECD2=1 |
| 31 |
NEEDS_SNAPSHOT=1;; |
| 32 |
- tarball ) TARBALL=1;; |
| 33 |
+ tarball ) |
| 34 |
+ TARBALL=1;; |
| 35 |
extensions ) |
| 36 |
MODULES=1 |
| 37 |
NEEDS_SNAPSHOT=1;; |
| 38 |
+ * ) |
| 39 |
+ gtest 1 'Specified stage unknown !';; |
| 40 |
esac |
| 41 |
NOTARGET=0;; |
| 42 |
f ) FORCEYES=1;; |
| 43 |
@@ -107,27 +115,14 @@ |
| 44 |
gtest continued $? "${GNAP_CATALYST_CONF} file not found !" |
| 45 |
source "${GNAP_CATALYST_CONF}" |
| 46 |
|
| 47 |
-# Default targets is complete core build |
| 48 |
-if [[ "${ALLTARGET}" -eq 1 ]]; then |
| 49 |
- STAGE3=1 |
| 50 |
- LIVECD1=1 |
| 51 |
- LIVECD2=1 |
| 52 |
- TARBALL=1 |
| 53 |
- MODULES=1 |
| 54 |
- NEEDS_SNAPSHOT=1 |
| 55 |
-fi |
| 56 |
- |
| 57 |
# At least one target is needed |
| 58 |
test "${NOTARGET}" -eq 0 |
| 59 |
gtest continued $? \ |
| 60 |
'No target specified. You should provide at least one -t option.' |
| 61 |
|
| 62 |
# CATALYST_DIR must exist |
| 63 |
-if [[ ! -d "${CATALYST_DIR}" ]]; then |
| 64 |
- mkdir "${CATALYST_DIR}" |
| 65 |
- gtest continued $? \ |
| 66 |
- "Error: failed to create ${CATALYST_DIR} directory." |
| 67 |
-fi |
| 68 |
+mkdir -p "${CATALYST_DIR}" |
| 69 |
+gtest continued $? "Error: failed to create ${CATALYST_DIR} directory." |
| 70 |
|
| 71 |
# Stage3 needs a seed stage |
| 72 |
if [[ "${STAGE3}" -eq 1 ]]; then |
| 73 |
@@ -146,7 +141,6 @@ |
| 74 |
test -f "${GNAP_STAGE3FILE}" |
| 75 |
gtest continued $? "${GNAP_STAGE3FILE} is not a valid stage3 tarball" |
| 76 |
fi |
| 77 |
-gtest 0 |
| 78 |
|
| 79 |
# If extensions and no stage3, warn that we'll use seedstage as stage3 |
| 80 |
STAGE3LOC="${CATALYST_DIR}/builds/${RELTYPE}/stage3-${SUBARCH}-${GNAP_STAMP}.tar.bz2" |
| 81 |
@@ -154,9 +148,9 @@ |
| 82 |
if [[ "${STAGE3}" -ne 1 && ! -f "${STAGE3LOC}" ]]; then |
| 83 |
gwarn '"livecd-stage1" or "extensions" was selected without "stage3".' |
| 84 |
gconfirm 'Should I use the seed stage as stage3 result ?' |
| 85 |
- if [[ ! -d "${CATALYST_DIR}/builds/${RELTYPE}" ]]; then |
| 86 |
- mkdir -p "${CATALYST_DIR}/builds/${RELTYPE}" |
| 87 |
- fi |
| 88 |
+ mkdir -p "${CATALYST_DIR}/builds/${RELTYPE}" |
| 89 |
+ gtest continued $? \ |
| 90 |
+ "Error: failed to create ${CATALYST_DIR}/builds/${RELTYPE} directory." |
| 91 |
cp "${GNAP_STAGE3FILE}" "${STAGE3LOC}" |
| 92 |
fi |
| 93 |
fi |
| 94 |
@@ -194,8 +188,7 @@ |
| 95 |
|
| 96 |
if [[ -f "${GNAP_LOGPREFIX}.out" || -f "${GNAP_LOGPREFIX}.err" ]]; then |
| 97 |
if [[ "${FORCEYES}" -ne 1 ]]; then |
| 98 |
- read -ep \ |
| 99 |
- " ${W}*${N} Logfile(s) already exists. Append/Overwrite [A]: " \ |
| 100 |
+ read -ep " ${W}*${N} Logfile(s) already exists. Append/Overwrite [A]: " \ |
| 101 |
answer |
| 102 |
if [[ "${answer}" == 'o' || "${answer}" == 'O' ]]; then |
| 103 |
rm "${GNAP_LOGPREFIX}.out" "${GNAP_LOGPREFIX}.err" |
| 104 |
@@ -210,9 +203,7 @@ |
| 105 |
if [[ "${NEEDS_SNAPSHOT}" -eq 1 ]]; then |
| 106 |
gbegin 'Preparing portage snapshot' |
| 107 |
|
| 108 |
- if [[ ! -d "${CATALYST_DIR}/snapshots" ]]; then |
| 109 |
- mkdir -p "${CATALYST_DIR}/snapshots" |
| 110 |
- fi |
| 111 |
+ mkdir -p "${CATALYST_DIR}/snapshots" |
| 112 |
|
| 113 |
if [[ -z "${GNAP_PORTAGE_OVERLAYS}" ]]; then |
| 114 |
cp "${GNAP_SNAPSHOTFILE}" |
| 115 |
"${CATALYST_DIR}/snapshots/portage-${GNAP_STAMP}.tar.bz2" |
| 116 |
|
| 117 |
-- |
| 118 |
gnap-dev@g.o mailing list |
Archives