From c247bde8dd0b8baa0a04dd00e99672bc5bc57b20 Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Thu, 13 Nov 2008 02:45:35 +0000 Subject: [PATCH] (Change Version) More future proofing, updated -! conditions to use more reasonable numbers: 1,2,3 -! are now setting testing booleans 10,11,12,http://.... now set alt downloads --- inxi | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/inxi b/inxi index c6c0a08..3a33657 100755 --- a/inxi +++ b/inxi @@ -1,7 +1,7 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 0.5.22 +#### version: 0.5.23 #### Date: November 11 2008 ######################################################################## #### inxi is a fork of infobash, the original bash sys info script by locsmif @@ -58,9 +58,11 @@ #### TESTING FLAGS #### inxi supports advanced testing triggers to do various things, using -! #### -! 1 - triggers default B_TESTING_1='true' to trigger some test or other -#### -! 2 - triggers an update from the primary dev download server instead of svn -#### -! 3 - triggers an update from svn branch one - if present, of course -#### -! 4 - triggers an update from svn branch two - if present, of course +#### -! 2 - triggers default B_TESTING_2='true' to trigger some test or other +#### -! 3 - triggers B_TESTING_1='true' and B_TESTING_2='true' +#### -! 10 - triggers an update from the primary dev download server instead of svn +#### -! 11 - triggers an update from svn branch one - if present, of course +#### -! 12 - triggers an update from svn branch two - if present, of course #### -! - Triggers an update from whatever server you list. ######################################################################## #### VARIABLES @@ -120,6 +122,7 @@ B_SHOW_SHORT_OUTPUT='false' B_SHOW_SYSTEM='false' # triggers various debugging and new option testing B_TESTING_1='false' +B_TESTING_2='false' # Test for X running B_X_RUNNING='false' if [[ -n $DISPLAY ]];then @@ -595,11 +598,16 @@ get_parameters() case $OPTARG in 1) B_TESTING_1='true' ;; - 2) script_self_updater "$SCRIPT_DOWNLOAD_DEV" 'dev server' + 2) B_TESTING_2='true' ;; - 3) script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_1" 'svn: branch one server' + 3) B_TESTING_1='true' + B_TESTING_2='true' ;; - 4) script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_2" 'svn: branch two server' + 10) script_self_updater "$SCRIPT_DOWNLOAD_DEV" 'dev server' + ;; + 11) script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_1" 'svn: branch one server' + ;; + 12) script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_2" 'svn: branch two server' ;; http*) script_self_updater "$OPTARG" 'alt server'