Browse code

last minute change, last minute bug...

Nat! authored on 06-10-2015 22:19:12
Showing 2 changed files
... ...
@@ -1164,6 +1164,7 @@ build_clones()
1164 1164
    local built
1165 1165
    local xdone
1166 1166
    local name
1167
+   local clonedir
1167 1168
 
1168 1169
    for clone in ${CLONES_SUBDIR}/*.failed
1169 1170
    do
... ...
@@ -1181,15 +1182,16 @@ build_clones()
1181 1182
    then
1182 1183
       built=`read_build_root_setting "build_ignore"`
1183 1184
 
1184
-      for name in `read_build_root_setting "build_order"`
1185
+      for clone in `read_build_root_setting "build_order"`
1185 1186
       do
1186
-         clone="${CLONES_SUBDIR}/${name}"
1187
+         name="`canonical_clone_name "${clone}"`"
1188
+         clonedir="${CLONES_SUBDIR}/${name}"
1187 1189
 
1188
-         if [ -d "${clone}" ]
1190
+         if [ -d "${clonedir}" ]
1189 1191
          then
1190
-            built="`build_if_readable "${clone}" "${name}" "${built}"`" || exit 1
1192
+            built="`build_if_readable "${clonedir}" "${name}" "${built}"`" || exit 1
1191 1193
          else
1192
-            fail "build_order contains unknown repo ${name}"
1194
+            fail "build_order contains unknown repo \"${clone}\" (\"${clonedir}\")"
1193 1195
          fi
1194 1196
       done
1195 1197
 
... ...
@@ -1201,21 +1203,23 @@ build_clones()
1201 1203
       then
1202 1204
          for clone in ${clones}
1203 1205
          do
1204
-            name=`basename "${clone}"`
1205
-            clone="${CLONES_SUBDIR}/${name}"
1206
+            name="`canonical_clone_name "${clone}"`"
1207
+            clonedir="${CLONES_SUBDIR}/${name}"
1206 1208
 
1207
-            if [ -d "${clone}" ]
1209
+            if [ -d "${clonedir}" ]
1208 1210
             then
1209
-               built="`build_if_readable "${clone}" "${name}" "${built}"`" || exit 1
1211
+               built="`build_if_readable "${clonedir}" "${name}" "${built}"`" || exit 1
1212
+            else
1213
+               fail "repo for \"${clone}\" not found (\"${clonedir}\")"
1210 1214
             fi
1211 1215
          done
1212 1216
       fi
1213 1217
    else
1214 1218
       for name in "$@"
1215 1219
       do
1216
-         clone="${CLONES_SUBDIR}/${name}"
1220
+         clonedir="${CLONES_SUBDIR}/${name}"
1217 1221
 
1218
-         if [ -d "${clone}" ]
1222
+         if [ -d "${clonedir}" ]
1219 1223
          then
1220 1224
             built="`build_if_readable "${clone}" "${name}" "${built}"`" || exit 1
1221 1225
          else
... ...
@@ -452,6 +452,16 @@ find_xcodeproj()
452 452
 }
453 453
 
454 454
 
455
+canonical_clone_name()
456
+{
457
+   local url
458
+
459
+   url="${1}"
460
+
461
+   basename "${url}" .git
462
+}
463
+
464
+
455 465
 # http://askubuntu.com/questions/152001/how-can-i-get-octal-file-permissions-from-command-line
456 466
 lso()
457 467
 {