Mirrors/vm-bhyve
1
0
Fork 0
mirror of https://github.com/churchers/vm-bhyve.git synced 2025-12-11 09:20:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve style

Browse Source
This commit is contained in:
Mateusz kwiatkowski
2018-10-17 12:05:15 +02:00
parent e8953f273e
commit e1a0c5aaf0
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/vm-datastore
View File

@@ -161,10 +161,7 @@ datastore::__resolve_path(){
setvar "${_var}" "${_mount}"
return 0
fi
elif [ "${_spec%%:*}" = "iso" ]; then
setvar "${_var}" "${_spec#*:}"
return 0
elif [ "${_spec%%:*}" = "img" ]; then
elif [ "${_spec%%:*}" = "iso" ] || [ "${_spec%%:*}" = "img" ]; then
setvar "${_var}" "${_spec#*:}"
return 0
else
@@ -215,8 +212,9 @@ datastore::get_guest(){
[ "${_ds}" = "default" ] && continue
config::core::get "_spec" "path_${_ds}"
[ "${_spec%%:*}" = "iso" ] && continue
[ "${_spec%%:*}" = "img" ] && continue
if [ "${_spec%%:*}" = "iso" ] || [ "${_spec%%:*}" = "img" ]; then
continue
fi
datastore::__resolve_path "_path" "${_spec}"
@@ -262,11 +260,10 @@ datastore::get(){
config::core::get "_spec" "path_${_ds}"
[ -z "${_spec}" ] && return 1
# don't find iso stores
[ "${_spec%%:*}" = "iso" ] && return 1
# don't find img stores
[ "${_spec%%:*}" = "img" ] && return 1
# skip iso and img stores
if [ "${_spec%%:*}" = "iso" ] || [ "${_spec%%:*}" = "img" ]; then
return 1
fi
datastore::__resolve_path "_path" "${_spec}" || return 1
[ "${_spec%%:*}" = "zfs" ] && _zfs="1" && _dataset="${_spec#*:}"