Fix ordering of help options
This commit is contained in:
parent
ae83721be9
commit
baac207e10
10
buildiso.sh
10
buildiso.sh
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
# Generate a PVC autoinstaller ISO
|
# Generate a PVC autoinstaller ISO
|
||||||
|
|
||||||
|
@ -22,9 +22,6 @@ if [[ -n ${fail} ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
isofilename="pvc-installer_$(date +%Y-%m-%d).iso"
|
isofilename="pvc-installer_$(date +%Y-%m-%d).iso"
|
||||||
srcliveisopath="https://cdimage.debian.org/mirror/cdimage/release/current-live/amd64/iso-hybrid"
|
|
||||||
srcliveisofilename="$( wget -O- ${srcliveisopath}/ | grep 'debian-live-.*-amd64-standard.iso' | awk -F '"' '{ print $6 }' )"
|
|
||||||
srcliveisourl="${srcliveisopath}/${srcliveisofilename}"
|
|
||||||
deployusername="deploy"
|
deployusername="deploy"
|
||||||
|
|
||||||
show_help() {
|
show_help() {
|
||||||
|
@ -49,7 +46,7 @@ show_help() {
|
||||||
echo -e " -u: Change 'deploy' user to a new username."
|
echo -e " -u: Change 'deploy' user to a new username."
|
||||||
}
|
}
|
||||||
|
|
||||||
while getopts "h?o:s:a" opt; do
|
while getopts "h?o:s:au:" opt; do
|
||||||
case "$opt" in
|
case "$opt" in
|
||||||
h|\?)
|
h|\?)
|
||||||
show_help
|
show_help
|
||||||
|
@ -70,6 +67,9 @@ while getopts "h?o:s:a" opt; do
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
|
srcliveisopath="https://cdimage.debian.org/mirror/cdimage/release/current-live/amd64/iso-hybrid"
|
||||||
|
srcliveisofilename="$( wget -O- ${srcliveisopath}/ | grep 'debian-live-.*-amd64-standard.iso' | awk -F '"' '{ print $6 }' )"
|
||||||
|
srcliveisourl="${srcliveisopath}/${srcliveisofilename}"
|
||||||
srcliveisofile="$( basename ${srcliveisourl} )"
|
srcliveisofile="$( basename ${srcliveisourl} )"
|
||||||
|
|
||||||
tempdir=$( mktemp -d )
|
tempdir=$( mktemp -d )
|
||||||
|
|
Loading…
Reference in New Issue