Replace individual scripts with master 'guix' script.

* scripts/guix.in: New script.

* Makefile.am (bin_SCRIPTS): Add 'scripts/guix'.  Remove 'guix-build',
  'guix-download', 'guix-import', 'guix-package', and 'guix-gc'.

  (MODULES): Add 'guix/scripts/build.scm', 'guix/scripts/download.scm',
  'guix/scripts/import.scm', 'guix/scripts/package.scm', and
  'guix/scripts/gc.scm'.

* configure.ac (AC_CONFIG_FILES): Add 'scripts/guix'.  Remove 'guix-build',
  'guix-download', 'guix-import', 'guix-package', and 'guix-gc'.

* guix-build.in, guix-download.in, guix-gc.in, guix-import.in,
  guix-package.in: Remove shell script boilerplate.  Move to guix-COMMAND.in
  to guix/scripts/COMMAND.scm.  Rename module from (guix-COMMAND) to
  (guix scripts COMMAND).  Change "guix-COMMAND" to "guix COMMAND" in
  usage help string.

* pre-inst-env.in: Add "@abs_top_builddir@/scripts" to the front of $PATH.
  Export $GUIX_UNINSTALLED.

* tests/guix-build.sh, tests/guix-daemon.sh, tests/guix-download.sh,
  tests/guix-gc.sh, tests/guix-package.sh: Use "guix COMMAND" instead of
  "guix-COMMAND".

* doc/guix.texi: Replace all occurrences of "guix-COMMAND" with
  "guix COMMAND".

* po/POTFILES.in: Update.
This commit is contained in:
Mark H Weaver 2013-02-14 04:15:25 -05:00
parent 040860152e
commit e49951eb3e
18 changed files with 227 additions and 208 deletions

View file

@ -17,20 +17,20 @@
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
#
# Test the `guix-download' command-line utility.
# Test the `guix download' command-line utility.
#
guix-download --version
guix download --version
# Make sure it fails here.
if guix-download http://does.not/exist
if guix download http://does.not/exist
then false; else true; fi
if guix-download unknown://some/where;
if guix download unknown://some/where;
then false; else true; fi
if guix-download not/a/uri;
if guix download not/a/uri;
then false; else true; fi
# This one should succeed.
guix-download "file://$abs_top_srcdir/README"
guix download "file://$abs_top_srcdir/README"