From 6b29dbb54f358720d2229c3a549b6389bfcd7c4a Mon Sep 17 00:00:00 2001
From: myve <forge@myvelabs.com>
Date: Wed, 17 Jul 2024 12:34:43 +0000
Subject: [PATCH] Update remmina.sh

---
 remmina.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/remmina.sh b/remmina.sh
index 3b25039..1e7101a 100644
--- a/remmina.sh
+++ b/remmina.sh
@@ -1,13 +1,18 @@
 ## Dockerfile
 cat >Dockerfile <<- 'Dockerfile'
 # syntax = docker/dockerfile:1.2
-FROM myvnc/i3:base
+FROM myvnc/base:i3
 USER root
 
+# Choose a terminal
+ENV TERMINAL=terminator
+
 # install packages
 RUN --mount=type=cache,sharing=locked,target=/var/cache/pacman \
     pacman -Syu --ask 4 --needed \
-    remmina libvncserver terminator openssh \
+    remmina libvncserver \
+    ${TERMINAL} \
+    openssh \
     && pacman -Scc --ask 4
 
 # Tigervnc
@@ -25,11 +30,11 @@ cat >20-remmina.sh <<- '20-remmina.sh'
 # Remmina config
 cat >~/.config/i3/config.d/remmina.conf <<- 'remmina.conf'
 # Open terminal
-exec --no-startup-id i3-msg 'workspace "2"; exec /usr/bin/terminator'
+exec --no-startup-id i3-msg 'workspace "2"; exec /usr/bin/${TERMINAL}'
 
 # Maximize
 for_window [class="remmina"] move container to workspace "1"
-for_window [class="terminator"] move container to workspace "2"
+for_window [class="${TERMINAL}"] move container to workspace "2"
 remmina.conf
 
 # Remmina startup