fixed bug #127

improved make message look'n'feel
fixed a typo in a make message
parent e96eb3e5
......@@ -10,7 +10,8 @@ register_schemas () {
;;
*remove )
GCONF_CONFIG_SOURCE=xml:merged:/etc/gconf/gconf.xml.defaults \
gconftool-2 --makefile-uninstall-rule data/bashstyle.schemas >/dev/null
;;
esac
......@@ -32,18 +33,18 @@ gconfd_kill () {
remove_old_wrappers () {
rm -f $DESTDIR/$PREFIX/share/bashstyle-ng/rc/bin/{rm,mv,cp,shred}
}
post_install () {
if [[ ! $DISABLE_POSTINSTALL ]]; then
echo -e "${MAGENTA} [04/04] Executing post-installation tasks."
echo -e "\t${WHITE}+ ${MAGENTA}[04/04]${WHITE} post-installation tasks"
register_schemas --install
update_cache
gconfd_kill
remove_old_wrappers
echo
gconfd_kill
fi
......@@ -53,7 +54,7 @@ pre_remove () {
if [[ ! $DISABLE_POSTREMOVE ]]; then
echo -e "${MAGENTA} [01/02] Executing pre-removal tasks."
echo -e "${WHITE}+ ${MAGENTA}[01/02] pre-removal tasks"
register_schemas --remove
fi
......
......@@ -6,10 +6,10 @@ TERM_NUM=${#TERM_FILES[@]}
generate_terminfo () {
local CUR_NUM=1
echo -e "${YELLOW} [01/03] Generating terminfo files (${TERM_FILES[@]})."
echo -e "\t${WHITE}+ ${YELLOW}[01/03]${WHITE} terminfos${CYAN} (${TERM_FILES[@]})"
for term in ${TERM_FILES[@]}; do
if [[ $VERBOSE == "true" ]]; then
echo -e "${SMOOTHBLUE}\t[$CUR_NUM/$TERM_NUM] ${term}"
echo -e "\t${WHITE} * ${SMOOTHBLUE}[$CUR_NUM/$TERM_NUM]${WHITE} ${term}"
local CUR_NUM=$(($CUR_NUM+1))
fi
tic data/terminfo/${term}.terminfo -o data/terminfo/
......
......@@ -11,7 +11,7 @@ NXRC_NUM=${#NXRC_LANGS[@]}
generate_pot () {
echo -e "${YELLOW} [01/01] Generating .pot files."
echo -e "\t${WHITE}+ ${YELLOW}[01/01]${WHITE} .pot files"
intltool-extract --type=gettext/glade ui/bashstyle7.ui >/dev/null
xgettext -L python --keyword=_ --keyword=N_ --output=i18n/bs-ng.pot ui/bs-ng.py ui/bashstyle7.ui.h >/dev/null
......@@ -24,20 +24,20 @@ generate_pot () {
update_po () {
local CUR_NUM=1
echo -e "${YELLOW} [01/02] Updating UI-po files (${BSNG_LANGS[@]})."
echo -e "\t${WHITE}+ ${YELLOW}[01/02]${WHITE} UI .po files${CYAN} (${BSNG_LANGS[@]})"
for lang in ${BSNG_LANGS[@]}; do
if [[ $VERBOSE == "true" ]]; then
echo -e "${SMOOTHBLUE}\t[$CUR_NUM/$BSNG_NUM] ${lang}"
echo -e "\t${WHITE} * ${SMOOTHBLUE}[$CUR_NUM/$BSNG_NUM]${WHITE} ${lang}"
local CUR_NUM=$(($CUR_NUM+1))
fi
msgmerge -q -o i18n/${lang}/bs-ng.po i18n/${lang}/bs-ng.po i18n/bs-ng.pot >/dev/null
done
local CUR_NUM=1
echo -e "${YELLOW} [02/02] Updating Wizard-po files (${WIZARD_LANGS[@]})."
echo -e "\t${WHITE}+ ${YELLOW}[02/02] Wizard .po files${CYAN} (${WIZARD_LANGS[@]})"
for lang in ${WIZARD_LANGS[@]}; do
if [[ $VERBOSE == "true" ]]; then
echo -e "${SMOOTHBLUE}\t[$CUR_NUM/$WIZARD_NUM] ${lang}"
echo -e "\t${WHITE} * ${SMOOTHBLUE}[$CUR_NUM/$WIZARD_NUM]${WHITE} ${lang}"
local CUR_NUM=$(($CUR_NUM+1))
fi
msgmerge -q -o i18n/${lang}/bs-ng-wizard.po i18n/${lang}/bs-ng-wizard.po \
......@@ -45,10 +45,10 @@ update_po () {
done
local CUR_NUM=1
echo -e "${YELLOW} [02/02] Updating NX-po files (${NXRC_LANGS[@]})."
echo -e "\t${WHITE}+ ${YELLOW}[02/02]${WHITE} NX-RC .po files${CYAN} (${NXRC_LANGS[@]})"
for lang in ${NXRC_LANGS[@]}; do
if [[ $VERBOSE == "true" ]]; then
echo -e "${SMOOTHBLUE}\t[$CUR_NUM/$NXRC_NUM] ${lang}"
echo -e "\t${WHITE} * ${SMOOTHBLUE}[$CUR_NUM/$NXRC_NUM]${WHITE} ${lang}"
local CUR_NUM=$(($CUR_NUM+1))
fi
msgmerge -q -o i18n/${lang}/nx-rc.po i18n/${lang}/nx-rc.po i18n/nx-rc.pot >/dev/null
......@@ -59,30 +59,30 @@ update_po () {
generate_mo () {
local CUR_NUM=1
echo -e "${YELLOW} [02/03] Generating UI-mo files (${BSNG_LANGS[@]})."
echo -e "\t${WHITE}+ ${YELLOW}[02/03]${WHITE} UI .mo files${CYAN} (${BSNG_LANGS[@]})"
for lang in ${BSNG_LANGS[@]}; do
if [[ $VERBOSE == "true" ]]; then
echo -e "${SMOOTHBLUE}\t[$CUR_NUM/$BSNG_NUM] ${lang}"
echo -e "\t${WHITE} * ${SMOOTHBLUE}[$CUR_NUM/$BSNG_NUM]${WHITE} ${lang}"
local CUR_NUM=$(($CUR_NUM+1))
fi
msgfmt --output-file=i18n/${lang}/bs-ng.mo i18n/${lang}/bs-ng.po
done
local CUR_NUM=1
echo -e "${YELLOW} [02/03] Generating Wizard-mo files (${WIZARD_LANGS[@]})."
echo -e "\t${WHITE}+ ${YELLOW}[02/03]${WHITE} Wizard .mo files${CYAN} (${WIZARD_LANGS[@]})"
for lang in ${WIZARD_LANGS[@]}; do
if [[ $VERBOSE == "true" ]]; then
echo -e "${SMOOTHBLUE}\t[$CUR_NUM/$WIZARD_NUM] ${lang}"
echo -e "\t${WHITE} * ${SMOOTHBLUE}[$CUR_NUM/$WIZARD_NUM]${WHITE} ${lang}"
local CUR_NUM=$(($CUR_NUM+1))
fi
msgfmt --output-file=i18n/${lang}/bs-ng-wizard.mo i18n/${lang}/bs-ng-wizard.po
done
local CUR_NUM=1
echo -e "${YELLOW} [03/03] Generating NX-mo files (${NXRC_LANGS[@]})."
echo -e "\t${WHITE}+ ${YELLOW}[03/03]${WHITE} NX-RC .mo files${CYAN} (${NXRC_LANGS[@]})"
for lang in ${NXRC_LANGS[@]}; do
if [[ $VERBOSE == "true" ]]; then
echo -e "${SMOOTHBLUE}\t[$CUR_NUM/$NXRC_NUM] ${lang}"
echo -e "\t${WHITE} * ${SMOOTHBLUE}[$CUR_NUM/$NXRC_NUM]${WHITE} ${lang}"
local CUR_NUM=$(($CUR_NUM+1))
fi
msgfmt --output-file=i18n/${lang}/nx-rc.mo i18n/${lang}/nx-rc.po
......
......@@ -19,7 +19,7 @@ inst ()
DEST=${1/*:}
if [[ $VERBOSE == "true" ]]; then
echo -e "${SMOOTHBLUE}\t[$2/$3] ${FILE}"
echo -e "\t${WHITE} * ${SMOOTHBLUE}[$2/$3]${WHITE} ${FILE}"
fi
install -m${MODE} ${FILE} ${DESTDIR}${DEST}
......@@ -51,7 +51,7 @@ install_bsng () {
local CUR_NUM=1
fi
echo -e "${GREEN} [02/04] Installing data files."
echo -e "\t${WHITE}+ ${GREEN}[02/04]${WHITE} data files"
for file in ${DATA_FILES[@]} ${LOCALE_FILES[@]} ${DOC_FILES[@]} \
${PC_FILES[@]} ${ICON_FILES[@]}; do
if [[ $VERBOSE == "true" ]]; then
......@@ -69,7 +69,7 @@ install_bsng () {
local CUR_NUM=1
fi
echo -e "${GREEN} [03/04] Installing binary files."
echo -e "\t${WHITE}+ ${GREEN}[03/04]${WHITE} bin files"
for file in ${PROFILE_FILES[@]} ${BIN_FILES[@]}; do
if [[ $VERBOSE == "true" ]]; then
inst bin "$file" $CUR_NUM $BIN_NUM
......@@ -82,7 +82,7 @@ install_bsng () {
remove_bsng () {
echo -e "${RED} [02/02] Removing all files."
echo -e "\t${WHITE}+ ${RED}[02/02]${WHITE} all files"
for file in ${REMOVE_FILES[@]}; do
uninst "$file"
done
......
......@@ -3,7 +3,7 @@
installdirs_create ()
{
echo -e "${GREEN} [01/04] Installing directories."
echo -e "\t${WHITE}+ ${GREEN}[01/04]${WHITE} directories"
mkdir -p $DESTDIR/$DATADIR
for directory in ${DATADIR_LIST[@]}; do
mkdir -p $DESTDIR/$DATADIR/$directory
......
......@@ -8,13 +8,18 @@ Overview of changes in v7.12.1 "Do You Like The Sound Now?"
mv, cp and shred tools. If you updated from
version 7.12, please restart your machine
after you installed 7.12.1, to ensure every-
thing is fine with your setup.
thing is fine with your setup
* 127 (uninstall): manual uninstall didn't remove GConf Schemas
=== Build & Installation ===
* show version of configure in --help
* add --quiet switch to configure
* fix configure --help message
* show version of make in --help
* improve look'n'feel of make out-put (more like configure now)
* fixed a typo in a make warning
=== Added Features ===
* batch [TJ Carter]
......
......@@ -27,7 +27,8 @@ while [[ $xcount -lt $pcount ]]; do
po ) update_po;;
build ) build && touch .make/build_done;;
build ) echo -e "\n${YELLOW}Building BashStyle-NG:\n"
build && touch .make/build_done ;;
clean ) clean ;;
......@@ -40,14 +41,16 @@ while [[ $xcount -lt $pcount ]]; do
exit 1
fi
if [[ -e $PWD/.make/build_done ]]; then
echo -e "\n${GREEN}Installing BashStyle-NG:\n"
installdirs_create && install_bsng && post_install
else echo -e "\n${RED}You need to run ./make all first!\n"
else echo -e "\n${RED}You need to run ./make build first!\n"
fi ;;
remove ) if [[ $EUID != 0 ]]; then
echo -e "\n${RED}You're not root!\n"
exit 1
fi
echo -e "\n${RED}Removing BashStyle-NG:\n"
pre_remove && remove_bsng ;;
changelog ) $PWD/.make/changelog ;;
......@@ -62,3 +65,4 @@ done
unset xcount pcount
tput sgr0
echo
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment