Merge pull request #96 from essentialkaos/develop

Version 2.10.0

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Check specs with Perfecto
-        uses: essentialkaos/perfecto-action@master
+        uses: essentialkaos/perfecto-action@v1
         with:
           files: rpmbuilder.spec rpmbuilder-node.spec
 

SOURCES/libexec/build-local.shx

@@ -26,16 +26,7 @@ localBuild() {
     $($pre)
   fi
 
-  [[ -n "$git" ]]    && packSourcesFromGit "$spec"
-  [[ -n "$svn" ]]    && packSourcesFromSvn "$spec"
-  [[ -n "$bzr" ]]    && packSourcesFromBzr "$spec"
-  [[ -n "$hg" ]]     && packSourcesFromHg  "$spec"
-  [[ -n "$gopack" ]] && packGolangSources  "$spec"
-
-  [[ -n "$repo_spec" ]] && spec="$repo_spec"
-
-  [[ -n "$pack" || -n "$source_list" ]] && packSources "$spec" && show ""
-
+  packSources "$spec"
   processSpec "$spec"
 
   show ""

SOURCES/libexec/build-remote.shx

@@ -96,16 +96,7 @@ remoteBuild() {
     $($pre)
   fi
 
-  [[ -n "$git" ]]    && packSourcesFromGit "$spec"
-  [[ -n "$svn" ]]    && packSourcesFromSvn "$spec"
-  [[ -n "$bzr" ]]    && packSourcesFromBzr "$spec"
-  [[ -n "$hg" ]]     && packSourcesFromHg  "$spec"
-  [[ -n "$gopack" ]] && packGolangSources  "$spec"
-
-  [[ -n "$repo_spec" ]] && spec="$repo_spec"
-
-  [[ -n "$pack" || -n "$source_list" ]] && packSources "$spec" && show ""
-
+  packSources "$spec"
   processSpec "$spec"
 
   show ""

SOURCES/libexec/sources-remote.shx

@@ -28,11 +28,7 @@ downloadRemoteSources() {
     doExit $ERROR_ARGS
   fi
 
-  [[ -n "$git" ]]    && packSourcesFromGit "$spec"
-  [[ -n "$svn" ]]    && packSourcesFromSvn "$spec"
-  [[ -n "$bzr" ]]    && packSourcesFromBzr "$spec"
-  [[ -n "$hg" ]]     && packSourcesFromHg  "$spec"
-  [[ -n "$gopack" ]] && packGolangSources  "$spec"
+  packRemoteSources "$spec"
 
   local source_file sources_list source_file_name patches_list files
 
@@ -42,7 +38,7 @@ downloadRemoteSources() {
   files="$sources_list $patches_list"
 
   for source_file in $files ; do
-    if [[ "$source_file" =~ ^(http|https|ftp) ]] ; then
+    if isURL "$source_file" ; then
       source_file_name=$(basename "$source_file")
 
       if [[ -f "$dlcache/$source_file_name" ]] ; then
@@ -136,3 +132,17 @@ isAccessibleURL() {
     return 1
   fi
 }
+
+# Checks if given string is URL (http/https/ftp)
+#
+# 1: Data (String)
+#
+# Code: Yes
+# Echo: No
+isURL() {
+  if [[ "$1" =~ ^(http|https|ftp) ]] ; then
+    return 0
+  fi
+
+  return 1
+}

SOURCES/libexec/sources.shx

@@ -9,13 +9,62 @@ require "sources-scm"
 
 ################################################################################
 
+packSources() {
+  local spec="$1"
+
+  packRemoteSources "$spec"
+
+  if [[ -n "$repo_spec" ]] ; then
+    spec="$repo_spec"
+  fi
+
+  if [[ -n "$pack" || -n "$source_list" ]] ; then
+    packLocalSources "$spec"
+    show ""
+  fi
+}
+
+packRemoteSources() {
+  local spec="$1"
+  local sources
+
+  if [[ -n "${git}${svn}${bzr}${hg}${gopack}" ]] ; then
+    IFS=" " read -r -a sources <<< "$(getSources "$spec")"
+
+    if isURL "${sources[0]}" ; then
+      error "The sources section cannot contain the URL to the sources when downloading with git/svn/hg/bzr/gopack is used"
+      doExit $ERROR_SOURCE
+    fi
+  fi
+
+  if [[ -n "$git" ]] ; then
+    packSourcesFromGit "$spec"
+  fi
+
+  if [[ -n "$svn" ]] ; then
+    packSourcesFromSvn "$spec"
+  fi
+
+  if [[ -n "$bzr" ]] ; then
+    packSourcesFromBzr "$spec"
+  fi
+
+  if [[ -n "$hg" ]] ; then
+    packSourcesFromHg  "$spec"
+  fi
+
+  if [[ -n "$gopack" ]] ; then
+    packGolangSources  "$spec"
+  fi
+}
+
 # Pack sources to archive file
 #
 # 1: Path to spec file (String)
 #
 # Code: No
 # Echo: No
-packSources() {
+packLocalSources() {
   show "Packing source files to archive…"
 
   local spec="$1"

SOURCES/rpmbuilder

@@ -13,7 +13,7 @@ fi
 APP="RPMBuilder"
 
 # Utility version (String)
-VER="2.9.0"
+VER="2.10.0"
 
 ################################################################################
 

rpmbuilder.spec

@@ -2,7 +2,7 @@
 
 Summary:         RPM package build helper
 Name:            rpmbuilder
-Version:         2.9.0
+Version:         2.10.0
 Release:         0%{?dist}
 License:         Apache License, Version 2.0
 Group:           Development/Tools
@@ -55,6 +55,10 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Thu Aug 26 2021 Anton Novojilov <[email protected]> - 2.10.0-0
+- Improved fetching data from remote sources
+- Code refactoring
+
 * Tue Aug 17 2021 Anton Novojilov <[email protected]> - 2.9.0-0
 - Improved sources cleanup process