From b53b11113361fb77e0f334526987f88d0521a54a Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Fri, 4 Aug 2023 17:27:33 +0200
Subject: [PATCH] fix: improve portable and windows setup

---
 groups/flash                                 | 2 +-
 groups/win/base                              | 1 -
 groups/win/sysinfo                           | 3 +--
 groups/win/tweaker                           | 3 ++-
 groups/win/work                              | 1 +
 instalee                                     | 1 +
 packages/ultradefrag/.aur                    | 1 +
 packages/{udefrag => ultradefrag}/binary     | 0
 packages/{udefrag/.aur => ultradefrag/choco} | 0
 packages/{udefrag => ultradefrag}/linux      | 0
 util/i.cmd                                   | 2 +-
 util/setup-repo.sh                           | 8 ++++++++
 12 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 packages/ultradefrag/.aur
 rename packages/{udefrag => ultradefrag}/binary (100%)
 mode change 100755 => 100644
 rename packages/{udefrag/.aur => ultradefrag/choco} (100%)
 rename packages/{udefrag => ultradefrag}/linux (100%)
 mode change 100755 => 100644
 create mode 100644 util/setup-repo.sh

diff --git a/groups/flash b/groups/flash
index 77d3eff..5ccf0d1 100644
--- a/groups/flash
+++ b/groups/flash
@@ -1,6 +1,6 @@
 adb
 etcher
-udefrag
+ultradefrag
 ntfs-3g
 fuse2fs
 f2fs-tools
diff --git a/groups/win/base b/groups/win/base
index 79e134e..19c6981 100644
--- a/groups/win/base
+++ b/groups/win/base
@@ -4,6 +4,5 @@ everything
 screentogif
 notepadplusplus
 pinta
-bulkrenameutility
 utc
 base
\ No newline at end of file
diff --git a/groups/win/sysinfo b/groups/win/sysinfo
index 9356112..2881013 100644
--- a/groups/win/sysinfo
+++ b/groups/win/sysinfo
@@ -1,4 +1,3 @@
 winaudit
 hwininfo
-windirstat
-ultradefrag
\ No newline at end of file
+windirstat
\ No newline at end of file
diff --git a/groups/win/tweaker b/groups/win/tweaker
index 00c1815..6ceaa2d 100644
--- a/groups/win/tweaker
+++ b/groups/win/tweaker
@@ -1,7 +1,8 @@
 win/base
 win/sysinfo
-passwords
 
+espanso
 winaero-tweaker
+bulkrenameutility
 linkshellextension
 wox
diff --git a/groups/win/work b/groups/win/work
index d555a94..8f21e8b 100644
--- a/groups/win/work
+++ b/groups/win/work
@@ -4,3 +4,4 @@ dev/tools
 forensics
 etcher
 passwords
+nextcloud-client
\ No newline at end of file
diff --git a/instalee b/instalee
index 919750e..f5b5ab4 100755
--- a/instalee
+++ b/instalee
@@ -179,6 +179,7 @@ then
 		test -n "$copy" &&
 		echo "Bootstrapping available handlers from $copy" &&
 		cp "$copy" "$handlersfile" || {
+			# TODO copy to hostname suffix to prevent lock in on stick
 			echo "Missing available handlers in $handlersfile!" >&2
 			exit 1
 		}
diff --git a/packages/ultradefrag/.aur b/packages/ultradefrag/.aur
new file mode 100644
index 0000000..b497f03
--- /dev/null
+++ b/packages/ultradefrag/.aur
@@ -0,0 +1 @@
+udefrag
diff --git a/packages/udefrag/binary b/packages/ultradefrag/binary
old mode 100755
new mode 100644
similarity index 100%
rename from packages/udefrag/binary
rename to packages/ultradefrag/binary
diff --git a/packages/udefrag/.aur b/packages/ultradefrag/choco
similarity index 100%
rename from packages/udefrag/.aur
rename to packages/ultradefrag/choco
diff --git a/packages/udefrag/linux b/packages/ultradefrag/linux
old mode 100755
new mode 100644
similarity index 100%
rename from packages/udefrag/linux
rename to packages/ultradefrag/linux
diff --git a/util/i.cmd b/util/i.cmd
index 8124f00..c86f0ba 100644
--- a/util/i.cmd
+++ b/util/i.cmd
@@ -1,2 +1,2 @@
 @echo off
-Powershell Start -Verb runAs powershell -ArgumentList '-ExecutionPolicy Bypass -NoExit Set-Location %cd%; .\instalee\i.ps1'
\ No newline at end of file
+Powershell Start -Verb runAs powershell -ArgumentList '-ExecutionPolicy Bypass -NoExit Set-Location %cd%; .\instalee\i.ps1'
diff --git a/util/setup-repo.sh b/util/setup-repo.sh
new file mode 100644
index 0000000..b5526dc
--- /dev/null
+++ b/util/setup-repo.sh
@@ -0,0 +1,8 @@
+#!/bin/sh -x
+# Sets up this repo to be used on a portable stick, 
+# assuming it is in a directory "instalee" below the root of the medium
+git remote set-url origin https://github.com/xeruf/instalee
+git remote set-url --push origin github.com:xeruf/instalee.git
+git config core.eol lf
+git config core.fileMode false # FAT has no proper permissions
+cp -v i.cmd ../../