Skip to content

Commit

Permalink
Merge pull request #11 from essentialkaos/develop
Browse files Browse the repository at this point in the history
Version 1.1.1
  • Loading branch information
andyone committed Apr 24, 2016
2 parents 2479199 + 5fc2b63 commit 87e6b6e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
16 changes: 10 additions & 6 deletions SOURCES/rpmbuilder
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

APP="RPMBuilder"
VER="1.1.0"
VER="1.1.1"

####################################################################

Expand Down Expand Up @@ -364,11 +364,6 @@ checkArgs() {
doExit $ERROR_ARGS
fi

if [[ $download && ! -d $download ]] ; then
show "Can't download sources - download destination directory is not exist." $RED
doExit $ERROR_ARGS
fi

if [[ $remote && ! $host && ! -r $remote && ! "$remote" =~ @|~ && ! "$remote" =~ :[0-9]{1,} ]] ; then
show "Can't start remote build process - you must define remote host." $RED
doExit $ERROR_ARGS
Expand Down Expand Up @@ -615,6 +610,15 @@ downloadRemoteSources() {
local spec="$1"
local download_count=0

if [[ "$download" == "true" ]] ; then
download="."
fi

if [[ ! -d $download ]] ; then
show "Can't download sources - download destination directory is not exist." $RED
doExit $ERROR_ARGS
fi

showSeparator "DOWNLOADING"

local source_list=$(getSpecValue "$MACRO_SOURCE" "$spec")
Expand Down
5 changes: 4 additions & 1 deletion rpmbuilder.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Summary: RPM package build helper
Name: rpmbuilder
Version: 1.1.0
Version: 1.1.1
Release: 0%{?dist}
License: EKOL
Group: Applications/System
Expand Down Expand Up @@ -50,6 +50,9 @@ rm -rf %{buildroot}
###############################################################################

%changelog
* Sun Apr 24 2016 Anton Novojilov <[email protected]> - 1.1.1-0
- -dl without given path download files to current directory

* Thu Apr 21 2016 Anton Novojilov <[email protected]> - 1.1.0-0
- Improved dependecies installation process

Expand Down

0 comments on commit 87e6b6e

Please sign in to comment.