From 1690069718c76aaaa28bda69e822a2c4c6e974a7 Mon Sep 17 00:00:00 2001 From: bryan Date: Fri, 6 Jan 2023 11:12:39 -0500 Subject: [PATCH] Alias --version and --release --- openwrtbuilder | 12 ++++++------ profiles | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/openwrtbuilder b/openwrtbuilder index aa5d2c9..fdc5a85 100755 --- a/openwrtbuilder +++ b/openwrtbuilder @@ -13,11 +13,11 @@ printHelp() { debug "${FUNCNAME[0]}" cat <<-'EOF' +Run and deploy OpenWRT imagebuilder. + USAGE: openwrtbuilder [[OPTION] [VALUE]]... -Run and deploy OpenWRT imagebuilder. - OPTIONS --profile, -p PROFILE --info, -i PROFILE @@ -43,11 +43,11 @@ readInput() { unset RESET - if _input=$(getopt -o +r:v:p:i:lb:f:dh -l release:,profile:,info:,list-profiles,builddir:,ssh-upgrade:,ssh-backup:,flash:,reset,debug,help -- "$@"); then + if _input=$(getopt -o +r:v:p:i:lb:f:dh -l release:,version:,profile:,info:,list-profiles,builddir:,ssh-upgrade:,ssh-backup:,flash:,reset,debug,help -- "$@"); then eval set -- "$_input" while true; do case "$1" in - --release|-r) + --release|-r|--version|-v) shift && RELEASE="$1" ;; --profile|-p) @@ -145,7 +145,7 @@ installHostDependencies() { _pkg_cmd="apt-get" fi - echo "Installing dependencies" + debug "Installing dependencies" debug "sudo $_pkg_cmd -y install ${_pkg_list[*]}" if ! sudo "$_pkg_cmd" -y install "${_pkg_list[@]}" > /dev/null 2>&1; then echo "Warning: Problem installing dependencies" @@ -192,7 +192,7 @@ getImageBuilder() { echo "Downloading imagebuilder archive using $_dl_tool" debug "$_dl_tool -o ${P_ARR[source_archive]} $_url" - if ! "$_dl_tool" -o "${P_ARR[source_archive]}" "$_url" > /dev/null 2>&1; then + if ! "$_dl_tool" -o "${P_ARR[source_archive]}" "$_url"; then echo "Could not download imagebuilder archive" exit 1 fi diff --git a/profiles b/profiles index 57d0228..c53af5d 100644 --- a/profiles +++ b/profiles @@ -91,6 +91,7 @@ r4s['packages']="\ luci-app-wireguard \ luci-app-ddns \ luci-app-sqm \ + irqbalance \ collectd-mod-sqm \ collectd-mod-df \ pbr \