Hello community, here is the log from the commit of package tumbleweed-cli for openSUSE:Factory checked in at 2017-11-19 11:13:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tumbleweed-cli (Old) and /work/SRC/openSUSE:Factory/.tumbleweed-cli.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tumbleweed-cli" Sun Nov 19 11:13:33 2017 rev:2 rq:542739 version:0.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/tumbleweed-cli/tumbleweed-cli.changes 2017-07-08 12:33:06.665357313 +0200 +++ /work/SRC/openSUSE:Factory/.tumbleweed-cli.new/tumbleweed-cli.changes 2017-11-19 11:13:54.397884471 +0100 @@ -1,0 +2,31 @@ +Sat Nov 18 02:50:31 UTC 2017 - [email protected] + +- Update to version 0.2.0: + * Update URL to point at S3 hosting location in lieu of openSUSE host. + * switch(): validate version against list. + * Add README.md covering installation and common usage. + * Include target in status help description. + * uninit(): remove $VAR_FILE as well. + * Rename history file to match new variable name format. + * Rename config() to variable() since more appropriate. + * Rework to utilize libzypp(repovarexpand) = 1 variable support. + * status(): for correctness call target() instead of config(). + * init(): prevent double initialization. + * init(): history_init() before config() since it appends to history. + * Sort command in processing case. + * Complete rework switch and revert for new config paradigm. + * Use a better argument format for switch documentation. + * Expose history command. + * Provide tumbleweed_prompt(). + * Rework update/upgrade command processing. + * Add target to status and own command. + * Rename version command to installed, but provide version alias. + * Drop list-repos command. + * Repurpose revert as uninit. + * Update target URL to production value. + * Implement basis for config based version updates. + * Provide tumbleweed_sudo() and utilize in tumbleweed_revert(). + * Add COPYING. +- Add explicit requirement on libzypp(repovarexpand) >= 1. + +------------------------------------------------------------------- Old: ---- tumbleweed-cli-0.1.0.tar.xz New: ---- tumbleweed-cli-0.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tumbleweed-cli.spec ++++++ --- /var/tmp/diff_new_pack.psUvUC/_old 2017-11-19 11:14:00.529660904 +0100 +++ /var/tmp/diff_new_pack.psUvUC/_new 2017-11-19 11:14:00.533660759 +0100 @@ -1,7 +1,7 @@ # # spec file for package tumbleweed-cli # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: tumbleweed-cli -Version: 0.1.0 +Version: 0.2.0 Release: 0 Summary: Command line interface for interacting with tumbleweed snapshots License: GPL-2.0 @@ -31,6 +31,7 @@ Requires: grep Requires: sudo Requires: zypper +Requires: libzypp(repovarexpand) >= 1 %description tumbleweed-cli provides a command line interface for interacting with tumbleweed ++++++ _service ++++++ --- /var/tmp/diff_new_pack.psUvUC/_old 2017-11-19 11:14:00.565659592 +0100 +++ /var/tmp/diff_new_pack.psUvUC/_new 2017-11-19 11:14:00.565659592 +0100 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> <param name="versionformat">@PARENT_TAG@</param> - <param name="revision">refs/tags/0.1.0</param> + <param name="revision">refs/tags/0.2.0</param> <param name="url">https://github.com/boombatower/tumbleweed-cli.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.psUvUC/_old 2017-11-19 11:14:00.589658717 +0100 +++ /var/tmp/diff_new_pack.psUvUC/_new 2017-11-19 11:14:00.589658717 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/boombatower/tumbleweed-cli.git</param> - <param name="changesrevision">30d5d08fa1cd28ead79c9241042922bf2b16fb92</param> + <param name="changesrevision">46bfa0ba8c8b690d1f19d003cc112b6d560926dd</param> </service> </servicedata> ++++++ tumbleweed-cli-0.1.0.tar.xz -> tumbleweed-cli-0.2.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tumbleweed-cli-0.1.0/COPYING new/tumbleweed-cli-0.2.0/COPYING --- old/tumbleweed-cli-0.1.0/COPYING 1970-01-01 01:00:00.000000000 +0100 +++ new/tumbleweed-cli-0.2.0/COPYING 2017-11-18 04:10:58.000000000 +0100 @@ -0,0 +1,345 @@ +Note that the only valid version of the GPL as far as the tumbleweed-cli +is concerned is _this_ particular version of the license (ie v2, not +v2.2 or v3.x or whatever), unless explicitly otherwise stated. + +---------------------------------------- + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/> + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {description} + Copyright (C) {year} {fullname} + + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + {signature of Ty Coon}, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tumbleweed-cli-0.1.0/README.md new/tumbleweed-cli-0.2.0/README.md --- old/tumbleweed-cli-0.1.0/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/tumbleweed-cli-0.2.0/README.md 2017-11-18 04:10:58.000000000 +0100 @@ -0,0 +1,64 @@ +# tumbleweed-cli + +Command line interface for interacting with Tumbleweed snapshots. + +## Installation + +```bash +zypper addrepo -p 105 http://download.opensuse.org/repositories/home:boombatower:snapshot/openSUSE_Tumbleweed/ tw-snapshot +zypper in tumbleweed-cli +``` + +## Usage + +See `tumbleweed --help` for reference. To get started utilizing snapshots: + +```bash +tumbleweed init +``` + +The repos can be verified by ensuring that the URLs contain a snapshot version. + +```bash +zypper lr -EUP +``` + +`zypper refresh && zypper dup` will no longer be the method for updating as the +repos will point to static snapshot versions. All other zypper operations will +behave the same. At any point `tumbleweed uninit` will return the repositories +to their original state. + +Some common examples are as follows. + +```bash +# present latest, target, and installed snapshot versions +tumbleweed status + +# update to latest +tumbleweed update + +# target 1234 snapshot and install +tumbleweed switch --install 1234 + +# list available snapshots +tumbleweed list + +# target previous snapshot and install +tumbleweed revert --install + +# list history of snapshots targeted +tumbleweed history +``` + +To operate more manually, the following is equivalent to `tumbleweed update`. + +```bash +# switch to latest +tumbleweed switch + +zypper ref +zypper dup +``` + +The repo URLs are effectively the only part of the `libzypp` configuration that +is being changed. This keeps the workflow changes to a minimum. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tumbleweed-cli-0.1.0/tumbleweed new/tumbleweed-cli-0.2.0/tumbleweed --- old/tumbleweed-cli-0.1.0/tumbleweed 2016-12-02 18:25:30.000000000 +0100 +++ new/tumbleweed-cli-0.2.0/tumbleweed 2017-11-18 04:10:58.000000000 +0100 @@ -1,14 +1,112 @@ #!/usr/bin/env bash VERSION="development" -URL="http://snapshot.tumbleweed.boombatower.com:13372"; -URL_REPLACE="http://download.opensuse.org"; +URL="http://download.tumbleweed.boombatower.com"; +CONFIG_DIR="/etc/zypp" +VARS_DIR="$CONFIG_DIR/vars.d" +VAR_NAME="snapshotVersion" +VAR_FILE="$VARS_DIR/$VAR_NAME" +SNAPSHOT_HISTORY="$VARS_DIR/.snapshotVersion.history" REPOS_DIR="/etc/zypp/repos.d" +# REPO_PATTERN="http://download.opensuse.org/(?:[^u][^/]+/)?tumbleweed/[^$]+" +# Disable matching debug and source URLs for the time being. +REPO_PATTERN="http://download.opensuse.org/tumbleweed/[^$]+"; + +tumbleweed_sudo() +{ + # Obtain sudo before issuing real commands to avoid half completion. + if ! sudo cat /dev/null ; then + echo "unable to obtain sudo" + exit 1 + fi +} + +tumbleweed_inited() +{ + if [ -f "$VAR_FILE" ] ; then + return 0 + fi + return 1 +} + +tumbleweed_init() +{ + if tumbleweed_inited && [ "$force" != "1" ] ; then + echo "already initialized" + return + fi + + tumbleweed_sudo + tumbleweed_history_init + tumbleweed_variable "$(tumbleweed_installed)" + tumbleweed_repo_init +} + +tumbleweed_variable() +{ + if [ $# -eq 1 ] ; then + local version="$1" + echo "$version" | sudo tee "$VAR_FILE" > /dev/null + if [ $? -ne 0 ] ; then + echo "failed to set version to $version in $VARS_DIR/$VAR_NAME" + exit 1 + fi + tumbleweed_history "$version" + else + cat "$VAR_FILE" + fi +} + +tumbleweed_repo_init() +{ + if [ ! -d "$REPOS_DIR/.previous" ] ; then + sudo mkdir "$REPOS_DIR/.previous" + fi + + local files=($(grep -lP "$REPO_PATTERN" "$REPOS_DIR"/*)) + local file + for file in ${files[@]} ; do + echo "backup $file" + sudo cp --backup=numbered "$file" "$REPOS_DIR/.previous/$(basename "$file")" + sudo sed -i -r 's|(name=.*)|\1 ($snapshotVersion)|' "$file" + sudo sed -i -r 's|(baseurl=).*tumbleweed/(.*)|\1'$URL'/$snapshotVersion/\2|' "$file" + done +} + +tumbleweed_history_init() +{ + if [ ! -f "$SNAPSHOT_HISTORY" ] ; then + # Need an actual line for sed insert to work. + echo | sudo tee "$SNAPSHOT_HISTORY" > /dev/null + fi +} + +tumbleweed_history() +{ + if [ $# -eq 1 ] ; then + if [ "$(head -n1 "$SNAPSHOT_HISTORY")" != "$1" ] ; then + sudo sed -i "1i$1" "$SNAPSHOT_HISTORY" + fi + else + # Exclude empty lines necessary for data structure. + grep -v -e '^$' "$SNAPSHOT_HISTORY" + fi +} + +tumbleweed_history_pop() +{ + if [ $# -eq 1 ] ; then + sudo sed -i "1d" "$SNAPSHOT_HISTORY" + else + head -n2 "$SNAPSHOT_HISTORY" | tail -n1 + fi +} tumbleweed_status() { echo "latest : $(tumbleweed_latest)" - echo "installed: $(tumbleweed_version)" + echo "target : $(tumbleweed_target)" + echo "installed: $(tumbleweed_installed)" } tumbleweed_latest() @@ -16,7 +114,12 @@ curl --silent "$URL/latest" } -tumbleweed_version() +tumbleweed_target() +{ + tumbleweed_variable +} + +tumbleweed_installed() { cat /etc/os-release | grep -oP "VERSION_ID=\"\K(\d+)" } @@ -32,61 +135,55 @@ install=1 } +tumbleweed_prompt() +{ + echo -n "$1 [y/n] (y): " + local response + read response + if [ "$response" != "" ] && [ "$response" != "y" ] ; then + echo "exiting" + exit 1 + fi +} + tumbleweed_switch() { if [ $# -eq 1 ] ; then local version="$1" + if ! tumbleweed_list | grep -Fx "$version" > /dev/null ; then + echo "invalid version $version, not in available list" + return + fi else local version="$(tumbleweed_latest)" echo "choosing latest version" fi - if [ "$version" == "$(tumbleweed_version)" ] && [ "$force" != "1" ] ; then + if [ "$version" == "$(tumbleweed_target)" ] && [ "$force" != "1" ] ; then echo "already on $version" exit fi - echo "switching from $(tumbleweed_version) to $version" - tumbleweed_list-repos "$version" > /dev/null - if [ ${#repo_alias[@]} -eq 0 ] ; then - echo "no snapshottable repos found" - exit 1 - fi - - # Prompt for confirmation. - echo -n "switch ${#repo_alias[@]} repos (${repo_alias[@]})? [y/n] (y): " - read response - if [ "$response" != "" ] && [ "$response" != "y" ] ; then - echo "exiting" - exit 1 - fi + tumbleweed_prompt "switching from $(tumbleweed_target) to $version?" + tumbleweed_sudo + tumbleweed_variable "$version" +} - # Obtain sudo before issuing real commands to avoid half completion. - if ! sudo cat /dev/null ; then - echo "unable to obtain sudo" +tumbleweed_revert() +{ + local version="$(tumbleweed_history_pop)" + if [ "$version" == "" ] ; then + echo "no previous version in history" exit 1 fi - if [ ! -d "$REPOS_DIR/.previous" ] ; then - sudo mkdir "$REPOS_DIR/.previous" - fi - - local i=0 - while [ $i -lt ${#repo_alias[@]} ] ; do - local files=($(grep -l "\[${repo_alias[$i]}\]" "$REPOS_DIR"/*)) - if [ ${#files[@]} -eq 1 ] ; then - local file="${files[0]}" - sudo cp "$file" "$REPOS_DIR/.previous/$(basename "$file")" - sudo sed -i "s|baseurl=.*|baseurl=${repo_url[$i]}|" "$file" - echo "switched ${repo_alias[$i]}" - else - echo "failed to switched ${repo_alias[$i]}" - fi - ((i++)) - done + tumbleweed_prompt "switching from $(tumbleweed_target) to $version?" + tumbleweed_sudo + tumbleweed_history_pop "indeed" + tumbleweed_variable "$version" } -tumbleweed_revert() +tumbleweed_uninit() { if [ ! -d "$REPOS_DIR/.previous" ] ; then echo "nothing to revert" @@ -102,34 +199,10 @@ exit 1 fi + tumbleweed_sudo sudo mv "$REPOS_DIR/.previous"/* $REPOS_DIR/ sudo rm -r "$REPOS_DIR/.previous" -} - -tumbleweed_list-repos() -{ - local current="$(tumbleweed_version)" - local replace="$1" - local IFS=$'|\n' - # Include disabled repos since they may be enabled outside of this tool. - local parts=($(zypper lr -U | grep -P "(?:http://download.opensuse.org/(?:[^u][^/]+/)?tumbleweed|$URL)")) - local i=0 - repo_alias=() - repo_url=() - while [ $i -lt ${#parts[@]} ] ; do - local alias="${parts[$i+1]//[[:blank:]]/}" - local url="${parts[$i+6]//[[:blank:]]/}" - - # Replace either current snapshot or non-snapshotted URL. - url="${url/$current/$replace}" - url="${url/$URL_REPLACE/$URL\/$replace}" - - repo_alias+=($alias) - repo_url+=($url) - - echo "$url ($alias)" - ((i+=7)) - done + sudo rm "$VAR_FILE" } tumbleweed_install() @@ -150,14 +223,17 @@ -h, --help Display this message and exit Commands: -status Show status information (latest and current snapshots). +init Initialize repos to point to snapshot repos. +status Show status information (latest, target, and installed). latest Show latest snapshot available. -version Show current installed snapshot. +installed|version Show current installed snapshot. +target Show the target of the repositories. list List available snapshots. +history List history of snapshots targetted. update|upgrade Switch to and install the latest available snapshot. -switch [version] Switch to a new snapshot (none for latest). +switch %version Switch to a new snapshot (none for latest). revert Revert to the previous snapshot or repo state. -list-repos List snapshottable repo URLs for the current snapshot. +uninit Revert back to a snapshotless repository setup. _EOF_ } @@ -168,17 +244,15 @@ --force) force=1 ; ;; --install) install=1 ; ;; -h|--help) command="usage" ; ;; - status|latest|version|list|revert) + history|init|installed|latest|list|revert|status|target|uninit|update) command="$1" ; ;; - update|upgrade) + version) + command="installed" ; ;; + upgrade) command="update" ; ;; switch) command="$1" ; args_expected=1 ; ;; - list-repos) - command="$1" - args=("$(tumbleweed_version)") - ;; -*) echo "unknown option $1" ; exit 1 ; ;; *) if [ $args_expected -eq 0 ] ; then @@ -198,6 +272,12 @@ shift done +if [ "$command" != "usage" ] && [ "$command" != "init" ] && ! tumbleweed_inited ; then + echo "repositories have not been initialized for snapshots" + echo " Try $0 init" + exit 1 +fi + tumbleweed_$command ${args[@]} if [ "$install" == "1" ] ; then
