From 5237a2cb4ef26e2acd1294a62d7ffe400d3fc946 Mon Sep 17 00:00:00 2001 From: Ste74 Date: Mon, 17 Sep 2018 19:38:05 +0200 Subject: [PATCH] Add -0 flag to use for download our profiles. Now only when passed the flag the iso-profiles are created. Update also the README to describe this flag. Signed-off-by: Ste74 --- README.md | 12 ++++++++++++ bin/buildiso.in | 14 +++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9c5bc4b..e40c7bf 100644 --- a/README.md +++ b/README.md @@ -88,6 +88,9 @@ overriding ################ buildiso ################ +#default branch for iso-profiles repo: v17.1>current release | master>development release +# branch=v17.1 + # default iso build list; name without .list extension # build_list_iso=default @@ -197,6 +200,7 @@ buildiso is used to build manjaro-iso-profiles. It is run insde the profiles fol ~~~ $ buildiso -h Usage: buildiso [options] + -0 Initialize iso-profiles repo [default: v17.1]" -a Arch [default: auto] -b Branch [default: stable] -c Disable clean work dir @@ -221,6 +225,14 @@ Usage: buildiso [options] ###### * build xfce iso profile for both arches and branch testing on x86_64 build system +* Remember: if you run buildiso for the first time you need to do: + +~~~ +buildiso -0 +~~~ + +for download in /usr/share/manjaro-tools/iso-profiles our manjaro profiles. You can override in manjaro-tools.conf what branch use with buildiso: v17.1 or master ( development profiles ). The previous command can be used to refresh the profiles as needed in your local. + * i686 (buildsystem is x86_64) ~~~ diff --git a/bin/buildiso.in b/bin/buildiso.in index 7c9091b..e5bf3d9 100755 --- a/bin/buildiso.in +++ b/bin/buildiso.in @@ -89,8 +89,6 @@ load_user_info load_config "${USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf" -init_profiles - # to force old way to have buildiso run in iso-profiles dir # run_dir=$(pwd) @@ -102,9 +100,11 @@ images_only=false iso_only=false verbose=false persist=false +initialize=false usage() { echo "Usage: ${0##*/} [options]" + echo " -0 Initialize iso-profiles repo [default: ${branch}]" echo " -p Buildset or profile [default: ${build_list_iso}]" echo " -a Arch [default: ${target_arch}]" echo " -b Branch [default: ${target_branch}]" @@ -134,10 +134,11 @@ usage() { orig_argv=("$@") -opts='p:a:b:r:t:k:i:g:d:cfzxmvqh' +opts='p:a:b:r:t:k:i:g:d:cfzxmvqh0' while getopts "${opts}" arg; do case "${arg}" in + 0) initialize=true ;; a) target_arch="$OPTARG" ;; b) target_branch="$OPTARG" ;; c) clean_first=false ;; @@ -160,6 +161,13 @@ done shift $(($OPTIND - 1)) +if ${initialize}; then + msg "Initialize iso profiles ${branch}" + init_profiles + msg2 "Done: iso profiles are stored in /usr/share/manjaro-tools/iso-profiles" + exit 1 +fi + timer_start=$(get_timer) check_root "$0" "${orig_argv[@]}"