From 6a3c06742011a60061487a3def01e87883f5a560 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 18 Sep 2017 17:10:44 -0300 Subject: Distinguish between version and source_version --- stowpkg | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/stowpkg b/stowpkg index 33e5eb6..1263045 100755 --- a/stowpkg +++ b/stowpkg @@ -123,6 +123,12 @@ stowpkg_install () { version="latest" fi + if [ "$source_format" = "git" ]; then + source_version="git" + else + source_version="$version" + fi + # Resolve default dependencies if [ ! -z "$dependencies_stowpkg" ]; then for dependency in $dependencies_stowpkg; do @@ -141,19 +147,20 @@ stowpkg_install () { cd $SOURCES # Download sources if needed - if [ ! -d "${package}-${version}" ]; then + if [ ! -d "${package}-${source_version}" ]; then if [ "$source_format" = "git" ]; then - git clone $url ${package}-${version} + git clone $url ${package}-${source_version} fi fi - # Go to source folder - if [ ! -d "${package}-${version}" ]; then + # Check source + if [ ! -d "${package}-${source_version}" ]; then echo "$BASENAME: source not found for package $package" exit 1 fi - cd ${package}-${version} + # Go to source folder + cd ${package}-${source_version} if [ "$source_format" = "git" ]; then git fetch --all -- cgit v1.2.3