extra.setup: make the fzf install repeatable and keep an existing zshrc

git clone failed on every run after the first, and ~/.fzf/install asks
three questions - both stop an unattended run. The rc file is not touched
because extra/zshrc sources ~/.fzf.zsh itself.

~/.zshrc was overwritten without a copy; the first one seen is kept as
~/.zshrc.bak.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

extra.setup

@@ -26,9 +26,17 @@ system("curl -s https://ohmyposh.dev/install.sh | bash -s -- -d /db/bin");
 system("mkdir -p /db/etc");
 system("cp extra/omp.json /db/etc/");
 
-system("git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf");
-system("~/.fzf/install");
+if (-d "$HOME/.fzf") {
+  system("cd $HOME/.fzf && git pull --ff-only");
+} else {
+  system("git clone --depth 1 https://github.com/junegunn/fzf.git $HOME/.fzf");
+}
+# The flags are what makes it run without asking. No --update-rc: the zshrc
+# below sources ~/.fzf.zsh itself.
+system("$HOME/.fzf/install --key-bindings --completion --no-update-rc");
 
-system("cp -r extra/zshrc $HOME/.zshrc");
+# Whatever zshrc is already there belongs to someone - keep the first one.
+system("cp $HOME/.zshrc $HOME/.zshrc.bak") if (-f "$HOME/.zshrc" && !-f "$HOME/.zshrc.bak");
+system("cp extra/zshrc $HOME/.zshrc");
  
 ########################################################################################################### END

setup.debian1x

@@ -1,11 +1,20 @@
 #!/usr/bin/perl
-use Getopt::Std;getopts('z');
+use Getopt::Std;getopts('xz');
+
+# -x skips everything that talks to the network: apt and the time sync.
+# -z makes zsh root's login shell.
+
+$ENV{DEBIAN_FRONTEND}='noninteractive';
 
 system("userdel ppb; rm -rf /home/ppb") if (-d "/home/ppb");
 system("userdel mike; rm -rf /home/mike") if (-d "/home/mike");
 
+# Before the installs, not after them: on a fresh image the package lists are
+# empty and every install below fails.
+system("/usr/bin/apt-get update") if (!$opt_x);
+
 &ai('dnsutils','net-tools','zsh','joe','rsync','curl','fuse','libwww-perl',
-    'libterm-readline-perl-perl','libterm-readpassword-perl','libdbd-mysql-perl','ntp',
+    'libterm-readline-perl-perl','libterm-readpassword-perl','libdbd-mysql-perl',
 		'libjson-perl','jq','unzip','7zip');
 
 if ($opt_z) {
@@ -76,16 +85,21 @@ system("chmod 700 /root/.ssh");
 system("chmod 600 /root/.ssh/authorized_keys");
 
 if (!$opt_x) {
-  system("/usr/bin/apt-get update");
-  system("/usr/bin/apt-get upgrade");
+  system("/usr/bin/apt-get -y upgrade");
 
   if (is_debian_13_or_later()) {
+    # timesyncd is what 13 runs; ntpd would only fight it over port 123.
     system("cp ./files/timesyncd.conf /etc/systemd/");
+    system("systemctl restart systemd-timesyncd");
 
   } else {
-    system("service ntp stop");
+    &ai('ntp');
+    # Since 12 the package is ntpsec and so is the service name.
+    my $svc = (-e "/lib/systemd/system/ntpsec.service"
+            || -e "/usr/lib/systemd/system/ntpsec.service") ? "ntpsec" : "ntp";
+    system("service $svc stop");
     system("/usr/sbin/ntpd -gq");
-    system("service ntp start");
+    system("service $svc start");
   }
 }
 

setup.ssh

@@ -9,7 +9,7 @@ while(<IN>) {
   if (/^\s*\#*\s*PermitRootLogin/) {
     $out.="PermitRootLogin yes\n" ;
   } elsif (/(^\s*AcceptEnv.*$)/) {
-    $out.="#$1";
+    $out.="#$1\n";
   } else {
     $out.=$_;
   }