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