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

remove profile_repo from config

Browse source
This commit is contained in:
udeved 2015-12-18 01:56:21 +01:00
parent 51d689493a
commit 0dc1674e68
4 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -83,9 +83,6 @@ overriding
################ buildiso ################
# the iso-profiles directory name/git repo name
# profile_repo='manjaro-tools-iso-profiles'
# default iso buildset; name without .set extension
# buildset_iso=default

4
bin/buildiso.in
View file

@ -70,7 +70,7 @@ display_settings(){
msg2 "buildsets: $(list_sets ${sets_dir_iso})"
msg2 "buildset_iso: ${buildset_iso}"
msg2 "is_buildset: ${is_buildset}"
msg2 "profile_repo: ${profile_repo}"
# msg2 "profile_repo: ${profile_repo}"
msg "OPTIONS:"
msg2 "arch: ${arch}"
@ -108,7 +108,7 @@ load_config "${SYSCONFDIR}/manjaro-tools.conf"
# to force old way to have buildiso run in iso-profiles dir
# run_dir=$(pwd)
load_run_dir "${profile_repo}"
load_run_dir "manjaro-tools-iso-profiles"
clean_first=true
pretend=false

3
data/manjaro-tools.conf
View file

@ -34,9 +34,6 @@
################ buildiso ################
# the iso-profiles directory name/git repo name
# profile_repo='manjaro-tools-iso-profiles'
# default iso buildset; name without .set extension
# buildset_iso=default

6
lib/util.sh
View file

@ -201,7 +201,7 @@ init_buildiso(){
used_kernel=$(uname -r | cut -d . -f1)
[[ ${used_kernel} -lt "4" ]] && use_overlayfs='false'
[[ -z ${profile_repo} ]] && profile_repo='manjaro-tools-iso-profiles'
# [[ -z ${profile_repo} ]] && profile_repo='manjaro-tools-iso-profiles'
}
init_deployiso(){
@ -321,11 +321,11 @@ clean_dir(){
write_repo_conf(){
local repos=$(find $USER_HOME -type f -name ".buildiso")
local path name
[[ -z ${repos[@]} ]] && repos=${DATADIR}/iso-profiles
for r in ${repos[@]}; do
path=${r%/.*}
name=${path##*/}
echo run_dir=$path > ${USERCONFDIR}/$name.conf
echo "run_dir=$path" > ${USERCONFDIR}/$name.conf
done
}