diff options
| author | Thiago Abdo | 2019-11-13 16:44:59 +0100 |
|---|---|---|
| committer | Thiago Abdo | 2019-11-13 16:44:59 +0100 |
| commit | b2372e1adbd4a77337802d7c202a4d9f1c02684a (patch) | |
| tree | 7eefabf984a029e9c194dd3e19837641a85982eb /slx-builder | |
| parent | move distro specifics to files templating (diff) | |
| download | ansible-dracut-b2372e1adbd4a77337802d7c202a4d9f1c02684a.tar.gz ansible-dracut-b2372e1adbd4a77337802d7c202a4d9f1c02684a.tar.xz ansible-dracut-b2372e1adbd4a77337802d7c202a4d9f1c02684a.zip | |
Removes dev option from get_builder
Signed-off-by: Thiago Abdo <tjabdo@inf.ufpr.br>
Diffstat (limited to 'slx-builder')
| -rwxr-xr-x | slx-builder/files/get_builder.sh | 42 | ||||
| -rw-r--r-- | slx-builder/tasks/install.yml | 2 |
2 files changed, 4 insertions, 40 deletions
diff --git a/slx-builder/files/get_builder.sh b/slx-builder/files/get_builder.sh index 9c7765d..1c57f7e 100755 --- a/slx-builder/files/get_builder.sh +++ b/slx-builder/files/get_builder.sh @@ -20,13 +20,11 @@ verbose="no" debug="no" -dev="no" version="build_versions" print_help_message() { echo "Downloader for systemd-init" - echo "Can download as git or as tarball(--dev, default is tarball)" - echo "Can set the downloaded version with --version(default is latest)" + echo "Can set the env file with --version(default is build_versions)" echo "$0: [--dev] [--verbose] [--version <version_file>] [--debug]" } @@ -48,10 +46,6 @@ parse_command_line() { debug='yes' set -x ;; - --dev) - shift - dev="yes" - ;; --version) shift version="$1" @@ -110,20 +104,7 @@ github_parser() { url=$4 vecho "> github b-$branch c-$commit p-$path u-$url" vecho "> args: $@" - - if [[ $dev == "yes" ]]; then - git_parser "$branch" "$commit" "$path" "$url" - else - if [[ -z $commit ]]; then - version=$branch - else - version=$commit - fi - rm -rf $path || true - mkdir -p $path - curl --location "https:${url::-4}/archive/$version.tar.gz" | tar --extract --gzip \ - --directory "$path" --strip-components 1 - fi + git_parser "$branch" "$commit" "$path" "$url" } gitslx_parser() { @@ -133,23 +114,7 @@ gitslx_parser() { url=$4 vecho "> gitslx b-$branch c-$commit p-$path u-$url" vecho "> args: $@" - if [[ $dev == "yes" ]]; then - git_parser "$branch" "$commit" "$path" "$url" - else - if [[ -z $commit ]]; then - version=$branch - else - version=$commit - fi - rm -rf $path || true - mkdir -p $path - reponame=$(echo ${url::-4} | rev | cut -d / -f 1 | rev) - curl --location "https:${url}/snapshot/${reponame}-${version}.tar.gz" | tar --extract --gzip \ - --directory "$path" --strip-components 1 - if [[ $? -ne 0 ]]; then - git_parser "$branch" "$commit" "$path" "$url" - fi - fi + git_parser "$branch" "$commit" "$path" "$url" } dracut_parser() { @@ -173,7 +138,6 @@ parse_command_line $@ . $version vecho "Verbose: $verbose" -vecho "dev: $dev" vecho "version_file: $version" vecho "modules: ${modules[@]}" diff --git a/slx-builder/tasks/install.yml b/slx-builder/tasks/install.yml index fd59310..08886f7 100644 --- a/slx-builder/tasks/install.yml +++ b/slx-builder/tasks/install.yml @@ -24,7 +24,7 @@ - "files/downloader_env/{{ ansible_distribution }}" - name: OpenSLX dracut | Get bootstrap - shell: "{{ builder_dir }}/get_builder.sh --dev" + shell: "{{ builder_dir }}/get_builder.sh" args: chdir: "{{ builder_dir }}" creates: "${{ builder_dir }}/systemd_init" |