From 0d913f65e7bf818bc3dc024a775e941db8628fd8 Mon Sep 17 00:00:00 2001
From: Pavel Vondruska <dexter.cz@gmail.com>
Date: Wed, 4 Jun 2025 11:47:11 +0200
Subject: [PATCH] Zkusime patchnout cli.go radeji debiani cestou
---
debian/patches/cli.go.patch | 50 +++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
make.sh | 3 ++-
3 files changed, 53 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/cli.go.patch
create mode 100644 debian/patches/series
diff --git a/debian/patches/cli.go.patch b/debian/patches/cli.go.patch
new file mode 100644
index 0000000..2c036d9
--- /dev/null
+++ b/debian/patches/cli.go.patch
@@ -0,0 +1,50 @@
+--- a/cmd/singularity/cli.go 2025-06-03 12:22:55.951605645 +0200
++++ b/cmd/singularity/cli.go 2025-05-30 11:46:22.033972803 +0200
+@@ -6,12 +6,47 @@
+ package main
+
+ import (
++ "log"
++ "log/syslog"
++ "os"
++ "os/user"
++ "strings"
++ "fmt"
++
+ "github.com/sylabs/singularity/v4/cmd/internal/cli"
+ "github.com/sylabs/singularity/v4/internal/pkg/buildcfg"
+ useragent "github.com/sylabs/singularity/v4/pkg/util/user-agent"
+ )
+
+ func main() {
++ logger, err := syslog.New(syslog.LOG_INFO|syslog.LOG_USER, "singularity-start")
++ if err != nil {
++ log.Fatalf("Error while connecting to syslog: %v", err)
++ }
++ defer logger.Close()
++
++ currentUser, err := user.Current()
++ if err != nil {
++ currentUser = &user.User{Username: "unknown"}
++ }
++
++ hostname, err := os.Hostname()
++ if err != nil {
++ hostname = "unknown-host"
++ }
++
++ pbsJobID := os.Getenv("PBS_JOBID")
++ if pbsJobID == "" {
++ pbsJobID = "out-of-job"
++ }
++
++ cmd := os.Args[0]
++ args := strings.Join(os.Args[1:], " ")
++
++ message := fmt.Sprintf("%s@%s %s %s %s", currentUser.Username, hostname, pbsJobID, cmd, args)
++
++ logger.Info(message)
++
+ useragent.InitValue(buildcfg.PACKAGE_NAME, buildcfg.PACKAGE_VERSION)
+
+ // In cmd/internal/cli/singularity.go
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0cb3ecf
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+cli.go.patch
diff --git a/make.sh b/make.sh
index 2de276b..25491a2 100755
--- a/make.sh
+++ b/make.sh
@@ -72,7 +72,8 @@ chmod +x ./proot
echo "proot usr/bin" >> debian/singularity-ce.install
# Kopie upraveneho cli.go kvuli logovani pouziti do syslogu
-cp -v ${ROOTPWD}/cli.go cmd/singularity/cli.go
+#cp -v ${ROOTPWD}/cli.go cmd/singularity/cli.go
+cp -vr ${ROOTPWD}/debian/patches debian/
# Build balicku
dpkg-buildpackage -uc -us -b
--
GitLab