.

Author: CBenoit

.github/scripts/smoke-test-lib.sh

@@ -152,7 +152,7 @@ check_single_execstart() {
         return  # check_unit_file already reported the absence
     fi
     # Match only non-empty ExecStart= lines; bare 'ExecStart=' is a reset directive.
-    count=$(grep -c '^ExecStart=[^[:space:]]' "$unit_file" 2>/dev/null || echo 0)
+    count=$(grep -c '^ExecStart=[^[:space:]]' "$unit_file" 2>/dev/null || true)
     if [ "$count" -eq 1 ]; then
         pass "Service file has exactly one ExecStart directive"
     else

ci/tlk.ps1

@@ -867,7 +867,7 @@ class TlkRecipe
         $s = New-Changelog -Format 'RpmPackaging' -InputFile $UpstreamChangelogFile -Packager $Packager -Email $Email
         Set-Content -Path $RpmPackagingChangelogFile -Value $s
 
-        $FpmArgs = @(
+        $FpmOptions = @(
             '--force'
             '--verbose'
             '-s', 'dir'
@@ -885,23 +885,25 @@ class TlkRecipe
             '--after-install', "$InputPackagePath/$($this.Product)/rpm/postinst"
             '--before-remove', "$InputPackagePath/$($this.Product)/rpm/prerm"
             '--after-remove', "$InputPackagePath/$($this.Product)/rpm/postrm"
-            '--'
+        )
+
+        $FpmFiles = @(
             "$Executable=/usr/bin/$PkgName"
             "$RpmUpstreamChangelogFile=/usr/share/doc/$PkgName/ChangeLog"
             "$CopyrightFile=/usr/share/doc/$PkgName/copyright"
         )
 
         if ($this.Product -eq "gateway") {
-            $FpmArgs += @(
-                '--rpm-attr', '644,root,root:/usr/lib/systemd/system/devolutions-gateway.service',
+            $FpmOptions += '--rpm-attr', '644,root,root:/usr/lib/systemd/system/devolutions-gateway.service'
+            $FpmFiles += @(
                 "$InputPackagePath/gateway/rpm/service=/usr/lib/systemd/system/devolutions-gateway.service",
                 "$DGatewayWebClient=/usr/share/devolutions-gateway/webapp/client",
                 "$DGatewayWebPlayer=/usr/share/devolutions-gateway/webapp/player",
                 "$DGatewayLibXmf=/usr/lib/devolutions-gateway/libxmf.so"
             )
         }
 
-        & 'fpm' @FpmArgs | Out-Host
+        & 'fpm' @FpmOptions '--' @FpmFiles | Out-Host
 
         if (Test-Path Env:TARGET_OUTPUT_PATH) {
             $TargetOutputPath = $Env:TARGET_OUTPUT_PATH