cleaned up out of date 'svn', changed to neutral 'source' for version control server.

This commit is contained in:
Harald Hope 2016-08-25 19:30:38 -07:00
parent 342b5611a9
commit 6f3022501c
2 changed files with 23 additions and 23 deletions

44
inxi
View file

@ -32,7 +32,7 @@
#### Version control:
#### * https://github.com/smxi/inxi
#### * git: git pull https://github.com/smxi/inxi master
#### * svn checkout url: https://github.com/smxi/inxi
#### * source checkout url: https://github.com/smxi/inxi
####
#### This program is free software; you can redistribute it and/or modify
#### it under the terms of the GNU General Public License as published by
@ -192,11 +192,11 @@
#### -! 1 - triggers default B_TESTING_1='true' to trigger some test or other
#### -! 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
#### -! 13 - triggers an update from svn branch three - if present, of course
#### -! 14 - triggers an update from svn branch four - if present, of course
#### -! 10 - triggers an update from the primary dev download server instead of source
#### -! 11 - triggers an update from source branch one - if present, of course
#### -! 12 - triggers an update from source branch two - if present, of course
#### -! 13 - triggers an update from source branch three - if present, of course
#### -! 14 - triggers an update from source branch four - if present, of course
#### -! <http://......> - Triggers an update from whatever server you list.
#### LOG FLAGS (logs to $HOME/.inxi/inxi.log with rotate 3 total)
#### -@ 8 - Basic data logging of generated data / array values
@ -1394,7 +1394,7 @@ error_handler()
error_message="unsupported testing option argument: -! $2"
;;
12)
error_message="the git branch download url: $2\nappears to be empty currently. Make sure there is an actual svn branch version\nactive before you try this again. Check https://github.com/smxi/inxi\nto verify the branch status."
error_message="the git branch download url: $2\nappears to be empty currently. Make sure there is an actual source branch version\nactive before you try this again. Check https://github.com/smxi/inxi\nto verify the branch status."
;;
13)
error_message="The -t option requires the following extra arguments (no spaces between letters/numbers):\nc m cm [required], for example: -t cm8 OR -t cm OR -t c9\n(numbers: 1-20, > 5 throttled to 5 in irc clients) You entered: $2"
@ -1651,7 +1651,7 @@ script_self_updater()
fi
# now run the error handlers on any wget failure
else
if [[ $2 == 'svn server' ]];then
if [[ $2 == 'source server' ]];then
error_handler 8 "$downloader_error"
elif [[ $2 == 'alt server' ]];then
error_handler 10 "$1"
@ -2769,7 +2769,7 @@ get_parameters()
fi
;;
U) if [[ $B_ALLOW_UPDATE == 'true' ]];then
script_self_updater "$SCRIPT_DOWNLOAD" 'svn server' "$opt"
script_self_updater "$SCRIPT_DOWNLOAD" 'source server' "$opt"
else
error_handler 17 "-$opt"
fi
@ -2879,22 +2879,22 @@ get_parameters()
script_self_updater "$SCRIPT_DOWNLOAD_DEV" 'dev server' "$opt $OPTARG"
;;
11)
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_1" 'svn: branch one server' "$opt $OPTARG"
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_1" 'branch one server' "$opt $OPTARG"
;;
12)
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_2" 'svn: branch two server' "$opt $OPTARG"
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_2" 'branch two server' "$opt $OPTARG"
;;
13)
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_3" 'svn: branch three server' "$opt $OPTARG"
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_3" 'branch three server' "$opt $OPTARG"
;;
14)
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_4" 'svn: branch four server' "$opt $OPTARG"
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_4" 'branch four server' "$opt $OPTARG"
;;
15)
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_BSD" 'svn: branch bsd server' "$opt $OPTARG"
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_BSD" 'branch bsd server' "$opt $OPTARG"
;;
16)
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_GNUBSD" 'svn: branch gnubsd server' "$opt $OPTARG"
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_GNUBSD" 'branch gnubsd server' "$opt $OPTARG"
;;
http*)
script_self_updater "$OPTARG" 'alt server' "$opt <http...>"
@ -3113,13 +3113,13 @@ show_options()
print_lines_basic "1" "-! 2" "Sets testing flag B_TESTING_2='true' to trigger testing condition 2."
print_lines_basic "1" "-! 3" "Sets flags B_TESTING_1='true' and B_TESTING_2='true'."
if [[ $B_ALLOW_UPDATE == 'true' ]];then
print_lines_basic "1" "-! 10" "Triggers an update from the primary dev download server instead of svn."
print_lines_basic "1" "-! 11" "Triggers an update from svn branch one - if present, of course."
print_lines_basic "1" "-! 12" "Triggers an update from svn branch two - if present, of course."
print_lines_basic "1" "-! 13" "Triggers an update from svn branch three - if present, of course."
print_lines_basic "1" "-! 14" "Triggers an update from svn branch four - if present, of course."
print_lines_basic "1" "-! 15" "Triggers an update from svn branch BSD - if present, of course."
print_lines_basic "1" "-! 16" "Triggers an update from svn branch GNUBSD - if present, of course."
print_lines_basic "1" "-! 10" "Triggers an update from the primary dev download server instead of source server."
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" "-! " "<http://......> Triggers an update from whatever server you list."
print_lines_basic "1" "" "Example: inxi^-!^http://yourserver.com/testing/inxi"
fi

2
inxi.1
View file

@ -603,7 +603,7 @@ You may be asked to run the inxi debugger tool which will upload a data dump of
system files for use in debugging inxi. These data dumps are very important since
they provide us with all the real system data inxi uses to parse out its report.
.TP
inxi main website/svn/wiki, file an issue report:
inxi main website/source/wiki, file an issue report:
.I https://github.com/smxi/inxi/issues
.TP
post on inxi developer forums: