check_depends is now called on every run of qq2clone
This commit is contained in:
parent
d73f28ee4b
commit
b6ad8a6351
212
qq2clone
212
qq2clone
|
|
@ -258,8 +258,7 @@ return 0
|
||||||
}
|
}
|
||||||
#=========================================================================#
|
#=========================================================================#
|
||||||
check_depends ()
|
check_depends ()
|
||||||
# DESCRIPTION: Check that required software is present during initial auto-
|
# DESCRIPTION: Check that required software is present
|
||||||
# configuration
|
|
||||||
# INPUT: None
|
# INPUT: None
|
||||||
# OUTPUT: Return 0 on success or exits with descriptive message on failure
|
# OUTPUT: Return 0 on success or exits with descriptive message on failure
|
||||||
# PARAMETERS: None
|
# PARAMETERS: None
|
||||||
|
|
@ -271,12 +270,13 @@ local elem missing=0
|
||||||
local -a depends=( virsh virt-clone virt-xml virt-xml-validate qemu-img \
|
local -a depends=( virsh virt-clone virt-xml virt-xml-validate qemu-img \
|
||||||
xmllint sqlite3)
|
xmllint sqlite3)
|
||||||
|
|
||||||
# These are from gnu-coreutils, util-linux, or are simply extremely common
|
# These are virtually certain to be present. But if one is actually missing
|
||||||
# and almost certainly present. However, checking for any external
|
# or something weird is going on that prevents the script from seeing it,
|
||||||
#command invoked is harmless and may even help 1/10000 times
|
# we'll catch it here and avoid executing code that won't work
|
||||||
depends=( "${depends[@]}" basename chmod date dirname file grep less ls \
|
|
||||||
md5sum mkfifo mkdir mktemp mv rm sed sort touch uniq uuidgen uuidparse \
|
depends=( "${depends[@]}" base64 basename chmod date dirname file grep
|
||||||
vi dirname )
|
less ls md5sum mkfifo mkdir mktemp mv rm sed sort tar touch uniq uuidgen
|
||||||
|
uuidparse vi )
|
||||||
|
|
||||||
(( BASH_VERSINFO[0] >= 4 )) ||
|
(( BASH_VERSINFO[0] >= 4 )) ||
|
||||||
{ echo "This script must be run with Bash version 4.0+"
|
{ echo "This script must be run with Bash version 4.0+"
|
||||||
|
|
@ -373,6 +373,7 @@ first_run_setup ()
|
||||||
# PARAMETERS: None
|
# PARAMETERS: None
|
||||||
#=========================================================================#
|
#=========================================================================#
|
||||||
{
|
{
|
||||||
|
|
||||||
make_dir "${HOME}/.config"
|
make_dir "${HOME}/.config"
|
||||||
echo "$QQ2_DIR" > "${HOME}/.config/qq2clone" ||
|
echo "$QQ2_DIR" > "${HOME}/.config/qq2clone" ||
|
||||||
{
|
{
|
||||||
|
|
@ -384,8 +385,6 @@ echo "$QQ2_DIR" > "${HOME}/.config/qq2clone" ||
|
||||||
local TEMPLATE_DIR="${QQ2_DIR}/templates"
|
local TEMPLATE_DIR="${QQ2_DIR}/templates"
|
||||||
local POOL_DIR="${QQ2_DIR}/qq2clone-pool"
|
local POOL_DIR="${QQ2_DIR}/qq2clone-pool"
|
||||||
|
|
||||||
check_depends
|
|
||||||
|
|
||||||
make_dir "$QQ2_DIR"
|
make_dir "$QQ2_DIR"
|
||||||
make_dir "$TEMPLATE_DIR"
|
make_dir "$TEMPLATE_DIR"
|
||||||
make_dir "$POOL_DIR"
|
make_dir "$POOL_DIR"
|
||||||
|
|
@ -3158,101 +3157,101 @@ return 0
|
||||||
# ENTRY POINT, at the bottom of this file
|
# ENTRY POINT, at the bottom of this file
|
||||||
|
|
||||||
archive='
|
archive='
|
||||||
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
|
||||||
lZe3ZPuDkj1f3+J0yxfk/7xkz9/fOXWLhzWzlOcFyZ6/z3M6X9KX4/cy0s8f2oBjdIFB+Xl6TbI3
|
xam8vCXb75fs+foWpxu/IP/nJXv+/s6pVzysmaM8L0j2/H2e09mSvhy/l5Fx/tAHHKNzTMrP02uS
|
||||||
+nsYRvm/LdnzdTpOH5PGj9x/P0T0GZ4vl2rnlSuy61sl+imi51i1P2PC7Eu+pP0MorHXvkfwv3fC
|
vdnfwzDL/23Jnq/TcfqYNH7k/vshos/wfLlUP69clVvfLtFPET3Hqv8ZE2Zf9iXtzyMae/17BP97
|
||||||
7JEwf4h2PI4/QbT+8veMMraAk/yC/PNMenvtvdWpz0e256mIfcDQ6s/sS5h9uaQv+ytl+cvr6dz+
|
J8weCfOHaMfj+BNE6y9/z6hgCzipL8i/wGK0199b3cZ8ZHueStgHDL3+zL6M2VdK+rK/cpa/vJ7O
|
||||||
OgnP9l1KamKSapm9nc0jeBnGgTLnjwKh7GLqYBPnTdJmHnn+LTWw/yFrh6WSgWw/l+bSXJpLc+l/
|
7a+T8FzfpaQmJqmO2TvZPIKXYVwoe/4oEsoupk42cd4kbeaR599yE/sfsnZYKBnI9jNpJs2kmTST
|
||||||
J/030Ir0wABQAAA=
|
/nfSfwOi0d5fAFAAAA==
|
||||||
'
|
'
|
||||||
|
|
||||||
#-----------------#
|
#-----------------#
|
||||||
|
|
@ -3262,6 +3261,8 @@ J/030Ir0wABQAAA=
|
||||||
#-----------------#
|
#-----------------#
|
||||||
|
|
||||||
if ! ((QQ2_NOEXECUTE)); then
|
if ! ((QQ2_NOEXECUTE)); then
|
||||||
|
check_depends
|
||||||
|
[[ "$1" == "setup" ]] && { first_run_setup; exit $?; }
|
||||||
|
|
||||||
#Ensure needed fds are not in use
|
#Ensure needed fds are not in use
|
||||||
exec 3>&- 3<&- 4>&- 4<&-;
|
exec 3>&- 3<&- 4>&- 4<&-;
|
||||||
|
|
@ -3275,7 +3276,6 @@ if ! ((QQ2_NOEXECUTE)); then
|
||||||
else
|
else
|
||||||
QQ2_DIR="${HOME}/storage-qq2clone"
|
QQ2_DIR="${HOME}/storage-qq2clone"
|
||||||
fi
|
fi
|
||||||
[[ "$1" == "setup" ]] && { first_run_setup; exit $?; }
|
|
||||||
get_config
|
get_config
|
||||||
exec_com "$@"
|
exec_com "$@"
|
||||||
exit 0
|
exit 0
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -258,8 +258,7 @@ return 0
|
||||||
}
|
}
|
||||||
#=========================================================================#
|
#=========================================================================#
|
||||||
check_depends ()
|
check_depends ()
|
||||||
# DESCRIPTION: Check that required software is present during initial auto-
|
# DESCRIPTION: Check that required software is present
|
||||||
# configuration
|
|
||||||
# INPUT: None
|
# INPUT: None
|
||||||
# OUTPUT: Return 0 on success or exits with descriptive message on failure
|
# OUTPUT: Return 0 on success or exits with descriptive message on failure
|
||||||
# PARAMETERS: None
|
# PARAMETERS: None
|
||||||
|
|
@ -271,12 +270,13 @@ local elem missing=0
|
||||||
local -a depends=( virsh virt-clone virt-xml virt-xml-validate qemu-img \
|
local -a depends=( virsh virt-clone virt-xml virt-xml-validate qemu-img \
|
||||||
xmllint sqlite3)
|
xmllint sqlite3)
|
||||||
|
|
||||||
# These are from gnu-coreutils, util-linux, or are simply extremely common
|
# These are virtually certain to be present. But if one is actually missing
|
||||||
# and almost certainly present. However, checking for any external
|
# or something weird is going on that prevents the script from seeing it,
|
||||||
#command invoked is harmless and may even help 1/10000 times
|
# we'll catch it here and avoid executing code that won't work
|
||||||
depends=( "${depends[@]}" basename chmod date dirname file grep less ls \
|
|
||||||
md5sum mkfifo mkdir mktemp mv rm sed sort touch uniq uuidgen uuidparse \
|
depends=( "${depends[@]}" base64 basename chmod date dirname file grep
|
||||||
vi dirname )
|
less ls md5sum mkfifo mkdir mktemp mv rm sed sort tar touch uniq uuidgen
|
||||||
|
uuidparse vi )
|
||||||
|
|
||||||
(( BASH_VERSINFO[0] >= 4 )) ||
|
(( BASH_VERSINFO[0] >= 4 )) ||
|
||||||
{ echo "This script must be run with Bash version 4.0+"
|
{ echo "This script must be run with Bash version 4.0+"
|
||||||
|
|
@ -373,6 +373,7 @@ first_run_setup ()
|
||||||
# PARAMETERS: None
|
# PARAMETERS: None
|
||||||
#=========================================================================#
|
#=========================================================================#
|
||||||
{
|
{
|
||||||
|
|
||||||
make_dir "${HOME}/.config"
|
make_dir "${HOME}/.config"
|
||||||
echo "$QQ2_DIR" > "${HOME}/.config/qq2clone" ||
|
echo "$QQ2_DIR" > "${HOME}/.config/qq2clone" ||
|
||||||
{
|
{
|
||||||
|
|
@ -384,8 +385,6 @@ echo "$QQ2_DIR" > "${HOME}/.config/qq2clone" ||
|
||||||
local TEMPLATE_DIR="${QQ2_DIR}/templates"
|
local TEMPLATE_DIR="${QQ2_DIR}/templates"
|
||||||
local POOL_DIR="${QQ2_DIR}/qq2clone-pool"
|
local POOL_DIR="${QQ2_DIR}/qq2clone-pool"
|
||||||
|
|
||||||
check_depends
|
|
||||||
|
|
||||||
make_dir "$QQ2_DIR"
|
make_dir "$QQ2_DIR"
|
||||||
make_dir "$TEMPLATE_DIR"
|
make_dir "$TEMPLATE_DIR"
|
||||||
make_dir "$POOL_DIR"
|
make_dir "$POOL_DIR"
|
||||||
|
|
@ -3166,6 +3165,8 @@ return 0
|
||||||
#-----------------#
|
#-----------------#
|
||||||
|
|
||||||
if ! ((QQ2_NOEXECUTE)); then
|
if ! ((QQ2_NOEXECUTE)); then
|
||||||
|
check_depends
|
||||||
|
[[ "$1" == "setup" ]] && { first_run_setup; exit $?; }
|
||||||
|
|
||||||
#Ensure needed fds are not in use
|
#Ensure needed fds are not in use
|
||||||
exec 3>&- 3<&- 4>&- 4<&-;
|
exec 3>&- 3<&- 4>&- 4<&-;
|
||||||
|
|
@ -3179,7 +3180,6 @@ if ! ((QQ2_NOEXECUTE)); then
|
||||||
else
|
else
|
||||||
QQ2_DIR="${HOME}/storage-qq2clone"
|
QQ2_DIR="${HOME}/storage-qq2clone"
|
||||||
fi
|
fi
|
||||||
[[ "$1" == "setup" ]] && { first_run_setup; exit $?; }
|
|
||||||
get_config
|
get_config
|
||||||
exec_com "$@"
|
exec_com "$@"
|
||||||
exit 0
|
exit 0
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue