integrate IV
This commit is contained in:
parent
28dfd5fb0d
commit
ee2ca5c632
3 changed files with 37 additions and 24 deletions
10
Makefile
10
Makefile
|
@ -15,7 +15,8 @@ BINPROGS = \
|
|||
bin/build-set-helper \
|
||||
bin/basestrap \
|
||||
bin/manjaro-chroot \
|
||||
bin/fstabgen
|
||||
bin/fstabgen \
|
||||
bin/signpkg
|
||||
|
||||
SYSCONFIGFILES = \
|
||||
conf/manjaro-tools.conf
|
||||
|
@ -43,13 +44,6 @@ edit = sed -e "s|@pkgdatadir[@]|$(DESTDIR)$(PREFIX)/share/manjaro-tools|g" \
|
|||
-e "s|@sysconfdir[@]|$(DESTDIR)$(SYSCONFDIR)/manjaro-tools|g" \
|
||||
-e "s|@libdir[@]|$(DESTDIR)$(PREFIX)/lib/manjaro-tools|g"
|
||||
|
||||
# %: bin/%.in Makefile lib/common.sh
|
||||
# @echo "GEN $@"
|
||||
# @$(RM) "$@"
|
||||
# @m4 -P $@.in | $(edit) >$@
|
||||
# @chmod a-w "$@"
|
||||
# @chmod +x "$@"
|
||||
|
||||
%: %.in Makefile
|
||||
@echo "GEN $@"
|
||||
@$(RM) "$@"
|
||||
|
|
35
bin/signpkg → bin/signpkg.in
Executable file → Normal file
35
bin/signpkg → bin/signpkg.in
Executable file → Normal file
|
@ -9,27 +9,30 @@
|
|||
# GNU General Public License for more details.
|
||||
|
||||
|
||||
err() {
|
||||
ALL_OFF="\e[1;0m"
|
||||
BOLD="\e[1;1m"
|
||||
RED="${BOLD}\e[1;31m"
|
||||
local mesg=$1; shift
|
||||
printf "${RED}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
|
||||
}
|
||||
|
||||
msg() {
|
||||
ALL_OFF="\e[1;0m"
|
||||
BOLD="\e[1;1m"
|
||||
GREEN="${BOLD}\e[1;32m"
|
||||
local mesg=$1; shift
|
||||
printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
|
||||
}
|
||||
# err() {
|
||||
# ALL_OFF="\e[1;0m"
|
||||
# BOLD="\e[1;1m"
|
||||
# RED="${BOLD}\e[1;31m"
|
||||
# local mesg=$1; shift
|
||||
# printf "${RED}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
|
||||
# }
|
||||
#
|
||||
# msg() {
|
||||
# ALL_OFF="\e[1;0m"
|
||||
# BOLD="\e[1;1m"
|
||||
# GREEN="${BOLD}\e[1;32m"
|
||||
# local mesg=$1; shift
|
||||
# printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
|
||||
# }
|
||||
|
||||
if [[ -r @libdir@/functions.sh ]];then
|
||||
source @libdir@/functions.sh
|
||||
fi
|
||||
|
||||
. /etc/makepkg.conf
|
||||
|
||||
if [ ! -e "$1" ]; then
|
||||
err "Package '$1' does not exists!"
|
||||
error "Package '$1' does not exists!"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -16,6 +16,22 @@ export LANG=C
|
|||
# msg2() { out " ->" "$@";}
|
||||
# die() { error "$@"; exit 1; }
|
||||
|
||||
# err() {
|
||||
# ALL_OFF="\e[1;0m"
|
||||
# BOLD="\e[1;1m"
|
||||
# RED="${BOLD}\e[1;31m"
|
||||
# local mesg=$1; shift
|
||||
# printf "${RED}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
|
||||
# }
|
||||
#
|
||||
# msg() {
|
||||
# ALL_OFF="\e[1;0m"
|
||||
# BOLD="\e[1;1m"
|
||||
# GREEN="${BOLD}\e[1;32m"
|
||||
# local mesg=$1; shift
|
||||
# printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
|
||||
# }
|
||||
|
||||
###############################################messages##########################################################
|
||||
|
||||
# check if messages are to be printed using color
|
||||
|
|
Loading…
Reference in a new issue