fixed check_depends bug, fixed bug in the order of commands in the Entry Point section of qq2clone, improved setup user feedback
This commit is contained in:
parent
b6ad8a6351
commit
d290211d7e
|
|
@ -132,5 +132,11 @@ if ((qq_moved)); then
|
||||||
else
|
else
|
||||||
"${location}/qq2clone" setup
|
"${location}/qq2clone" setup
|
||||||
fi
|
fi
|
||||||
|
setup_code=$?
|
||||||
|
|
||||||
echo "Setup complete"
|
if ((setup_code != 0)); then
|
||||||
|
echo "Setup failed. Resolve problem(s) described, then manually run"
|
||||||
|
echo "the setup again using: qq2clone setup"
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit $setup_code
|
||||||
|
|
|
||||||
201
qq2clone
201
qq2clone
|
|
@ -283,7 +283,7 @@ uuidparse vi )
|
||||||
exit "$E_depends"; } >&2
|
exit "$E_depends"; } >&2
|
||||||
|
|
||||||
for elem in "${depends[@]}"; do
|
for elem in "${depends[@]}"; do
|
||||||
if ! { command -v "$elem"; } &>/dev/null; then
|
if ! (unset "$elem"; command -v "$elem") &>/dev/null; then
|
||||||
((missing++))
|
((missing++))
|
||||||
echo "Missing required software: $elem" >&2
|
echo "Missing required software: $elem" >&2
|
||||||
fi
|
fi
|
||||||
|
|
@ -409,16 +409,15 @@ if [[ -e "${QQ2_DIR}/qq2clone.db" ]]; then
|
||||||
check_rw "${QQ2_DIR}/qq2clone.db"
|
check_rw "${QQ2_DIR}/qq2clone.db"
|
||||||
rm -f "${QQ2_DIR}/qq2clone.db" || unexpected_error first_run_setup
|
rm -f "${QQ2_DIR}/qq2clone.db" || unexpected_error first_run_setup
|
||||||
else
|
else
|
||||||
|
echo "Setup complete"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sqlite3 <<EOF
|
sqlite3 <<EOF
|
||||||
create table CLONES(uuid TEXT, id INTEGER, template TEXT, disks TEXT);
|
create table CLONES(uuid TEXT, id INTEGER, template TEXT, disks TEXT);
|
||||||
|
|
||||||
create table TEMPLATES(name TEXT, md5sum TEXT, disks TEXT,\
|
create table TEMPLATES(name TEXT, md5sum TEXT, disks TEXT,\
|
||||||
valid INTEGER);
|
valid INTEGER);
|
||||||
|
|
||||||
create table CONFIG(name TEXT, value TEXT);
|
create table CONFIG(name TEXT, value TEXT);
|
||||||
insert into CONFIG values('TEMPLATE_DIR', '${TEMPLATE_DIR}');
|
insert into CONFIG values('TEMPLATE_DIR', '${TEMPLATE_DIR}');
|
||||||
insert into CONFIG values('USE_SPICE', '${use_spice}');
|
insert into CONFIG values('USE_SPICE', '${use_spice}');
|
||||||
|
|
@ -430,6 +429,8 @@ sqlite3 <<EOF
|
||||||
insert into CONFIG values('NORUN', '0');
|
insert into CONFIG values('NORUN', '0');
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
echo "Setup complete"
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
#=========================================================================#
|
#=========================================================================#
|
||||||
|
|
@ -3157,101 +3158,101 @@ return 0
|
||||||
# ENTRY POINT, at the bottom of this file
|
# ENTRY POINT, at the bottom of this file
|
||||||
|
|
||||||
archive='
|
archive='
|
||||||
H4sIAAAAAAAAA+1cC3Bc1Xk+u6vHSpZXkh8gG4MXsKnA1nplyy9AQStp5VXRw9gWOAFzda1dSRvv
|
H4sIAAAAAAAAA+1cC3Bb1Zk+kvyQHUe28wAnBCIgYQ2JFTmx8wBcLNty5MWPkMSQFoKsWLKtRg8j
|
||||||
Q+zeNTLFQSBMs5HVmoYkzDSZQIcGmqTFMCFjmjbIGLCZGsYmlLgDGYSB6SqiIIhly1j29j+vu+ee
|
3RscFheDCVvV8W7Y0paZbaewwxa27S6BKZ2w3S0OARJmA5NQlmYHOpgAs3LNgqFx4hDb2v+8rs49
|
||||||
3WtIppk2HR2P97//9z/OOf953HvPPUehnYraF1T8UfTHS25Ia9euxrR67Wq3SCHV1Kx0u1F1jXtt
|
0g20s53d7vhkov/+3/845/znce899xyH9nh9vUGvP4r+eMkJacOGakwrN1Q7RQqpqmqt04kqq5wb
|
||||||
TXXNmjVrVyJ3dfXaNdXI6f4jlklPibimxpxO9PVAPB64iN4Xyf9E033eliarxaLzNvQVhLnROZSv
|
qiqr1zorAa+s3FDlRHbnH7FMWlLjii9mt6OvB+LxwEX0vkj+J5ruczc3mk0mjbegryDMjS6gfC3D
|
||||||
Y/hIXcamDq1Ds+F3MboCFQCfJ+jJ9ITVSO16PtSuwkZ5mS5CRmoRaN5F6uMrMVJUlrHLF3iZrnYY
|
R2rTNrVoI5oPv8vRFSgP+BxBT6anzHpq1fKhdmUWyst0GdJTk0BzLlIfT5GeopK0Xa7Ay7Tapqei
|
||||||
qWhH8nMyXKKdeUYq2uHY2Ksob6+VKKun22a0szK7CmZXUWukyGqkPJ557P865k+mcvFlu61MT6aN
|
HcnPznCJduToqWiHY2OtoLy1RqKsnk6L3s7M7MqYXVmNniKznvJ45rD/G5k/mcrFl+12MD2ZNiA9
|
||||||
yEh5NTd/qPn/kPw2Mrt5V1Jepj9FRsrzuwXsCtCXT7x5N7H8zNphymqkvJ+tCAW3r6lZEfJXhYKR
|
5dXc9qHi/0Py28LsFl1JeZn+FOkpz+8WsMtDXz7x5t3K8jNqhymznvJ+tiYU3LW+ak3IXxEKRtS+
|
||||||
RH9V/7o1VWtqXPGoa6VeLpwH7lMb2jpwc4xgjDcnqSPjsfzO6+s7Wh95I9rWes19f7cv/b42798a
|
ir6N6yvWVzniUcdarVw4D9ynNre24+YYwRhvTlJHxmP5ndfXtbc88ka0teWa+/7uQOp9ZdG/NXAf
|
||||||
uQ8L00FMnzcx5xeiTH9C6HE0YCkjGB8blZfvXXQ88Hq4p0MtQybpn+D/nBy415Ib7zHR/5qJfo0J
|
JqaDmD5vYs4vRen+hNDjaMBUQjA+Nsov37/sZOD1cHe7rwQZpH+C/wuy4G5TdrzbQP9rBvpVBvg2
|
||||||
vtnEz29M8H4TfD3K9CUx3WOS7/dM/Gw20f9LE32HSb4/NvEzYuLnOhM/eSZ+rjPBHzbBoyZ4rwn+
|
Az+/McD7DPBNKN2XxHSPQb7fM/CzzUD/Lw30bQb5/tjAz4iBn+sM/OQY+LnOAH/YAI8a4D0G+KMG
|
||||||
qAm+wgQfR7lxFfTLoTeW1VGej/MHAL8qh34r03dK+gjG285gTMMjzI2U5i2tij8QC/QE41ogtqW1
|
+BoDfBxlx32gXwq9saSW8nycPwD4VVn0W5i+XdJHMN72BGMKHmFO5G3a3uL1B2KB7mBcCcS2t9SH
|
||||||
IRSNBLao20MBpCg94WhEwbdtTVGoak5FcNcYDavByIaAtrW1pTEQ7zJgbWqYKDVEI5FAl9beF4gI
|
opHAdt+uUAB5vd3haMSLb9uK10tVsyqCu4Zo2BeMbA4oO1qaGwLxTh3W6gsTpfpoJBLoVNp6AxGB
|
||||||
LDiKG310dDQ3btZiwUiPAd6sqZqg6FPjrWpE7Qn4N6s7A81huMoIm2IBMcsWKLQnFKKyeEatJRrd
|
BUdxvY/29qaGbUosGOnWwdsUnyIoenzxFl/E1x3wb/PtCTSF4SotbIwFxCybodCuUIjK4mm15mh0
|
||||||
keir3yXkCOHpwrFZgwL9QQ31JbQ4RAKC0LVD6erdoXSrwRCKBdRQKNqF4po/GEF9YKh1AxPTojsw
|
t9pbt1fIEcLTiWOzHgX6ggrqVZU4RAKC0Lnb29mz29vlC4ZQLOALhaKdKK74gxHUC4ZKFzAxJbob
|
||||||
Fk1oKMw0AhrMa4HtiW7UQy/BW1e/qnQHI2ooeE8Am3WF+wDFObNo47KhblyHDS3N9Q3KSleNfrXS
|
Y1FVQWGmEVBgXgvsUrtQN70Eb519Pm9XMOILBe8JYLPOcC+gOGcWbVw21IXrsLm5qa7eu9ZRpV2t
|
||||||
tRrB5a3Nm7Yobtd6V/UqgV0HbZrhql3VAud2rTIY4vnVCvNeHvzPh988ROfVAoLhq0KECJf5Z2cU
|
dVQjuLy1aet2r9OxyVG5TmA3QpumuUpHpcA5Het0hnh+NcO8lwP/c+E3B9F5NY9g+CofIcKl/1kZ
|
||||||
z5NW5LTQeRU/P84LBmfjWfpphiUWBouwj+fZRG8BGb7kE+f7XTtKca98mft47nQxghzfZHz1LzFf
|
xfOkGdlNdF7Fz4+LgsH5eJZ+mmHq0mAB9vE8m+hNIMOXfOJ8v3N3Me6VL3Mfz50tRJDjm4yv/CXm
|
||||||
gE4yftW/Yj4PTTB+5c8xb0UXmH/9fsP8j8yltEzCBxhul8YF50/cRCm+BxQJ42lUwB0CnhLwywR8
|
89Bpxq/7V8znoAnGr/055s1olvnX7jfM/8hCSkskfIDhVmlccP7UTZTie0CBMJ5GBdwm4EkBv0zA
|
||||||
QsDLBXxKwC8VcD6u8X1uoYA7BXyRgLuZH9xGFgFfJ+Di/a1OwG0C7hNw8Xlvo4DnC/hWARefEzoF
|
JwS8VMCnBPxSAefjGt/nlgq4XcCXCbiT+cFtZBLwjQIu3t9qBdwi4B4BF5/3tgh4roDvEHDxOaFD
|
||||||
vFDAewXcLuB9Al4s4P0CPkvABwS8RMC/KeCzBXyfgJcK+KMCLt7EHxNwcf59SsDnCvh+AZ8n4AcE
|
wPMFvEfArQLeK+CFAt4n4PMEfEDAiwT8mwI+X8APCHixgD8q4OJN/DEBF+ffpwR8oYAfFPBFAn5I
|
||||||
fL6Ajwj4JQJ+RMArBPyYgC9AM2kmzaQ/5fS70is+9w1+ZPcN5b+3AqbdPSOaNX3MN/iS/RCRp1d/
|
wBcL+IiAXyLgxwS8TMBPCPgSNJfm0lz6U06/K77ic8/gR1bPUO57a2Da3TeimFMnPIMvWY8Qear6
|
||||||
7kLos/TSc0BKFxP9Xiz4bOy9dDq9j/AWwh/XeSvhD+q8jfDP6Hwe4R/X+XzCP6zzBYS/X+cLCX+X
|
cwdCn6VWXgBSvJzo92DBZ2PvpVKpA4Q3Ef6kxpsJf1jjLYR/RuNzCP+4xucS/mGNzyP8/RqfT/i7
|
||||||
ztsJr+p8EeFv0fliwnt0fhbhq3W+hPBX6vxswpfrvIPwFp0vJfynFzhfRuuv8+W0/jo/h9Zf5+fS
|
NN5KeJ/GFxD+Fo0vJLxL4+cRvlLjiwh/pcbPJ3ypxtsIb9L4YsJ/Osv5Elp/jS+l9df4BbT+Gr+Q
|
||||||
+uv8PFp/zkN0t5HoNtL2AP47VUZ+WOL3SPxuiU9IfFjiAxK/TeI7JL5V4r0SXyvxqyW+SuKXSvzl
|
1l/jF9H6cx6iu5NEt4G2B/DfqdDzwxK/T+L7JV6V+LDEByR+p8S3S3yLxLslvkbiqyW+QuJXSvzl
|
||||||
Ej9f4mdLfL7En19u5CdFvvq/mpPH7/QlT/oGP5jYuKVlOP8a6BG+4dlPF2NSexD38/m/BZNT+4A9
|
Er9Y4udLfK7Ez6zW85MiX/lfTYmTd3oSpz2DH0xs2d48nHsN9AjP8PynCzGpOYz7+eLfgsmZA8Ce
|
||||||
uxyj+Z9hsn5Kmw9D4+fL6dAoSo+WLh7A3f8Qo6D/KtFf/SIm117wJSd8Bz++yXdwyuazvOI7fkGb
|
X43R3M8w2TSlLIah8fPVdGgUpEaLlw/g7n+EUdB/lehXv4jJtbOexITn8Mc3eQ5PWTymVzwnZ5VF
|
||||||
Bw7CzIE9PdpNysXtcfkGan8AYpRY1uEbrN2EL33JD7US31BtNzCp/zifTqf80BlfyU8Ab9kGtgb7
|
4CDMHFhTo12kXNwel2+g5gcgRuqqds9gzVZ86Ul8qBR5hmq6gEn+x0wqlfRDZ3wlVwXetBNsdfZj
|
||||||
sbtBiC86wA4Gc53fN5S3tJL48U5Vj0D+S3H+ycOpf4Q+9wK2S9ngypfMX44FTL5nJHHJASJMwQg+
|
d4MQX7SDHQzmWr9nKGdlOfHjnqocgfxX4vwTR5P/CH3uBWyXtMCVJ5G7GguYfN+IeskhIkzCCD6E
|
||||||
gHs5mHwNFCk6Buhh76miYifyHfamSPUPe48xegLTw96jhB2af2gZjkrrCd+w95gv+TrO/DGoiG8I
|
ezmYfA0UKToG6FH3mYJCO/IcdSdJ9Y+6TzB6CtOj7uOEHVp8ZBWOSsspz7D7hCfxOs78MaiIZwjY
|
||||||
2OGOU77kWxiqxVDSO+ob3D2KSvfcT2yxweHUs+d5vg2Q79h6+BnyHh0csSRHfMPzXqbZeFPM0ZvT
|
4fYznsRbGKrBUMI96hnsH0XF++4nttjgaPLZGZ5vPeQ7tgl+htzHB0dMiRHP8KKXaTbuJHP05jRx
|
||||||
xFEKHKVQovgFPCWl2qmNQd3yIpBRX9I66D1qgcJBSV6hEXlmWihL4tuDu49a7y6AX5S4jJfpCr1M
|
lARHSaQWvoCnpGQbtdGpm14EMupJmAfdx01QOCjJKzQiz0wLZVG/Pdh/3Hx3Hvwi9TJepiu0MuH3
|
||||||
+H1i7O8tzOkQ7gBNs2iM14MShHIBhPX16yj01jQPewmNATOpYCYF1GQJ5GZJlNIcjsOsOIZfZSj7
|
ibG/NzGnQ7gDNM6jMd4EShDKJRDW16+j0FvTPOxFNAbMpIyZ5FGTFZCbSS2mOZyEWXEMv8pQ9is4
|
||||||
FZxhuSHDd4up9ZHpbOvnYA4dO4m4NX4WH/sVEq1/wqy/Ra2rcH0TFUQ+OGLHOiBUcej/VnfzPPyM
|
w1Jdhu8WUutj05nWz8EcOnYacWv8LD72KyRa/4RZf4taV+D6qmVEPjhixTog9OHQ/63m5nn4Gduv
|
||||||
7TW4CTM3DdTNnxE38yU3b4Cb8duojwT8jN+ccbCGObBezMETcAsZZ52zBjsopteVQoe5/xyEFjd/
|
cxNmbuqpmz8jbhZLbt4AN+O3UR8q/IzfnHawnjkwX8zBE3ALGWedswo7KKTX5UKHuf8ChBY3f/GD
|
||||||
6YPbeJQB/jrAYy3nhREyXNsEd4zUQRDs23ZIgEsx/OMs2I7hb0vw4Edlyd3TIC3G0gRIh7zTkN2y
|
O3mUAf46wGPNM8IIGa5phDtG8jAIDuw8IsDFGP5xBmzF8LclePCjkkT/NEgLsVQF6ZB7GrJbdUGX
|
||||||
c4acpuFelboty2U+NqrLdulL7p7yJRMT0Hf+phJXrWOKdfBDn+MqdUxAz4VKTqBE4QHcx8fzSSBe
|
0zTcq5K3ZbjMxUa1mS49if4pT0KdgL7zN+W4au1TrIMf+RxXqX0Cei5UcgKp+YdwHx/PJYF4VfRi
|
||||||
Fb04wUsqmfhgcPcHlkQJTGVvQyHGHgE1QKwEOY6RByhiSxQB8hIg43Fg8wj7L5j1A5ufWI8j+Usy
|
By/JhPrBYP8HJrUIprK3oRBjj4AaIGaCnMTIAxSxqAWAvATIeBzYHML+C2b9wOaqm3Akf0kGEK4f
|
||||||
gHD9oBxJ7/Tg7mkLUXwcK94ALCLso5hdTso0vhTMCwj6EEYvAbaQsPdhthAuHrBLRXdD0U/I09dw
|
lCPhnh7snzYRxcex4g3AIsI+itnVpEzjK8E8j6APYfQSYPMJex9m8+HiAatUdCcU/ZQ8fQ23Q1dx
|
||||||
B3QV7wkWiNcukH6i0g7w8IVMS49OkQE8QeKjLQQYovUKRHuRnXfg2rPp9HgJn9pWCMbvY+Ph2tPw
|
n2KBeG2W9BMf7QAPz6ZbenSKDOAJEh9lKcAQrVcg2susvAPXnE+lxov41LZGMH4fGw/XnIVnjeST
|
||||||
rJF6EmuxHrYB36VBacrvW0VLpeWnvgvKhnLXQbmPZJf7BBgeYeWeT8pduueAPpr+HTrlC/hZJnXN
|
WIv1sM34Lg1KU37POloqJTf5XVDWlbsWyn0ss9ynwPAYK/diUu7ifYe00fTv0ClfwM8yyWvO06mH
|
||||||
WTr1UK7iLJvLcKWHcOUTo8/z+L99Bsf/zcHdb6LESjyVDZVhPZrHmfMsAnrVryzkudVP4aoDdCmu
|
cmXn2VyGKz2EK6+OPs/j//Y5HP83B/vfROpaPJUNlWA9mse5GRYBrepX5vPc6qZw1QG6FFfxpSlS
|
||||||
4ktTpOonsFXqDLkexdc3TmVC4qYheR+mktQjU5mQ1JzPEZLBM1JITJpyVGhK63kaklf0kLw4TYui
|
9VPYKnmOXI/i6xun0iFx0pC8D1NJ8pGpdEiqZrKEZPCcFBKDphwVmtI8Q0PyihaSF6dpUbTuduM5
|
||||||
d7cbz4hteg+p2PDqWwuo9MJpcdbfQKt9OHW3UKFZcD0eo1XCASkr4HlVY63h1cUA0Ll5v8HbUe7t
|
sU3vIRUbrr41j0pnz4qz/mZa7aPJu4UKzYPr8RitEg5ISR7PqxJrDVcXAkDn5oM6b8e5t2vPiX3m
|
||||||
2jNinzl3LuP76dMkQC/CTJ2Kn8kEaC6thSE+Xafl+GTfpX+4hNwzU/9Ma09umstIe4/ie9IuuA/l
|
woW076fPkgC9CDN1Mn4uHaCFtBa6+HSeleOTeZf+4Qpyz0z+M609uWmuIu09iu9Je+E+lPsXK2jV
|
||||||
/8USWvVB8MfL1HOO35YegKsXluKrX9HKTBz2vkMGox+HYKjjHV/XG76DJ+HZ5BieWsmEQtpi7mmc
|
B8EfL1P3BX5begCuXliJr35FKzNx1P0OGYx+HIKh9nc8nW94Dp+GZ5MTeGolEwppi4VncT54zkDk
|
||||||
D54zELkLsP7zXh4Pl/U07RlZPsD4R5Pp9KD3HcuQ950bvKP3PsJD9/FkpjednCTB+g44TDWdztGD
|
LsD6z3s5PFzms7RnZPgA4x9NplKD7ndMQ+53bnCP3vsID93Hk+nedHqSBOs74DDZeDZLD3JNShGy
|
||||||
PJNShJzZEdp9dXaEijIlJxH66tU0QupkJkLez3mEOuHqsHeUxCRM6zOaVZ/vnjKZSd6w8XD87pTY
|
Z0ao/+rMCBWkS04i9NWraYR8k+kIuT/nEeqAq6PuURKTMK3PaEZ9vnvGYCZ5w8LD8bszYq/48DwP
|
||||||
Kz48y4OT7Sx5CgdnFIIzeoP3g3uHeECOnyIBeRBcplZP5giI+xQOSLerdPGDOEt4oK0jz3ue21qG
|
TqazxBkcnFEIzugN7g/uHeIBOXmGBORBcJmsnswSEOcZHJAuR/HyB3GW8EBbS573XLc1D9fcvBwh
|
||||||
a29ejJDn1ubkW56O5uSkZ4snOd3hG666EeDNLdeex+90qcWfQQ4Hz9u0xdVvs+fFluRnLcmPG5P/
|
161Nibdc7U2JSdd2V2K63TNccSPA25qvncHvdMnln0EOh2csyvLKt9nzYnPis+bExw2J/3SlFr3r
|
||||||
6UnPe9c3eMjiW/+bxG/x+97t2zx3eLZ57vQoh7ozeeL8DiHhPVF/M5xJ/x+SxbAaa1x7xOlqZ1vU
|
GTxi8mz6jfpb/L53+07XHa6drjtd3iNd6TxxfkeQ8J6ovRnOpf8PyaRbjdWvPeJ0tb01amefK4LR
|
||||||
yT5XBKMR4BkT8DN5vep3bgrclQjENcI3qZoacgZisWiM8K3qjmCkx+nZ2CyoGf2HVa2rFyv5yecP
|
CPCMCfiZvM7nt28N3KUG4grhG32KL2QPxGLRGOFbfLuDkW67a0uToKb3H/YpnT1YyU8+f9BPHKFg
|
||||||
+okjFIzTHyWCP9T0BISLOPnmgq/6wyEUS0Qi+BtJ0B8KoD41EYeyxXsTmgZglT96dwTF1Z2ARbu7
|
nP54I/hDTXdAuIiTby74qi8cQjE1EsHfSIL+UAD1+tQ4lC3eoyoKgBX+6N0RFPftASza1YU6Y754
|
||||||
UVdMjffCdV84noj3BSJ+XI9lS+PFyNvehJaRNV/LZbYbnkJ0/bTkk3QaT6ChiXQaf6u7F+gioEc/
|
D1z3huNqvDcQ8eN6rFoZL0Tutka0iqz5mi6z3PAUouunRZ+kUngCDU2kUvhb3b1AlwE9/mkq9RLg
|
||||||
TadfAvw5GGL42+evYQBvBIpnvD6g+XiGA7oI6H6gHqBHgW4F+hHQKNASCP1zQJcD7YNpvgVoJdxn
|
z8EQw98+fw0DeAtQPOP1As3FMxzQZUAPAnUBPQ50B9CPgEaBFkHonwO6GmgvTPPNQMvhPhsCegNM
|
||||||
Q0BvgAllL9DbYbr6KdDdMLEfBfp9uLV8BBS/R9TYMmu8lns2IUt/meWykkI7zhfjZF0eyrkC08ZC
|
KPuB3g7T1U+B9sPEfhzo9+HW8hFQ/B5RZUmv8Zru2YpMfSWmy4ryrThfjJN1eSjnGkwb8knTwt0D
|
||||||
0rRw90D4Abry43S6Ez9AOsqaHBV/XjrrbvsAumnh9detWkI+22H7O+B/J9Rf7BMYxw249RNaX57w
|
4Qfo8o9TqQ78AGkrabSV/XnxvLutA+impddft24F+WyH7e+A/x1Qf7FPYBw34I5PaH15wmvE+MVg
|
||||||
GjF+MdgF+V2F13u8jrKHrA2zC1g5cDzvg/mMfFvgsjYoLJMfgf87LyLHb5thEznO2w5l8YN8KcrO
|
L+R3FV7vcdtKHjLXz89j5cDxvA/mM/JtgctaobBMfgz+77mIHL9thg3kOG8rlMUP8pUoM+8VJmNb
|
||||||
e4nF3BbLG5mtmdwP8ttB3iTKd2fkD4L8fpD/QpRbnyUKWP4E7geT7Aaky5/W5S+B/Gcgn2sR5LZi
|
LG9gtkZyP8hvB3mjKO9Pyx8E+f0g/4UoNz9LFLD8CdwPJtkNSJM/rclfAvnPQL7QJMgthSasgOUf
|
||||||
C1bA8g8AfxL6idMgv1SX50F/eBL6z1UG+QJdvgTk/wD9qtwgtxM53tfRCPKnoL+R7U1NjrK/tjY7
|
AP4k9BO7Tn6pJs+B/vAk9J+rdPIlmnwFyP8B+lWpTm4lcryvowHkT0F/I9ubGm0lf21uspX9lcVt
|
||||||
Kv7K5nU4h/O8jsq9+Y0O90MFPse6wcINjrqIY53H4fY4KusdznpHRb2jrN5hJ/MG7q/HwI/4XWYm
|
sw/nuG3l+3MbbM6H8jy2jYP5m221EdtGl83pspXX2ex1trI6W0mdzUrmDdxfT4Af8bvMXJpLc2ku
|
||||||
zaSZNJNm0kyaSTPp/2ri+3L4Phxxv7FInexC3+vBHo75Ho/KKyjleyP4/h++B4fvNeF7afg+oEWS
|
zaW5NJfm0v/VxPfl8H044n5jkdrZhbbXgz0c8z0e5VdQyvdG8P0/fA8O32vC99LwfUDLJPnkbIps
|
||||||
fPJCmmzJf4xtiuHPVN9km1v4HpdjTM73qpSw1zm+R4Xv3RD3fODE99pUsP0c/C1witWPv1fwPTN8
|
yX+MbYrhz1TfZJtb+B6XE0zO96oUsdc5vkeF790Q93zgxPfalLH9HPwtcIrVj79X8D0zfE/QlkI9
|
||||||
T9DGYiPeWWQs9wSjfI8Sz5+FRdeD1xlSPwuDLjD+GFNIM56Xa4LxjzD5WcaLe4b+J5O+31pKbtbe
|
3lGgL/cEo3yPEs+fhUXTg9cZUj8Tg2YZf4IppBjPyzXB+EeY/DzjxT1D/5NJ228tJSdr71pGtzDa
|
||||||
dYxuZLST0T5GBxjdx+hjjO5ndITRY4yOMjrBX7bY5qwyRp2MuhmtY3Qjo52M9ombun6PxPeZbWho
|
wWgvowOMHmD0MUYPMjrC6AlGRxmd4C9bbHNWCaN2Rp2M1jK6hdEORnvFTV2/R+L7zDbX119vL2/f
|
||||||
uN5Z2bE9EdESzvWuVS53VfXaBGGrv7HS7XLXXEvhL+HTBq1bkaOBbNCq63LiNn3fuRHPQ/fmxPP1
|
pUYU1b7Jsc7hrKjcoBK28htrnQ5n1bUU/hI+LdC6ZVkayAKtujErbtH2nevxHHRvVjxXGx96PE8b
|
||||||
8WHEC/RxYcQL9fFjxO16vzLiRXp/NOLFer834rP08WHES7IXVgg+Gzlz4g40kKMdbagU7cuJl+nn
|
F3o8Xxs/etyq9Ss9XqD1Rz1eqPV7PT5PGx96vChzYYXg85E9K25DA1na0YKK0YGseIl2XkOPl2rz
|
||||||
NYx4uT4fGfE5OTcj29BcfR++EZ+HRnLi8/X5zYhfos9rRvzSnOPKBrMEn4eM+ILMQRIDntlvbMQv
|
kR5fkHUzsgUt1Pbh6/FFaCQrvlib3/T4Jdq8pscvzTquLDBL8HlIjy9JHyTR4en9xnr8sgyMnt/4
|
||||||
y8Lo+Y1P0zKO528rxK1srhF3MLxOwq9k+ICEryV5LESVdZn8cGoi19lxCDM/I5KfXUQ/O56PmpTf
|
NCXjeP42Q9xKFupxG8NrJfxKhg9I+AaSx1JUXpvOD6dGcp0ZhzDzMyL52Uv0M+P5qEH5jer1BJEt
|
||||||
rF5PENk8dMcSWZJb/1minx3/IwTPbq/j5Hd+Vr1OMlwu/yorrm92/58kv9n9bWse3udYhl5l8bmK
|
QneskCXZ9Z8l+pnxP0bwzPY6SX4XZ9TrNMPl8q8z4/pm9v9J8pvZ33bk4H2OJehVFp+r2Di2mige
|
||||||
jWO7heJR1sRXsUAvMNmvfj3Tf5jdWMuZ/s0m+idsVJ+PoxUM7zTRj2F9a/b4GmD5htgNk9839zL8
|
ZU18FQv0EoP96tcz/YfZjbWU6d9soH/KQvX5OFrD8A4D/RjWN2eOrwGWb4jdMPl9cz/DX2XALxj+
|
||||||
VQb8guE/MPH/jAmOz03g0x/r6oz4a2RfPeTgpDzfM/trlm87e+Dgzy8nTfbtn2b6HVL5LzD/dcw/
|
AwP/zxjg+NwEPv2xsVaPv0b21UMOdsrzPbO/Zvm2sQcO/vxy2mDf/lmm3y6Vf5b5r2X++V7jPHP2
|
||||||
32tcYM1dzmut1M/+yynPj86tN9G/1QTXmJ8H2YPEAYa/acNTWPb8MAD65dYF+v2Mp2Fr7vMXTzL/
|
cl5rpn4OXk55fnRuk4H+rQa4wvw8yB4kDjH8TQuewjLnhwHQLzUv0e5nPA2bs5+/eJL5v5E9sC1k
|
||||||
N7IHtrksPj8zKc+rJvgnVhofngmP/wUT/Tk2Wk55HrvCRtvFzXDeLlfbqH8388+fP6tsuf232HLX
|
8fmZQXleNcA/MdP48Ex4/GcN9BdYaDnleewKC20XJ8N5u1xtof6dzD9//qywZPffbMle3x7Wz+2s
|
||||||
t5f1cyfrt/y5st/Ez7dsuc9x/MhEH38gK8vRLu/aaL+V6zvOymOV+tsZhrsZsJThRXm561XJ4tPJ
|
3/Lnyj4DP9+yZD/H8SMDffyBrCRLu7xrof1Wru84K49Z6m/nGO5kwEqGF+Rkr1c5i08HE/Ln3bIc
|
||||||
hPx5tyKP4gMS7szLXf6b82j55XJuYvPSICtPE8O3mfiJsnydLF8+/fWb6O81wZ9g+S6Q4vMMw8cv
|
ig9IuD0ne/lvzqHll8u5lc1Lg6w8jQzfaeAnyvK1s3z59NdnoL/fAH+C5btEis8zDB+/RI8fMvBz
|
||||||
MeIHTPwcNcHHTfDzJvg1+bReG52U5/PA8nyTcz1dMS2uJbq7XV0oc6BH0cJKFz6pgw+x+KNKTyi6
|
3AAfN8BnDPBrcmm9ttgpz+eB1bkG53o6Y0pcUbu6HJ0ofaDHq4S9nfikDj7E4o96u0PRXb6Q169E
|
||||||
XQ0pfi0aiytqoh91RcN9oYAW8LvWude4cyvhsypBRY3F1F1KIKLFdqHumBoOKP5EOLwLTAROAU3N
|
Y3GvT+1DndFwbyigBPyOjc71zuxK+KxK0OuLxXx7vYGIEtuLumK+cMDrV8PhvWAicF7QVHSqIX7u
|
||||||
oBri556hXIrStMnT6lW8bY34QNGGlvZ6T4vS3tS02btF2eKpb/EC2vjVNk9rcwMoG3z5jQA5JwPQ
|
Gcrl9TZudbW4ve7WBnygaHNzW52r2dvW2LjNvd273VXX7Aa04autrpamelDW+fLrAXJOBqDNre1e
|
||||||
hrYOxetjfn2Nm3B+5FuWGgopiUTQn32EqK7OeApGtCAfvtjpnro68ciNfKBJ9IJP1vTFlEhUIR/Y
|
t4f59TRsxfmRb1m+UMirqkF/5hGi2lr9KRjRgnz4Yqd7amvFIzfygSbRCz5Z0xvzRqJe8oEt/eUM
|
||||||
Ml/O4JccKqJHg4wO5UNFGWkN8irMOS4c//pGDxYZnUCuPdGoH9V7GpVN3ltyHcWSC8oOGnXFEySe
|
fsmhIno0SO9QPlSUllYht5c5x4XjX9/owSK9E8i1Oxr1ozpXg3er+5ZsR7HkgrKDRp1xlcRTf2ZK
|
||||||
xjNTsrLx1JYsZYUjQYOeE48qvWoEfxs0PyvGTPTvivhElHmgM+eyxKzxsSaluV0hp68U8hWSHsGS
|
Vtaf2pKlrHAkaNBz4lFvjy+Cvw0anxVjJtp3RXwiyjjQ6XNZYtb4WJO3qc1LTl95yVdIegRLDjDk
|
||||||
Aww5s77WBZVADe1tbcqG9vZG+fRZVogueipODx8eFuSUlpyveL7LpHI5Tq+JpcDnuCCiqqbqPX17
|
zPpaJ1QC1be1tno3t7U1yKfPMkJ00VNxWvjwsCCntOR8xfNdBpXLcnpNLAU+xwUR9Sk+rafvisfZ
|
||||||
PM6uodFxfZTtKq44dB4NRisEXiGfc6Vje23trZ4tDb6LnXnLim0AZ0x6sfCd2FgREkvodez4mlGY
|
NTQ6ro93lw9XHDqPAqMVAu8ln3OlY3utbS2u7fWei515y4htAGdMerHwnVhfERJL6HXs+JpemD70
|
||||||
OfSW1VtJwUmXBQZXIJxjrGWdhZPcJLR4VlhznvQzDvXqVajJs8XTQo/tGT0gV3xXWFO3A4WxSmgv
|
ltFbScFJlwUGVyCcZaxlnIWT3KhKPCOsWU/66Yd65TrU6NruaqbH9vQekCO+N6z4dgGFsUpoD7+C
|
||||||
v4KuFYj1IVckqgVcPZGEqy8W7QvEtF0CtD0RDPmrYLqhkKe+uUpTexCR9arxXuTy74pAFpRqMSrZ
|
rhWI9SJHJKoEHN0R1dEbi/YGYspeAdqlBkP+CphuKOSqa6pQfN2IyHp88R7k8O+NQBaUKjEq2ROI
|
||||||
GYjF8cd+kVFAFguEVKzIrvpCGi4FNC6+dPVE2UU80IVcWqAfWNIXXbEoaTlXoJdNyr3+WIajPugE
|
xfHHfpHxgiwWCPmwIrvqDSm4FNC4+NLRHWUX8UAnciiBPmBJX3TEoqTlHIEeNin3+GNpjvqgEyi1
|
||||||
Si34NWSlhoPgjJpDV0MuuDOEYQrPcWv6gxJ+ncCPfHydyezvEPBkkfirkfFMm9k5eJ7k5YQ1kr18
|
4NeQlS8cBGfUHLoacsCdIQxTeJZb0x+U8OsEfuTj60xGf4eAJ5PEX430Z9qMzsHzJC8nrJfs5fP3
|
||||||
/l5+jZP/9kGzZM/XSe41yV+2vw3+n06no9yer6dwytd5+LKJXH4V0bVGbs/XXTg9wAT8PCC35+uC
|
8muc/LcPmiR7vk5yr0H+sv1t8P9sKhXl9nw9hVO+zsOXTeTy+xBda+T2fN2F00NMwM8Dcnu+LhhE
|
||||||
QWQ8887XZzjl65k8yfG/C9G1Qq7G13E4vV4qv/TnE9A3EF171MtvN9J9KFN+K8qu/zCiMeX2fF2I
|
+jPvfH2GU76eyZMc/7sQXSvkanwdh9PrpfJLfz4BfQPRtUet/FY9PYDS5TejzPoPIxpTbs/XhTjl
|
||||||
U74eKseP1/97zL6e8Xz9iFO+HlvAbGT7x5H4twFQ1t+1kFdE5Pb/vmTP16M47ZQCLv/5jCcle75u
|
66Fy/Hj9v8fs6xjP14845euxecxGtn8ciX8bAGX8XQt5RURu/+9L9nw9itMOKeDyn894UrLn61ac
|
||||||
xam8vCXb75fs+foWpxu/IP/nJXv+/s6pVzysmaM8L0j2/H2e09mSvhy/l5Fx/tAHHKNzTMrP02uS
|
ystbsv1ByZ6vb3G65Qvyf16y5+/vnLrFw5pZyvOCZM/f5zmdL+nL8XsZ6ecPbcAxusCg/Dy9Jtkb
|
||||||
vdnfwzDL/23Jnq/TcfqYNH7k/vshos/wfLlUP69clVvfLtFPET3Hqv8ZE2Zf9iXtzyMae/17BP97
|
/T0Mo/zfluz5Oh2nj0njR+6/HyL6DM+XS7XzyhXZ9a0S/RTRc6zanzFh9iVf0n4G0dhr3yP43zth
|
||||||
J8weCfOHaMfj+BNE6y9/z6hgCzipL8i/wGK0199b3cZ8ZHueStgHDL3+zL6M2VdK+rK/cpa/vJ7O
|
9kiYP0Q7HsefIFp/+XtGGVvASX5B/nkmvb323urU5yPb81TEPmBo9Wf2Jcy+XNKX/ZWy/OX1dG5/
|
||||||
7a+T8FzfpaQmJqmO2TvZPIKXYVwoe/4oEsoupk42cd4kbeaR599yE/sfsnZYKBnI9jNpJs2kmTST
|
nYRn+y4lNTFJtczezuYRvAzjQJnzR4FQdjF1sInzJmkzjzz/lhrY/5C1w1LJQLafS3NpLs2lufS/
|
||||||
/nfSfwOi0d5fAFAAAA==
|
k/4b9s7GHQBQAAA=
|
||||||
'
|
'
|
||||||
|
|
||||||
#-----------------#
|
#-----------------#
|
||||||
|
|
@ -3262,7 +3263,6 @@ J8weCfOHaMfj+BNE6y9/z6hgCzipL8i/wGK0199b3cZ8ZHueStgHDL3+zL6M2VdK+rK/cpa/vJ7O
|
||||||
|
|
||||||
if ! ((QQ2_NOEXECUTE)); then
|
if ! ((QQ2_NOEXECUTE)); then
|
||||||
check_depends
|
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<&-;
|
||||||
|
|
@ -3276,6 +3276,9 @@ 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
|
|
@ -283,7 +283,7 @@ uuidparse vi )
|
||||||
exit "$E_depends"; } >&2
|
exit "$E_depends"; } >&2
|
||||||
|
|
||||||
for elem in "${depends[@]}"; do
|
for elem in "${depends[@]}"; do
|
||||||
if ! { command -v "$elem"; } &>/dev/null; then
|
if ! (unset "$elem"; command -v "$elem") &>/dev/null; then
|
||||||
((missing++))
|
((missing++))
|
||||||
echo "Missing required software: $elem" >&2
|
echo "Missing required software: $elem" >&2
|
||||||
fi
|
fi
|
||||||
|
|
@ -409,16 +409,15 @@ if [[ -e "${QQ2_DIR}/qq2clone.db" ]]; then
|
||||||
check_rw "${QQ2_DIR}/qq2clone.db"
|
check_rw "${QQ2_DIR}/qq2clone.db"
|
||||||
rm -f "${QQ2_DIR}/qq2clone.db" || unexpected_error first_run_setup
|
rm -f "${QQ2_DIR}/qq2clone.db" || unexpected_error first_run_setup
|
||||||
else
|
else
|
||||||
|
echo "Setup complete"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sqlite3 <<EOF
|
sqlite3 <<EOF
|
||||||
create table CLONES(uuid TEXT, id INTEGER, template TEXT, disks TEXT);
|
create table CLONES(uuid TEXT, id INTEGER, template TEXT, disks TEXT);
|
||||||
|
|
||||||
create table TEMPLATES(name TEXT, md5sum TEXT, disks TEXT,\
|
create table TEMPLATES(name TEXT, md5sum TEXT, disks TEXT,\
|
||||||
valid INTEGER);
|
valid INTEGER);
|
||||||
|
|
||||||
create table CONFIG(name TEXT, value TEXT);
|
create table CONFIG(name TEXT, value TEXT);
|
||||||
insert into CONFIG values('TEMPLATE_DIR', '${TEMPLATE_DIR}');
|
insert into CONFIG values('TEMPLATE_DIR', '${TEMPLATE_DIR}');
|
||||||
insert into CONFIG values('USE_SPICE', '${use_spice}');
|
insert into CONFIG values('USE_SPICE', '${use_spice}');
|
||||||
|
|
@ -430,6 +429,8 @@ sqlite3 <<EOF
|
||||||
insert into CONFIG values('NORUN', '0');
|
insert into CONFIG values('NORUN', '0');
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
echo "Setup complete"
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
#=========================================================================#
|
#=========================================================================#
|
||||||
|
|
@ -3166,7 +3167,6 @@ return 0
|
||||||
|
|
||||||
if ! ((QQ2_NOEXECUTE)); then
|
if ! ((QQ2_NOEXECUTE)); then
|
||||||
check_depends
|
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<&-;
|
||||||
|
|
@ -3180,6 +3180,9 @@ 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