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

set better defaults

Browse source
This commit is contained in:
udeved 2014-12-08 00:30:28 +01:00
parent 9a34e2e7d6
commit cc15da6132
3 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bin/buildiso.in
View file

@ -118,9 +118,6 @@ make_root_image() {
sed -i -e "s/stable/$branch/" ${work_dir}/root-image/etc/pacman.d/mirrorlist sed -i -e "s/stable/$branch/" ${work_dir}/root-image/etc/pacman.d/mirrorlist
sed -i -e "s/stable/$branch/" ${work_dir}/root-image/etc/pacman-mirrors.conf sed -i -e "s/stable/$branch/" ${work_dir}/root-image/etc/pacman-mirrors.conf
# set hostname here
msg $PWD
: > ${work_dir}/build.${FUNCNAME} : > ${work_dir}/build.${FUNCNAME}
msg "Done" msg "Done"
fi fi
@ -347,8 +344,10 @@ display_settings(){
} }
clean_up(){ clean_up(){
msg "Removing work dir ${work_dir}" if [[ -d ${work_dir} ]];then
rm -r ${work_dir} msg "Removing work dir ${work_dir}"
rm -r ${work_dir}
fi
} }
# Build ISO # Build ISO

2
conf/manjaro-tools.conf
View file

@ -40,7 +40,7 @@
# manjaro_kernel="linux316" # manjaro_kernel="linux316"
# manjaro_version="2014.12" # manjaro_version="$(date +%Y.%m)"
# manjaroiso="manjaroiso" # manjaroiso="manjaroiso"

20
lib/util.sh
View file

@ -241,13 +241,15 @@ load_config(){
if [[ -n ${iso_label} ]];then if [[ -n ${iso_label} ]];then
iso_label=${iso_label} iso_label=${iso_label}
else else
iso_label="MJRO0811" source /etc/lsb-release
iso_label="MJRO0${DISTRIB_RELEASE//.}"
fi fi
if [[ -n ${iso_version} ]];then if [[ -n ${iso_version} ]];then
iso_version=${iso_version} iso_version=${iso_version}
else else
iso_version=0.8.11 source /etc/lsb-release
iso_version=${DISTRIB_RELEASE}
fi fi
if [[ -n ${manjaro_kernel} ]];then if [[ -n ${manjaro_kernel} ]];then
@ -256,14 +258,7 @@ load_config(){
manjaro_kernel="linux316" manjaro_kernel="linux316"
fi fi
# if [[ -n ${manjaro_kernel_ver} ]];then manjaro_kernel_ver=${manjaro_kernel#*linux}
# manjaro_kernel_ver=${manjaro_kernel_ver}
# else
manjaro_kernel_ver=${manjaro_kernel}
manjaro_kernel_ver=${manjaro_kernel_ver%%-*}
manjaro_kernel_ver=${manjaro_kernel_ver%%.[00-99].[00-99]}
manjaro_kernel_ver=${manjaro_kernel_ver//.}
# fi
if [[ -n ${manjaro_version} ]];then if [[ -n ${manjaro_version} ]];then
manjaro_version=${manjaro_version} manjaro_version=${manjaro_version}
@ -280,7 +275,8 @@ load_config(){
if [[ -n ${code_name} ]];then if [[ -n ${code_name} ]];then
code_name=${code_name} code_name=${code_name}
else else
code_name="Manjaro" source /etc/lsb-release
code_name="${DISTRIB_CODENAME}"
fi fi
if [[ -n ${img_name} ]];then if [[ -n ${img_name} ]];then