blob: a768fa64d81f21276096528960adcc822458f6fc (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
--- makepkg-optimize
+++ makepkg-optimize
@@ -1862,7 +1862,7 @@
printf -- "$(gettext " -V, --version Show version information and exit")\n"
printf -- "$(gettext " --allsource Generate a source-only tarball including downloaded sources")\n"
printf -- "$(gettext " --check Run the %s function in the %s")\n" "check()" "$BUILDSCRIPT"
- printf -- "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf"
+ printf -- "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg-optimize.conf"
printf -- "$(gettext " --holdver Do not update VCS sources")\n"
printf -- "$(gettext " --key <key> Specify a key to use for %s signing instead of the default")\n" "gpg"
printf -- "$(gettext " --noarchive Do not create package archive")\n"
@@ -2010,8 +2010,8 @@
[[ -n ${PACKAGER} ]] && _PACKAGER=${PACKAGER}
[[ -n ${CARCH} ]] && _CARCH=${CARCH}
-# default config is makepkg.conf
-MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg.conf}
+# default config is makepkg-optimize.conf
+MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg-optimize.conf}
# Source the config file; fail if it is not found
if [[ -r $MAKEPKG_CONF ]]; then
@@ -2022,14 +2022,14 @@
exit 1 # $E_CONFIG_ERROR
fi
-# Source user-specific makepkg.conf overrides, but only if no override config
+# Source user-specific makepkg-optimize.conf overrides, but only if no override config
# file was specified
XDG_PACMAN_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/pacman"
-if [[ "$MAKEPKG_CONF" = "$confdir/makepkg.conf" ]]; then
- if [[ -r "$XDG_PACMAN_DIR/makepkg.conf" ]]; then
- source_safe "$XDG_PACMAN_DIR/makepkg.conf"
- elif [[ -r "$HOME/.makepkg.conf" ]]; then
- source_safe "$HOME/.makepkg.conf"
+if [[ "$MAKEPKG_CONF" = "$confdir/makepkg-optimize.conf" ]]; then
+ if [[ -r "$XDG_PACMAN_DIR/makepkg-optimize.conf" ]]; then
+ source_safe "$XDG_PACMAN_DIR/makepkg-optimize.conf"
+ elif [[ -r "$HOME/.makepkg-optimize.conf" ]]; then
+ source_safe "$HOME/.makepkg-optimize.conf"
fi
fi
|