1 |
Index: tools/gnap_shared.sh |
2 |
=================================================================== |
3 |
--- tools/gnap_shared.sh (revision 55) |
4 |
+++ tools/gnap_shared.sh (working copy) |
5 |
@@ -16,6 +16,7 @@ |
6 |
GNAPEXTDIR="${GNAPLIBDIR}/extensions" |
7 |
GNAPBASEFS="${GNAPLIBDIR}/gnap-basefs.tar.bz2" |
8 |
|
9 |
+TEMPDIR='' |
10 |
LOOP='' |
11 |
|
12 |
G=$'\e[32;01m' |
13 |
@@ -90,3 +91,15 @@ |
14 |
gtest 0 |
15 |
fi |
16 |
} |
17 |
+ |
18 |
+make_tempdir() { |
19 |
+ if [[ "${TEMPDIR}" = "" ]]; then |
20 |
+ TEMPDIR=$(mktemp -d -t gnap_make.XXXXXX) |
21 |
+ gtest continued $? 'Failed to create temporary directory' |
22 |
+ elif [[ -d "${TEMPDIR}" ]] |
23 |
+ gconfirm "${TEMPDIR} already exists. Continue?" |
24 |
+ else |
25 |
+ mkdir -p "${TEMPDIR}" |
26 |
+ gtest continued $? "Failed to create ${TEMPDIR}" |
27 |
+ fi |
28 |
+} |
29 |
Index: tools/gnap_overlay |
30 |
=================================================================== |
31 |
--- tools/gnap_overlay (revision 60) |
32 |
+++ tools/gnap_overlay (working copy) |
33 |
@@ -47,7 +47,6 @@ |
34 |
gbegin 'Checking parameters' |
35 |
|
36 |
# Read options |
37 |
-TEMPDIR='' |
38 |
while getopts ':hg:o:c:nfi:d:l:r:ms:S:L:T:' options; do |
39 |
case ${options} in |
40 |
h ) usage |
41 |
@@ -120,15 +119,7 @@ |
42 |
fi |
43 |
|
44 |
# Setting up temporary directory |
45 |
-if [[ "${TEMPDIR}" = "" ]]; then |
46 |
- TEMPDIR=$(mktemp -d -t gnap_overlay.XXXXXX) |
47 |
- gtest continued $? 'Failed to create temporary directory' |
48 |
-elif [[ -d "${TEMPDIR}" ]] |
49 |
- gconfirm "${TEMPDIR} already exists. Continue?" |
50 |
-else |
51 |
- mkdir -p "${TEMPDIR}" |
52 |
- gtest continued $? "Failed to create ${TEMPDIR}" |
53 |
-fi |
54 |
+make_tempdir |
55 |
|
56 |
# Common actions |
57 |
gbegin "Expanding ${GNAPCORE} core" |
58 |
Index: tools/gnap_remaster |
59 |
=================================================================== |
60 |
--- tools/gnap_remaster (revision 61) |
61 |
+++ tools/gnap_remaster (working copy) |
62 |
@@ -33,7 +33,6 @@ |
63 |
gbegin 'Checking parameters' |
64 |
|
65 |
# Read options |
66 |
-TEMPDIR='' |
67 |
while getopts ':he:k:m:o:g:b:d:fT:' options; do |
68 |
case ${options} in |
69 |
h ) usage |
70 |
@@ -73,15 +72,7 @@ |
71 |
fi |
72 |
|
73 |
# Setting up temporary directory |
74 |
-if [[ "${TEMPDIR}" = "" ]]; then |
75 |
- TEMPDIR=$(mktemp -d -t gnap_remaster.XXXXXX) |
76 |
- gtest continued $? 'Failed to create temporary directory' |
77 |
-elif [[ -d "${TEMPDIR}" ]] |
78 |
- gconfirm "${TEMPDIR} already exists. Continue?" |
79 |
-else |
80 |
- mkdir -p "${TEMPDIR}" |
81 |
- gtest continued $? "Failed to create ${TEMPDIR}" |
82 |
-fi |
83 |
+make_tempdir |
84 |
|
85 |
# Preparing new FS |
86 |
gbegin "Unpacking ${GNAPBASEFS} basefs" |
87 |
Index: src/gnap_make |
88 |
=================================================================== |
89 |
--- src/gnap_make (revision 58) |
90 |
+++ src/gnap_make (working copy) |
91 |
@@ -30,7 +30,6 @@ |
92 |
# Read options |
93 |
NOTARGET=1 |
94 |
STAMP=$(date +%Y%m%d) |
95 |
-TEMPDIR='' |
96 |
while getopts ':hs:p:m:o:v:t:fl:c:e:T:' options; do |
97 |
case ${options} in |
98 |
h ) usage |
99 |
@@ -71,15 +70,7 @@ |
100 |
gtest continued $? "You need to be root to run ${GNAPNAME}" |
101 |
|
102 |
# Setting up temporary directory |
103 |
-if [[ "${TEMPDIR}" = "" ]]; then |
104 |
- TEMPDIR=$(mktemp -d -t gnap_make.XXXXXX) |
105 |
- gtest continued $? 'Failed to create temporary directory' |
106 |
-elif [[ -d "${TEMPDIR}" ]] |
107 |
- gconfirm "${TEMPDIR} already exists. Continue?" |
108 |
-else |
109 |
- mkdir -p "${TEMPDIR}" |
110 |
- gtest continued $? "Failed to create ${TEMPDIR}" |
111 |
-fi |
112 |
+make_tempdir |
113 |
|
114 |
# Prepare specs dir and check common.conf file |
115 |
SPECDIR="${TEMPDIR}/specs" |
116 |
Index: src/gnap_shared.sh |
117 |
=================================================================== |
118 |
--- src/gnap_shared.sh (revision 55) |
119 |
+++ src/gnap_shared.sh (working copy) |
120 |
@@ -16,6 +16,7 @@ |
121 |
GNAPEXTDIR="${GNAPLIBDIR}/extensions" |
122 |
GNAPBASEFS="${GNAPLIBDIR}/gnap-basefs.tar.bz2" |
123 |
|
124 |
+TEMPDIR='' |
125 |
LOOP='' |
126 |
|
127 |
G=$'\e[32;01m' |
128 |
@@ -90,3 +91,15 @@ |
129 |
gtest 0 |
130 |
fi |
131 |
} |
132 |
+ |
133 |
+make_tempdir() { |
134 |
+ if [[ "${TEMPDIR}" = "" ]]; then |
135 |
+ TEMPDIR=$(mktemp -d -t gnap_make.XXXXXX) |
136 |
+ gtest continued $? 'Failed to create temporary directory' |
137 |
+ elif [[ -d "${TEMPDIR}" ]] |
138 |
+ gconfirm "${TEMPDIR} already exists. Continue?" |
139 |
+ else |
140 |
+ mkdir -p "${TEMPDIR}" |
141 |
+ gtest continued $? "Failed to create ${TEMPDIR}" |
142 |
+ fi |
143 |
+} |
144 |
|
145 |
-- |
146 |
gnap-dev@g.o mailing list |