1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-08-13 17:03:46 -04:00
Commit Graph

187 Commits

Author SHA1 Message Date
Andrew Fyfe
c6c60bcc80 scripts/makepkg.in: More clean up.
* Add ChangeLog to source package.
	* Quote references to $BUILDSCRIPT.
	* Check $srcdir isn't empty when running --noextract.
	* Check $pkgdir isn't empty when running --repackage.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-03 22:21:06 -04:00
Andrew Fyfe
b69edc1c35 scripts/makepkg.in: Improve error handling and clean up on exit.
* makepkg now runs with errexit (exit on syntax error) enabled
	  for the whole script.
	* Removed unneeded setting of errexit around build().
	* Added bash traps to catch TERM HUP INT signals.
	* Added trap to catch unhandled/unknown errors.
	* Added trap to call clean_up() when the script exits.
	* Moved call to remove_deps() into clean_up().
	* Moved -c/--clean code into clean_up().

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-03 22:19:52 -04:00
Andrew Fyfe
76fd85450e Clean up output messages for translation.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-06-03 22:19:52 -04:00
Andrew Fyfe
2fb2613ec1 scripts/makepkg.in: Rewrite check_{options,buildenv} to tidy them up.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-06-03 22:19:51 -04:00
Andrew Fyfe
3b1e67628e scripts/makepkg.in: Clean up.
* Move create_xdelta() outside of fakeroot run.
	* Clean up dep check functions.
	* Clean up extract_sources().

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-03 22:19:51 -04:00
Dan McGee
214f264bd0 Rename functions in makepkg for consistency
Add a hyphen to any function name that needs it so we are consistent across
the board.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-02 13:44:54 -04:00
Ash Milsted
111c0f71c3 makepkg: fix create_xdelta() and add warning
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-02 13:44:54 -04:00
Andrew Fyfe
40af40da4c scripts/makepkg.in: Some more clean ups.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-06-02 13:44:54 -04:00
Dan McGee
9883c157f9 makepkg: code cleanup
* Collapse some if statements (Andrew Fyfe)
* Add some E_ exit designations

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-02 13:44:54 -04:00
Andrew Fyfe
e19d7da4f9 scripts/makepkg.in: Move the remaining stages into functions.
* Move download code to download_sources()
  * Move checksum generation code to generate_checksums()
  * Move checksum check code to check_checksums()
  * Move extract source code to extract_sources()

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-02 13:44:54 -04:00
Andrew Fyfe
afd2adf1f3 scripts/makepkg.in: All calls to eval_gettext have been remove, gettext.sh is no longer needed.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-06-02 13:44:54 -04:00
Dan McGee
fb10e0c797 Drop --usesudo option and add some checks related to ASROOT
Drop the --usesudo option and use it by default if running as a non-root
user. Check the usage of the --asroot option and do not allow it to be used
as a normal user. A few other small fixes, including a typo in $confdir.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-01 13:43:41 -04:00
Andrew Fyfe
6f183cb984 scripts/makepkg.in: Clean up gen/check checksum code.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-01 11:57:10 -04:00
Andrew Fyfe
7f153b729f scripts/makepkg.in: Various clean ups.
* etc/makepkg.conf.in: Add description for xdelta.
* doc/makepkg.conf.5: Add description for xdelta.
* scripts/makepkg.in: Various clean ups.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-01 11:49:17 -04:00
Andrew Fyfe
85fbf528bb Cleaned up dependencies check functions in makepkg
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-01 11:43:31 -04:00
Andrew Fyfe
6d649473fa FS7319: Add option to disable the inclusion of abs script.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-31 18:44:00 -04:00
Andrew Fyfe
e422b71a48 Add autotool substitution for SRCEXT.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-31 14:30:41 -04:00
Dale Ogilvie
cad44221c8 Clean up variable usage in create_xdelta() and add a check for the xdelta program.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-30 23:58:22 -05:00
Dale Ogilvie
a8c552d477 Add support for creating xdeltas in makepkg.
Add xdelta option to makepkg.conf

Added xfer script to contrib.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-30 23:58:22 -05:00
Dag Odenhall
2ef1c8416f makepkg: do not retrieve sources if NOEXTRACT or REPKG set
Signed-off-by: Dag Odenhall <dag.odenhall@gmail.com>
Signed-off-by: Andrew Fyfe <Andrew Fyfe  andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-31 00:07:12 -04:00
Dan McGee
90a307bfa3 makepkg: switch applicable $startdir/dir refs to new variable names
After introducing $pkgdir and $srcdir, we can switch some lookups to
these new variables.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-31 00:02:32 -04:00
Dag Odenhall
92a14eab59 Check if pkgdir exists in create_package
Signed-off-by: Dag Odenhall <dag.odenhall@gmail.com>
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-30 23:52:22 -04:00
Dag Odenhall
6b776c82e7 makepkg: fix double occurance of word in asroot warning
Signed-off-by: Dag Odenhall <dag.odenhall@gmail.com>
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-30 23:42:23 -04:00
Dan McGee
b3535db2aa makepkg: add srcdir and pkgdir variables
We already have $startdir, so this introduces two more shorthand variables
for the most commonly accessed directories.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-30 14:32:04 -04:00
Dan McGee
f4d6efeee0 makepkg: add source package creation option
Add a new --source flag that allows creation of a source-only package.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-30 14:27:13 -04:00
Dan McGee
b6387b954f scripts: do autoconf path replacement right
This should finally get the path replacement in our scripts right. This
is the way the autoconf package itself does it and should not need much
further tweaking.

Threw in a few trailing whitespace corrections from the scripts as well.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-30 11:04:49 -04:00
Andrew Fyfe
5c41d0eb4c Substitute config directory in scripts.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-29 17:49:24 -04:00
Dan McGee
f3836ff8e8 Set paths in pacman-optimize to use configure-time paths
By setting up a few more AC_SUBST macros in configure.ac, we can fill in
paths in the scripts on the fly instead of having them in multiple places.

Other small fixes:
* Fix an oops on my last commit where I had some lines stil commented.
* Fix makepkg bug where the generated package name using PKGEXT had two
  periods (..).

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-29 17:46:20 -04:00
Dan McGee
103c7243a2 Get --help and --version options working on all scripts
Added the autoconf option std-options to the scripts/ directory, which
checks to ensure all programs have both --help and --version options. A
few things needed cleaning up to get this working. To test these types
of options, use the 'make distcheck' target.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-29 16:53:15 -04:00
Andrew Fyfe
124693af37 Switch to printf for output messages.
Using printf we can avoid haveing to use eval_gettext and the ugly escape sequances required to use it.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-28 20:27:18 +01:00
Dan McGee
7e98eac309 Add autotool-generated scripts to .gitignore
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-27 17:23:40 -04:00
Andrew Fyfe
26c32b017e Remove extra_dist from scripts/Makefile.am
This is automaticly done by autoconf.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:28 -04:00
Andrew Fyfe
94aa9aff13 Fixed typo in scripts/repo-remove.in
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:28 -04:00
Andrew Fyfe
71026af678 chmod -x scripts/*.in
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:28 -04:00
Andrew Fyfe
e9e19b7cc6 autotool scripts/updatesync
- move scripts/updatesync -> scripts/updatesync.in
	- add -V --version options to scripts/updatesync.in
	- add autotool commands to generate scripts/updatesync

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:28 -04:00
Andrew Fyfe
48946b624b autotool scripts/repo-remove
- move scripts/repo-remove -> scripts/repo-remove.in
	- add -V --version options to scripts/repo-remove.in
	- add autotool commands to generate scripts/repo-remove

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:27 -04:00
Andrew Fyfe
49eddd3feb Added copyright header to scripts/abs.in
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:27 -04:00
Andrew Fyfe
f6b0869ee5 autotool scripts/repo-add
- move scripts/repo-add -> scripts/repo-add.in
	- add -V --version options to scripts/repo-add.in
	- add autotool commands to generate scripts/repo-add

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:27 -04:00
Andrew Fyfe
a73e9a24af move parameter count check after check for help and version.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:27 -04:00
Andrew Fyfe
95720106bb autotool scripts/pacman-optimize
- move scripts/pacman-optimize -> scripts/pacman-optimize.in
	- add -V --version options to scripts/pacman-optimize.in
	- add autotool commands to generate scripts/pacman-optimize

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:27 -04:00
Andrew Fyfe
ab53ee1e7c autotool scripts/makeworld
- move scripts/makeworld to scripts/makeworld.in
	- add -V --version options to scripts/makeworld.in
	- add autotool commands to generate scripts/makeworld

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:27 -04:00
Andrew Fyfe
a2d018a954 autotool scripts/gensync
- move scripts/gensync -> scripts/gensync.in
	- add -V --version options to scripts/gensync.in
	- add autotool commands to generate scripts/gensync

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:27 -04:00
Andrew Fyfe
2b6bc5bcda autotool scripts/abs
- move scripts/abs -> scripts/abs.in
	- add -V --version options to scripts/abs.in
	- add autotool commands to generate scripts/abs

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:27 -04:00
Andrew Fyfe
c3876845b2 fix existing autotools in scripts/*
- Remove scripts/makepkg on 'make distclean'
	- scripts/makepkg.in: set myver on ./configure

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:27 -04:00
Dan McGee
aedff1c117 makepkg: fakeroot-related changes and other misc output
A few changes to undo my stupid mistake earlier wrt fakeroot checking,
and unify the output and usage of 'makepkg.conf'.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-27 17:01:49 -04:00
Andrew Fyfe
bc6ce2a190 Removed fakeroot hacks.
Removed fakeroot hacks from
	* handledeps()
	* removedeps()
	* installpackage()

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 16:10:24 -04:00
Andrew Fyfe
9ff52db3db Reduced the number of commands run inside fakeroot to the bare minimum.
Only the following functions now run inside fakeroot
	* run_build()
	* tidy_install()
	* create_package()

Added check for inproper use of '-F' option.

Added warning if makepkg is run as root. Added a new '--asroot' flag that
must be passed if you wish to run makepkg as the root user.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-27 16:06:50 -04:00
Dan McGee
c88037203b makepkg: ensure DISTCC_HOSTS variable is exported when required
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-16 13:18:19 -04:00
Dan McGee
53f2dcaa3a makepkg: a few small changes
* change "Tidying Install" message to msg instead of msg2
* Fix quoting issues in usage output
* Remove LANG and friends unsetting- this should be done in the offending
  package builds
* Check for defined $BUILDSCRIPT, since it was moved to makepkg.conf

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-14 11:55:19 -04:00
Andrew Fyfe
93b6e35bcb Cleaned up and simplified run_build().
Restore LC_ALL and LANG after running build().

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-14 11:05:58 -04:00