oSoWoSo/DistroHopper
1
0
Fork 0
mirror of https://github.com/oSoWoSo/DistroHopper.git synced 2024-08-14 22:46:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correct basic error to get to downloading isos

Browse source
This commit is contained in:
Phil Clifford 2023-01-23 18:28:22 +00:00 • committed by Martin Wimpress
parent b46aca69c9
commit ce04397793
1 changed files with 36 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

50
quickget
View file

@ -62,6 +62,8 @@ function pretty_name() {
reactos) PRETTY_NAME="ReactOS";; reactos) PRETTY_NAME="ReactOS";;
rebornos) PRETTY_NAME="RebornOS";; rebornos) PRETTY_NAME="RebornOS";;
rockylinux) PRETTY_NAME="Rocky Linux";; rockylinux) PRETTY_NAME="Rocky Linux";;
truenas-core) PRETTY_NAME="TrueNAS Core";;
truenas-scale) PRETTY_NAME="TrueNAS Scale";;
ubuntu-budgie) PRETTY_NAME="Ubuntu Budgie";; ubuntu-budgie) PRETTY_NAME="Ubuntu Budgie";;
ubuntukylin) PRETTY_NAME="Ubuntu Kylin";; ubuntukylin) PRETTY_NAME="Ubuntu Kylin";;
ubuntu-mate) PRETTY_NAME="Ubuntu MATE";; ubuntu-mate) PRETTY_NAME="Ubuntu MATE";;
@ -69,7 +71,6 @@ function pretty_name() {
ubuntu-unity) PRETTY_NAME="Ubuntu Unity";; ubuntu-unity) PRETTY_NAME="Ubuntu Unity";;
void) PRETTY_NAME="Void Linux";; void) PRETTY_NAME="Void Linux";;
zorin) PRETTY_NAME="Zorin OS";; zorin) PRETTY_NAME="Zorin OS";;
truenas) PRETTY_NAME="TrueNAS";;
*) PRETTY_NAME="${SIMPLE_NAME^}";; *) PRETTY_NAME="${SIMPLE_NAME^}";;
esac esac
echo "${PRETTY_NAME}" echo "${PRETTY_NAME}"
@ -209,7 +210,8 @@ function os_support() {
slackware \ slackware \
solus \ solus \
tails \ tails \
truenas \ truenas-core \
truenas-scale \
ubuntu \ ubuntu \
ubuntu-budgie \ ubuntu-budgie \
ubuntukylin \ ubuntukylin \
@ -509,12 +511,19 @@ function releases_tails() {
echo stable echo stable
} }
function editions_truenas() { function releases_truenas() {
echo core scale # enterprise is proprietary and paid if [[ $OS == truenas ]] ; then
echo "ERROR! The supported TrueNAS OS values are truenas-core or truenas-scale"
exit 1;
fi
}
function releases_truenas-core() {
echo 12.0 13.0
} }
function releases_truenas() { function releases_truenas-scale() {
echo 22.12 13.0 echo 22.02 22.12
} }
function releases_ubuntu() { function releases_ubuntu() {
@ -786,7 +795,7 @@ function make_vm_config() {
reactos) reactos)
GUEST="reactos" GUEST="reactos"
IMAGE_TYPE="iso";; IMAGE_TYPE="iso";;
truenas) truenas*)
GUEST="truenas" GUEST="truenas"
IMAGE_TYPE="iso";; IMAGE_TYPE="iso";;
windows) windows)
@ -839,7 +848,7 @@ EOF
echo "disk_size=\"2G\"" >> "${CONF_FILE}" echo "disk_size=\"2G\"" >> "${CONF_FILE}"
echo "ram=\"128M\"" >> "${CONF_FILE}" echo "ram=\"128M\"" >> "${CONF_FILE}"
;; ;;
truenas) truenas-scale|truenas-core)
echo echo
echo "boot=\"legacy\"" >> "${CONF_FILE}" echo "boot=\"legacy\"" >> "${CONF_FILE}"
echo "bootdrive_size=\"5G\"" >> "${CONF_FILE}" # boot drive echo "bootdrive_size=\"5G\"" >> "${CONF_FILE}" # boot drive
@ -1504,15 +1513,27 @@ function get_tails() {
echo "${URL} ${HASH}" echo "${URL} ${HASH}"
} }
function get_truenas() { function get_truenas-scale() {
local ISO="" local ISO=""
local URL="" local URL=""
if [ "${RELEASE}" == "13.0" ] && [ "${OS}" == "CORE" ]; then local DLINFO="https://www.truenas.com/download-truenas-scale/"
URL="$(wget https://download.freenas.org/13.0/STABLE/U3.1/x64/${OS}.iso)"
elif [ "${RELEASE}" == "22.12" ] && [ "${OS}" == "SCALE" ]; then URL=$(wget -q ${DLINFO} -O- | grep -o "\"https://.*${RELEASE}.*\.iso\""|cut -d\" -f2)
URL="$(https://download.truenas.com/TrueNAS-SCALE-Bluefin/${RELEASE}.0/TrueNAS-${OS}-22.12.0.iso)" HASH=$(wget -q ${URL}.sha256 -O- | cut -d' ' -f1 )
fi
echo "${URL} ${HASH}"
}
function get_truenas-core() {
local ISO=""
local URL=""
local DLINFO="https://www.truenas.com/download-truenas-core/"
URL=$(wget -q ${DLINFO} -O- | grep -o "\"https://.*${RELEASE}.*\.iso\""|cut -d\" -f2)
HASH=$(wget -q ${URL}.sha256 -O- | cut -d' ' -f1)
echo "${URL} ${HASH}"
} }
function get_ubuntu() { function get_ubuntu() {
@ -2068,6 +2089,7 @@ if [ -n "${2}" ]; then
fi fi
fi fi
VM_PATH="${OS}-${RELEASE}-${EDITION}" VM_PATH="${OS}-${RELEASE}-${EDITION}"
validate_release "releases_${OS}" validate_release "releases_${OS}"
create_vm "$("get_${OS}" "${EDITION}")" create_vm "$("get_${OS}" "${EDITION}")"