Fix.

diff --git a/bookworm/aptmark/catgirl b/bookworm/aptmark/catgirl
index be0a8b44ceef6a4671b2e78d431f86d54c0e4d0d..f6535c2e97655c3f1e0d6b92cdc06a8d75890404 100644 (file)
--- a/bookworm/aptmark/catgirl
+++ b/bookworm/aptmark/catgirl
@@ -1,7 +1,7 @@
 # IRC
 catgirl
 # for detachable sessions
 # IRC
 catgirl
 # for detachable sessions

-tmux
+dtach

 # for logs encryption
 age
 #
 # for logs encryption
 age
 #

diff --git a/bookworm/copy/catgirl/etc/systemd/system/catgirl.service b/bookworm/copy/catgirl/etc/systemd/system/catgirl.service
index 641b09aaeaf23c574d227197c59e837857ca0e65..da65e02c810c4f5cca88c25cb0ee3cb692218b8b 100644 (file)
--- a/bookworm/copy/catgirl/etc/systemd/system/catgirl.service
+++ b/bookworm/copy/catgirl/etc/systemd/system/catgirl.service
@@ -1,13 +1,15 @@
 [Unit]
 [Unit]

-Description=catgirl in tmux session
+Description=catgirl dtached

 After=network.target
 
 [Service]
 After=network.target
 
 [Service]

-Type=forking
+Type=simple

 User=plom
 User=plom

-ExecStart=/usr/bin/tmux new-session -d -s catgirl_tmux /usr/bin/catgirl libera
-ExecStop=/usr/bin/tmux kill-session -t catgirl_tmux
-Restart=always
+WorkingDirectory=/home/plom
+ExecStart=/bin/sh -lc "dtach -n /tmp/dtach_catgirl libera && while true; do sleep 1; test ! -e /tmp/dtach_catgirl && break; done"
+ExecStop=/bin/sh -lc "rm /tmp/dtach_catgirl"
+Environment=TERM=linux
+Restart=on-success

 RestartSec=10
 
 [Install]
 RestartSec=10
 
 [Install]

diff --git a/bookworm/copy/catgirl/home/plom/.bashrc.catgirl b/bookworm/copy/catgirl/home/plom/.bashrc.catgirl
new file mode 100644 (file)
index 0000000..9eb17a4
--- /dev/null
+++ b/bookworm/copy/catgirl/home/plom/.bashrc.catgirl
@@ -0,0 +1 @@
+alias attach_catgirl='dtach -a /tmp/dtach_catgirl -e "^t"'

diff --git a/testing/scripts/sync_rtorrent_download.sh b/testing/scripts/sync_rtorrent_download.sh
index c3ed88639e34cc48f45606507146069db1d983ae..a9b86ebb656fd8ea21847d2de229c686a7b7cd3c 100755 (executable)
--- a/testing/scripts/sync_rtorrent_download.sh
+++ b/testing/scripts/sync_rtorrent_download.sh
@@ -150,7 +150,7 @@ if [ -z "${SYNC_DOWN}" ]; then
     ssh -t -q "${SERVER}" "mv -i ${TMP_STORE_DOWNLOAD}/* ~/${DIRNAME_DOWNLOADS}/"
     ssh -t -q "${SERVER}" "mv -i ${TMP_STORE_SESSION}/* ~/${DIRNAME_SESSION}/"
     ssh -t -q "${SERVER}" "rmdir ${TMP_STORE_SESSION} && rmdir ${TMP_STORE_DOWNLOAD} && rmdir ${TMP_STORE}"
     ssh -t -q "${SERVER}" "mv -i ${TMP_STORE_DOWNLOAD}/* ~/${DIRNAME_DOWNLOADS}/"
     ssh -t -q "${SERVER}" "mv -i ${TMP_STORE_SESSION}/* ~/${DIRNAME_SESSION}/"
     ssh -t -q "${SERVER}" "rmdir ${TMP_STORE_SESSION} && rmdir ${TMP_STORE_DOWNLOAD} && rmdir ${TMP_STORE}"

-    ssh -t -q "${SERVER}" 'kill_rtorrent'
+    ssh -t -q "${SERVER}" 'sh -cl kill_rtorrent'

 else
     mkdir "${TMP_STORE_SESSION}"
     mkdir "${TMP_STORE_DOWNLOAD}"
 else
     mkdir "${TMP_STORE_SESSION}"
     mkdir "${TMP_STORE_DOWNLOAD}"