1 |
Index: tools/gnap_shared.sh |
2 |
=================================================================== |
3 |
--- tools/gnap_shared.sh (revision 54) |
4 |
+++ tools/gnap_shared.sh (working copy) |
5 |
@@ -1,9 +1,10 @@ |
6 |
GNAPNAME=$(basename "$0") |
7 |
|
8 |
case ${GNAPNAME} in |
9 |
- gnap_make ) GNAPPRODUCT="Build";; |
10 |
- gnap_overlay ) GNAPPRODUCT="Overlay";; |
11 |
- * ) GNAPPRODUCT="Something";; |
12 |
+ gnap_make ) GNAPPRODUCT="Build";; |
13 |
+ gnap_overlay ) GNAPPRODUCT="Overlay";; |
14 |
+ gnap_remaster ) GNAPPRODUCT="Remaster";; |
15 |
+ * ) GNAPPRODUCT="Something";; |
16 |
esac |
17 |
|
18 |
GNAPLIBDIR='/usr/lib/gnap' |
19 |
@@ -12,6 +13,8 @@ |
20 |
SPECS="${GNAPLIBDIR}/gnap-specs.tar.bz2" |
21 |
GNAPCORE="${GNAPLIBDIR}/gnap-core.tar" |
22 |
GNAPMBR="${GNAPLIBDIR}/mbr/mbr.bin" |
23 |
+GNAPEXTDIR="${GNAPLIBDIR}/extensions" |
24 |
+GNAPBASEFS="${GNAPLIBDIR}/gnap-basefs.tar.bz2" |
25 |
|
26 |
LOOP='' |
27 |
|
28 |
Index: tools/gnap_remaster |
29 |
=================================================================== |
30 |
--- tools/gnap_remaster (revision 52) |
31 |
+++ tools/gnap_remaster (working copy) |
32 |
@@ -1,72 +1,11 @@ |
33 |
#!/bin/bash |
34 |
VERSION='2.0' |
35 |
|
36 |
-GNAPNAME=$(basename "$0") |
37 |
+source "gnap_shared.sh" |
38 |
echo "GNAP remastering tool ${GNAPNAME} ${VERSION}" |
39 |
-GNAPLIBDIR='/usr/lib/gnap' |
40 |
-GNAPEXTDIR="${GNAPLIBDIR}/extensions" |
41 |
-TEMPDIR='' |
42 |
-GNAPCORE="${GNAPLIBDIR}/gnap-core.tar" |
43 |
-GNAPBASEFS="${GNAPLIBDIR}/gnap-basefs.tar.bz2" |
44 |
+ |
45 |
OUTPUT='mygnap-core.tar' |
46 |
|
47 |
-G=$'\e[32;01m' |
48 |
-B=$'\e[31;01m' |
49 |
-N=$'\e[0m' |
50 |
-W=$'\e[33;01m' |
51 |
-K=$'\e[34;01m' |
52 |
-C="$[$(set -- $(stty size 2>/dev/null); echo ${2}) - 7]" |
53 |
-E=$'\e['${C}'G' |
54 |
- |
55 |
-gwarn() { |
56 |
- echo -e " ${W}*${N} ${*}" |
57 |
-} |
58 |
- |
59 |
-gconfirm() { |
60 |
- if [[ "${FORCEYES}" -eq 1 ]]; then |
61 |
- gwarn "${*} forced to yes" |
62 |
- else |
63 |
- read -ep " ${W}*${N} ${*} [N]: " answer |
64 |
- if [[ "${answer}" != 'y' && "${answer}" != 'Y' ]]; then |
65 |
- if [[ -n "${TEMPDIR}" ]]; then |
66 |
- cleanup |
67 |
- fi |
68 |
- echo 'Remaster aborted !' |
69 |
- exit 2 |
70 |
- fi |
71 |
- fi |
72 |
-} |
73 |
- |
74 |
-gbegin() { |
75 |
- echo -ne " ${G}*${N} ${*}..." |
76 |
-} |
77 |
- |
78 |
-gtest() { |
79 |
- continued=0 |
80 |
- if [[ "$#" -gt 0 && "${1}" == 'continued' ]]; then |
81 |
- shift |
82 |
- continued=1 |
83 |
- fi |
84 |
- |
85 |
- if [[ "${#}" -eq 0 || "${1}" -eq 0 ]]; then |
86 |
- if [[ "${continued}" -eq 0 ]]; then |
87 |
- echo -e "${E} ${K}[ ${G}ok${K} ]${N}" |
88 |
- fi |
89 |
- else |
90 |
- echo -e "${E} ${K}[ ${B}!!${K} ]${N}" |
91 |
- if [[ "$#" -ge 2 ]]; then |
92 |
- shift |
93 |
- echo -en " ${B}*${N} ${*}" |
94 |
- echo -e "${E} ${K}[ ${B}!!${K} ]${N}" |
95 |
- fi |
96 |
- if [[ -n "${TEMPDIR}" ]]; then |
97 |
- cleanup |
98 |
- fi |
99 |
- echo "Remaster failed, try ${GNAPNAME} -h for more help" |
100 |
- exit 1 |
101 |
- fi |
102 |
-} |
103 |
- |
104 |
usage() { |
105 |
echo |
106 |
echo 'Usage:' |
107 |
@@ -85,18 +24,6 @@ |
108 |
echo "Please man ${GNAPNAME} for more details." |
109 |
} |
110 |
|
111 |
-cleanup() { |
112 |
- gbegin 'Cleaning temporary directories' |
113 |
- if [[ -d "${TEMPDIR}" ]]; then |
114 |
- DIRTOREMOVE="${TEMPDIR}" |
115 |
- TEMPDIR='' |
116 |
- rm -rf "${DIRTOREMOVE}" |
117 |
- gtest $? "Failed to remove ${DIRTOREMOVE}" |
118 |
- else |
119 |
- gtest 0 |
120 |
- fi |
121 |
-} |
122 |
- |
123 |
if [[ "$#" -eq 0 || "${1}" == '-h' ]]; then |
124 |
usage |
125 |
exit 0 |
126 |
Index: src/gnap_shared.sh |
127 |
=================================================================== |
128 |
--- src/gnap_shared.sh (revision 54) |
129 |
+++ src/gnap_shared.sh (working copy) |
130 |
@@ -1,9 +1,10 @@ |
131 |
GNAPNAME=$(basename "$0") |
132 |
|
133 |
case ${GNAPNAME} in |
134 |
- gnap_make ) GNAPPRODUCT="Build";; |
135 |
- gnap_overlay ) GNAPPRODUCT="Overlay";; |
136 |
- * ) GNAPPRODUCT="Something";; |
137 |
+ gnap_make ) GNAPPRODUCT="Build";; |
138 |
+ gnap_overlay ) GNAPPRODUCT="Overlay";; |
139 |
+ gnap_remaster ) GNAPPRODUCT="Remaster";; |
140 |
+ * ) GNAPPRODUCT="Something";; |
141 |
esac |
142 |
|
143 |
GNAPLIBDIR='/usr/lib/gnap' |
144 |
@@ -12,6 +13,8 @@ |
145 |
SPECS="${GNAPLIBDIR}/gnap-specs.tar.bz2" |
146 |
GNAPCORE="${GNAPLIBDIR}/gnap-core.tar" |
147 |
GNAPMBR="${GNAPLIBDIR}/mbr/mbr.bin" |
148 |
+GNAPEXTDIR="${GNAPLIBDIR}/extensions" |
149 |
+GNAPBASEFS="${GNAPLIBDIR}/gnap-basefs.tar.bz2" |
150 |
|
151 |
LOOP='' |
152 |
|
153 |
|
154 |
-- |
155 |
gnap-dev@g.o mailing list |