root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'artoo'

Browse source
This commit is contained in:
udeved 2014-12-17 19:41:25 +01:00
commit f7e794fe6e
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/buildiso.in
View file

@ -25,9 +25,11 @@ SYSCONFDIR='@sysconfdir@'
display_settings(){
msg "manjaro-tools"
msg2 "version: ${version}"
msg2 "manjaro_tools_conf: ${manjaro_tools_conf}"
if [[ -f ${USER_CONFIG}/manjaro-tools.conf ]]; then
msg2 "user_config: ${USER_CONFIG}/manjaro-tools.conf"
else
msg2 "manjaro_tools_conf: ${manjaro_tools_conf}"
fi
msg "OPTIONS:"
@ -140,7 +142,7 @@ usage() {
echo ' -v Verbose'
echo ' -q Query settings and pretend build'
echo ' -c Disable clean work dir'
echo ' -f Disable iso image verwrite'
echo ' -f Disable iso image overwrite'
echo ' -z Disable High compression'
echo ' -A Disable auto configure livecd services as specified'
echo ' in manjaro-tools.conf'
@ -240,7 +242,7 @@ compress_images(){
}
if ${iso_only}; then
[[ ! -d ${work_dir} ]] && die "You need to create images first eg buildiso -I"
[[ ! -d ${work_dir} ]] && die "You need to create images first eg buildiso -B"
compress_images
exit 1
fi

4
bin/buildpkg.in
View file

@ -24,9 +24,11 @@ SYSCONFDIR='@sysconfdir@'
display_settings(){
msg "manjaro-tools"
msg2 "version: ${version}"
msg2 "manjaro_tools_conf: ${manjaro_tools_conf}"
if [[ -f ${USER_CONFIG}/manjaro-tools.conf ]]; then
msg2 "user_config: ${USER_CONFIG}/manjaro-tools.conf"
else
msg2 "manjaro_tools_conf: ${manjaro_tools_conf}"
fi
msg "OPTIONS:"