From 056d2b655026d3f011d162b845b56fe819605262 Mon Sep 17 00:00:00 2001 From: Harald Hope Date: Thu, 20 Aug 2015 16:32:57 -0700 Subject: [PATCH] New version, new tarball: Changes: updated inxi updaters to use github locations. I will do this commit once for googlecode, and once for github, after that, all commits will go only to github. inxi moves to github, despite my dislike of for profit source repos, and git, I decided that I just don't have the time or energy to do it right, so I'm going to use github. The project is already moved, though I have left inxi up for the time being on code.google.com/p/inxi until I move the wiki to http://smxi.org Everything is pretty much the same, the project url is: https://github.com/smxi/inxi The direct download link for the gz is: https://github.com/smxi/inxi/raw/master/inxi.tar.gz git pull is: git pull https://github.com/smxi/inxi master svn checkout url: https://github.com/smxi/inxi And that's about it. --- inxi | 36 ++++++++++++++++++++++-------------- inxi.1 | 9 +++++---- inxi.changelog | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 18 deletions(-) diff --git a/inxi b/inxi index c65bb8f..4b7b13d 100755 --- a/inxi +++ b/inxi @@ -1,8 +1,8 @@ #!/usr/bin/env bash ######################################################################## #### Script Name: inxi -#### Version: 2.2.27 -#### Date: 2015-08-02 +#### Version: 2.2.28 +#### Date: 2015-08-20 #### Patch Number: 00 ######################################################################## #### SPECIAL THANKS @@ -25,9 +25,14 @@ #### Steven Barrett (aka: damentz) - usb audio patch; swap percent used patch #### Jarett.Stevens - dmidecde -M patch for older systems with the /sys #### -#### Current script home page/wiki/svn: http://inxi.googlecode.com +#### Current script home page/wiki/git: https://github.com/smxi/inxi +#### Documentation/wiki pages will move to http://smxi.org soon. #### Script forums: http://techpatterns.com/forums/forum-33.html #### IRC support: irc.oftc.net channel #smxi +#### Version control: +#### * https://github.com/smxi/inxi +#### * git: git pull https://github.com/smxi/inxi master +#### * svn 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 @@ -45,6 +50,9 @@ #### If you don't understand what Free Software is, please read (or reread) #### this page: http://www.gnu.org/philosophy/free-sw.html ######################################################################## + +#### +#### PACKAGE NAME NOTES #### * Package names in (...) are the Debian Squeeze package name. Check your #### distro for proper package name by doing this: which #### then find what package owns that application file. Or run --recommends @@ -454,19 +462,19 @@ ALTERNATE_WEATHER_LOCATION='' # weather alternate location LOG_FILE="$SCRIPT_DATA_DIR/inxi.log" LOG_FILE_1="$SCRIPT_DATA_DIR/inxi.1.log" LOG_FILE_2="$SCRIPT_DATA_DIR/inxi.2.log" -MAN_FILE_DOWNLOAD='http://inxi.googlecode.com/svn/trunk/inxi.1.gz' +MAN_FILE_DOWNLOAD='https://github.com/smxi/inxi/raw/master/inxi.1.gz' MAN_FILE_LOCATION='/usr/share/man/man1' SCRIPT_NAME='inxi' SCRIPT_PATCH_NUMBER='' SCRIPT_PATH='' #filled-in in Main SCRIPT_VERSION_NUMBER="" #filled-in in Main -SCRIPT_DOWNLOAD='http://inxi.googlecode.com/svn/trunk/' -SCRIPT_DOWNLOAD_BRANCH_1='http://inxi.googlecode.com/svn/branches/one/' -SCRIPT_DOWNLOAD_BRANCH_2='http://inxi.googlecode.com/svn/branches/two/' -SCRIPT_DOWNLOAD_BRANCH_3='http://inxi.googlecode.com/svn/branches/three/' -SCRIPT_DOWNLOAD_BRANCH_4='http://inxi.googlecode.com/svn/branches/four/' -SCRIPT_DOWNLOAD_BRANCH_BSD='http://inxi.googlecode.com/svn/branches/bsd/' -SCRIPT_DOWNLOAD_BRANCH_GNUBSD='http://inxi.googlecode.com/svn/branches/gnubsd/' +SCRIPT_DOWNLOAD='https://github.com/smxi/inxi/raw/master/' +SCRIPT_DOWNLOAD_BRANCH_1='https://github.com/smxi/inxi/raw/one/' +SCRIPT_DOWNLOAD_BRANCH_2='https://github.com/smxi/inxi/raw/two/' +SCRIPT_DOWNLOAD_BRANCH_3='https://github.com/smxi/inxi/raw/three/' +SCRIPT_DOWNLOAD_BRANCH_4='https://github.com/smxi/inxi/raw/four/' +SCRIPT_DOWNLOAD_BRANCH_BSD='https://github.com/smxi/inxi/raw/bsd/' +SCRIPT_DOWNLOAD_BRANCH_GNUBSD='https://github.com/smxi/inxi/raw/gnubsd/' SCRIPT_DOWNLOAD_DEV='http://smxi.org/test/' # note, you can use any ip url here as long as it's the only line on the output page. # Also the ip address must be the last thing on that line. @@ -1357,7 +1365,7 @@ error_handler() error_message="unsupported testing option argument: -! $2" ;; 12) - error_message="the svn 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 http://code.google.com/p/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 svn 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" @@ -1631,7 +1639,7 @@ debug_data_collector() local xiin_app='' xiin_data_file='' xiin_download='' error='' b_run_xiin='false' local debug_data_dir='' bsd_string='' xorg_d_files='' xorg_file='' a_distro_ids='' local completed_gz_file='' xiin_file='xiin.py' ftp_upload='ftp.techpatterns.com/incoming' - local xiin_url="http://inxi.googlecode.com/svn/branches/xiin/$xiin_file" + local xiin_url="https://github.com/smxi/inxi/raw/xiin/$xiin_file" local Line='-------------------------' root_string='' local start_directory=$( pwd ) local host=$( tr '[A-Z]' '[a-z]' <<< "$HOSTNAME" ) @@ -3188,7 +3196,7 @@ print_version_info() if [[ -n $script_symbolic_start ]];then print_screen_output "Started via symbolic link: $script_symbolic_start" fi - print_lines_basic "0" "" "Website:^http://inxi.googlecode.com" + print_lines_basic "0" "" "Website:^https://github.com/smxi/inxi^or^http://smxi.org/" print_lines_basic "0" "" "IRC:^irc.oftc.net channel:^#smxi" print_lines_basic "0" "" "Forums:^http://techpatterns.com/forums/forum-33.html" print_screen_output " " diff --git a/inxi.1 b/inxi.1 index 548b718..a1d768c 100755 --- a/inxi.1 +++ b/inxi.1 @@ -1,4 +1,4 @@ -.TH INXI 1 "2015\-05\-30" inxi "inxi manual" +.TH INXI 1 "2015\-08\-20" inxi "inxi manual" .SH NAME inxi \- Command line system information script for console and IRC .SH SYNOPSIS @@ -570,7 +570,7 @@ system files for use in debugging inxi. These data dumps are very important sinc 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: -.I http://code.google.com/p/inxi/issues/list +.I https://github.com/smxi/inxi/issues .TP post on inxi developer forums: .I http://techpatterns.com/forums/forum\-32.html @@ -579,7 +579,8 @@ You can also visit .I irc.oftc.net \fRchannel:\fI #smxi to post issues. .SH HOMEPAGE -.I http://code.google.com/p/inxi +.I https://github.com/smxi/inxi +.I http://smxi.org/ .SH AUTHOR AND CONTRIBUTORS TO CODE .B inxi is is a fork of locsmif's largely unmaintained yet very clever, infobash script. @@ -587,7 +588,7 @@ is is a fork of locsmif's largely unmaintained yet very clever, infobash script. Original infobash author and copyright holder: Copyright (C) 2005\-2007 Michiel de Boer a.k.a. locsmif -inxi version: Copyright (C) 2008\-13 Scott Rogers & Harald Hope +inxi version: Copyright (C) 2008\-15 Scott Rogers & Harald Hope Further fixes (listed as known): Horst Tritremmel diff --git a/inxi.changelog b/inxi.changelog index 5144feb..4136eab 100755 --- a/inxi.changelog +++ b/inxi.changelog @@ -1,3 +1,44 @@ +===================================================================================== +Version: 2.2.28 +Patch Version: 00 +Script Date: 2015-08-20 +----------------------------------- +Changes: +----------------------------------- +New version, new tarball: +Changes: updated inxi updaters to use github locations. + +I will do this commit once for googlecode, and once for github, after that, +all commits will go only to github. + +inxi moves to github, despite my dislike of for profit source repos, and git, +I decided that I just don't have the time or energy to do it right, so I'm going +to use github. + +The project is already moved, though I have left inxi up for the time being on +code.google.com/p/inxi until I move the wiki to http://smxi.org + +Everything is pretty much the same, the project url is: + +https://github.com/smxi/inxi + +The direct download link for the gz is: + +https://github.com/smxi/inxi/raw/master/inxi.tar.gz + +git pull is: + +git pull https://github.com/smxi/inxi master + +svn checkout url: + +https://github.com/smxi/inxi + +And that's about it. + +----------------------------------- +-- Harald Hope - Thu, 20 Aug 2015 16:01:32 -0700 + ===================================================================================== Version: 2.2.27 Patch Version: 00