Merge trunk r3692

This commit is contained in:
Pierre Labastie 2013-04-04 20:09:42 +00:00
parent 9fe527f6a9
commit 07278936c8
2 changed files with 14 additions and 0 deletions

View file

@ -17,6 +17,7 @@ $(CONFIG)/mconf:
$(MAKE) -C $(CONFIG) ncurses conf mconf $(MAKE) -C $(CONFIG) ncurses conf mconf
menuconfig: $(CONFIG)/mconf menuconfig: $(CONFIG)/mconf
-@cp -a configuration configuration.old
@$(CONFIG)/mconf $(CONFIG_CONFIG_IN) @$(CONFIG)/mconf $(CONFIG_CONFIG_IN)
config: $(CONFIG)/conf config: $(CONFIG)/conf

13
jhalfs
View file

@ -83,6 +83,19 @@ case $1 in
;; ;;
esac esac
# If the user has not saved his configuration file, let's ask
# if he or she really wants to run this stuff
if [ $(ls -l --time-style='+%Y%m%d%H%M%S' configuration.old | cut -d' ' -f 6) \
-ge $(ls -l --time-style='+%Y%m%d%H%M%S' configuration | cut -d' ' -f 6) ]
then echo -n "Do you want to run jhalfs? yes/no (yes): "
read ANSWER
if [ x${ANSWER:0:1} = "xn" -o x${ANSWER:0:1} = "xN" ] ; then
echo "${nl_}Exiting gracefully.${nl_}"
exit
fi
fi
# Change this to 0 to suppress almost all messages
VERBOSITY=1 VERBOSITY=1
[[ $VERBOSITY > 0 ]] && echo -n "Loading config params from <configuration>..." [[ $VERBOSITY > 0 ]] && echo -n "Loading config params from <configuration>..."