diff --git a/inxi b/inxi index 911b813..203c6fc 100755 --- a/inxi +++ b/inxi @@ -2,8 +2,8 @@ ######################################################################## SELF_NAME='inxi' # don't quote the following, parsers grab these too -SELF_VERSION=2.3.40 -SELF_DATE=2017-09-21 +SELF_VERSION=2.3.41 +SELF_DATE=2017-10-29 SELF_PATCH=00 ######################################################################## #### SPECIAL THANKS @@ -311,6 +311,7 @@ B_LABEL_SET='false' B_LSPCI='false' B_LOG_COLORS='false' B_LOG_FULL_DATA='false' +B_MAN='true' B_MAPPER_SET='false' B_OUTPUT_FILTER='false' B_OVERRIDE_FILTER='false' @@ -1655,7 +1656,9 @@ script_self_updater() print_screen_output "To run the new version, just start $SELF_NAME again." print_screen_output "----------------------------------------" print_screen_output "Starting download of man page file now." - if [[ ! -d $man_file_location ]];then + if [[ $B_MAN == 'false' ]];then + print_screen_output "Skipping man download because branch version is being used." + elif [[ ! -d $man_file_location ]];then print_screen_output "The required man directory was not detected on your system, unable to continue: $man_file_location" else if [[ $B_ROOT == 'true' ]];then @@ -3200,23 +3203,28 @@ get_parameters() 3) B_TESTING_1='true' B_TESTING_2='true' ;; - 1[0-6]|http*) + 1[0-3]|http*) if [[ $B_ALLOW_UPDATE == 'true' ]];then case $OPTARG in 10) script_self_updater "$SELF_DOWNLOAD_DEV" 'dev server' "$opt $OPTARG" + B_MAN='false' ;; 11) script_self_updater "$SELF_DOWNLOAD_BRANCH_1" 'branch one server' "$opt $OPTARG" + B_MAN='false' ;; 12) script_self_updater "$SELF_DOWNLOAD_BRANCH_2" 'branch two server' "$opt $OPTARG" + B_MAN='false' ;; 13) script_self_updater "$SELF_DOWNLOAD_BRANCH_3" 'branch three server' "$opt $OPTARG" + B_MAN='false' ;; http*) script_self_updater "$OPTARG" 'alt server' "$opt " + B_MAN='false' ;; esac else @@ -3450,9 +3458,6 @@ show_options() print_lines_basic "1" "-! 11" "Triggers an update from source branch one - if present, of course." print_lines_basic "1" "-! 12" "Triggers an update from source branch two - if present, of course." print_lines_basic "1" "-! 13" "Triggers an update from source branch three - if present, of course." - print_lines_basic "1" "-! 14" "Triggers an update from source branch four - if present, of course." - print_lines_basic "1" "-! 15" "Triggers an update from source branch BSD - if present, of course." - print_lines_basic "1" "-! 16" "Triggers an update from source branch GNUBSD - if present, of course." print_lines_basic "1" "-! " " Triggers an update from whatever server you list." print_lines_basic "1" "" "Example: inxi^-!^http://yourserver.com/testing/inxi" fi diff --git a/inxi.changelog b/inxi.changelog index 67dcddc..196b105 100644 --- a/inxi.changelog +++ b/inxi.changelog @@ -1,3 +1,29 @@ +===================================================================================== +Version: 2.3.41 +Patch Version: 00 +Script Date: 2017-10-29 +----------------------------------- +Changes: +----------------------------------- +New version, new tarball. Updated the inxi upater options, removed some legacy +branches, simplified the options. This corresponds to updates on github where +I'm finally bringing the alternate location self updater back into operational +state after a long dormant period. + +Also, and this may be of interest to some maintainers, please note, there is +a new branch: master-plain which does NOT have the gz files inxi.1.gz and +inxi.tar.gz + +If you want to avoid the big clones, you can use that branch with this command: +git clone https://github.com/smxi/inxi --branch master-plain --single-branch + +And that should only track the basic 3 files: inxi inxi.1 and inxi.changelog + +This fixes issue #94 + +----------------------------------- +-- Harald Hope - Sun, 29 Oct 2017 09:47:28 -0700 + ===================================================================================== Version: 2.3.40 Patch Version: 00