summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2012-11-17 21:58:55 +0000
committererdgeist <erdgeist@erdgeist.org>2012-11-17 21:58:55 +0000
commit01c79bd59d87f8ce6f9a3dacb1f6b02c85780e9b (patch)
tree1994975e81f33a5d20bf2ebb4a884faefe05314b
parent2368ae43a7ee650d3f643629afbd5686f7a3e9eb (diff)
Fixed a bug where ezjail-admin install would indicate a failure after successfully installing the base
-rwxr-xr-xezjail-admin2
1 files changed, 2 insertions, 0 deletions
diff --git a/ezjail-admin b/ezjail-admin
index fc5bc74..9586cc9 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -1067,6 +1067,7 @@ install)
1067 fetch "${ezjail_proto}://${ezjail_disturi}/${ezjail_path}/${ezjail_installplatform}/${ezjail_installarch}/${ezjail_release}/${pkg}.txz" || continue 1067 fetch "${ezjail_proto}://${ezjail_disturi}/${ezjail_path}/${ezjail_installplatform}/${ezjail_installarch}/${ezjail_release}/${pkg}.txz" || continue
1068 xzdec ${pkg}.txz | tar --unlink -xpJf - -C ${DESTDIR} 1068 xzdec ${pkg}.txz | tar --unlink -xpJf - -C ${DESTDIR}
1069 else 1069 else
1070 [ "${ezjail_proto}" = "ftp" ] || echo "Warning: Ignoring http protocol on FreeBSD pre 9.0"
1070 ftp ${ezjail_disturi}:${ezjail_path}/${ezjail_installarch}/${ezjail_release}/${pkg}/* || continue 1071 ftp ${ezjail_disturi}:${ezjail_path}/${ezjail_installarch}/${ezjail_release}/${pkg}/* || continue
1071 # These actions are really ugly: sources want $1 to contain the set 1072 # These actions are really ugly: sources want $1 to contain the set
1072 # of sources to install, base asks the user if he is sure, hence the 1073 # of sources to install, base asks the user if he is sure, hence the
@@ -1078,6 +1079,7 @@ install)
1078 fi 1079 fi
1079 1080
1080 rm -rf "${ezjail_jailtemp}" 1081 rm -rf "${ezjail_jailtemp}"
1082 break
1081 done 1083 done
1082 fi 1084 fi
1083 done 1085 done