Compare commits
2 Commits
4a5fa4415c
...
ec5e77f796
| Author | SHA1 | Date | |
|---|---|---|---|
| ec5e77f796 | |||
| 3be9586238 |
57
cli/pal.lux
57
cli/pal.lux
@@ -339,7 +339,7 @@ fn showInteractiveWelcome(): Unit with {Console, Process} = {
|
||||
"3" => showHelp(),
|
||||
_ => {
|
||||
print("")
|
||||
doSetup()
|
||||
doOnboard()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -371,7 +371,28 @@ fn createDirectories(): Unit with {Process} = {
|
||||
ensureDir(base + "/server")
|
||||
}
|
||||
|
||||
fn doSetup(): Unit with {Process} = {
|
||||
fn doSetup(): Unit with {Console, Process} = {
|
||||
print("")
|
||||
|
||||
if isInitialized() then {
|
||||
printWarn("pal is already initialized on this device.")
|
||||
print("")
|
||||
let rerun = askConfirm("Re-run setup? This will overwrite your config.", false)
|
||||
if rerun == false then {
|
||||
print("")
|
||||
printHint("No changes made.")
|
||||
print("")
|
||||
()
|
||||
} else {
|
||||
print("")
|
||||
doSetupSteps()
|
||||
}
|
||||
} else {
|
||||
doSetupSteps()
|
||||
}
|
||||
}
|
||||
|
||||
fn doSetupSteps(): Unit with {Process} = {
|
||||
print("")
|
||||
printHeader("Setting up pal")
|
||||
|
||||
@@ -403,7 +424,7 @@ fn doSetup(): Unit with {Process} = {
|
||||
if hasCommand("syncthing") then {
|
||||
let hasConfig = execQuiet("test -f " + palDir() + "/syncthing/config/config.xml && echo yes || echo no")
|
||||
if hasConfig |> isNo then {
|
||||
let ignore3 = Process.exec("syncthing generate --home=" + palDir() + "/syncthing/config --no-default-folder --gui-listen=127.0.0.1:8385 2>&1")
|
||||
let ignore3 = Process.exec("syncthing generate --home=" + palDir() + "/syncthing/config 2>&1")
|
||||
printStep("Initializing sync", "done")
|
||||
} else {
|
||||
printStep("Initializing sync", "ready")
|
||||
@@ -508,7 +529,7 @@ fn doSyncSetup(): Unit with {Process} = {
|
||||
let hasConfig = execQuiet("test -f " + palDir() + "/syncthing/config/config.xml && echo yes || echo no")
|
||||
if hasConfig |> isNo then {
|
||||
printStepPending("Creating config")
|
||||
let ignore = Process.exec("syncthing generate --home=" + palDir() + "/syncthing/config --no-default-folder --gui-listen=127.0.0.1:8385 2>&1")
|
||||
let ignore = Process.exec("syncthing generate --home=" + palDir() + "/syncthing/config 2>&1")
|
||||
printStep("Creating config", "done")
|
||||
} else {
|
||||
printStep("Creating config", "exists")
|
||||
@@ -779,7 +800,7 @@ fn doExport(): Unit with {Console, Process} = {
|
||||
let fileSize = execQuiet("du -h " + exportPath + " | cut -f1")
|
||||
printStep("Creating archive", fileSize)
|
||||
print("")
|
||||
printSuccess("Export created: " + exportFile)
|
||||
printSuccess("Export created: " + exportPath)
|
||||
print("")
|
||||
printHint("Restore with:")
|
||||
printCmd("pal import " + exportFile)
|
||||
@@ -814,11 +835,7 @@ fn doImport(archivePath: String): Unit with {Console, Process} = {
|
||||
print("")
|
||||
|
||||
let confirmed = askConfirm("Continue?", false)
|
||||
if confirmed == false then {
|
||||
print("")
|
||||
printHint("Import cancelled.")
|
||||
print("")
|
||||
} else {
|
||||
if confirmed then {
|
||||
print("")
|
||||
printHeader("Importing")
|
||||
|
||||
@@ -844,6 +861,10 @@ fn doImport(archivePath: String): Unit with {Console, Process} = {
|
||||
printErr("Import failed - config not found in archive")
|
||||
}
|
||||
print("")
|
||||
} else {
|
||||
print("")
|
||||
printHint("Import cancelled.")
|
||||
print("")
|
||||
}
|
||||
} else {
|
||||
// No existing data, proceed without confirmation
|
||||
@@ -1339,7 +1360,7 @@ fn doOnboardSteps(): Unit with {Console, Process} = {
|
||||
let hasConfig = execQuiet("test -f " + palDir() + "/syncthing/config/config.xml && echo yes || echo no")
|
||||
if hasConfig |> isNo then {
|
||||
printStepPending("Creating sync config")
|
||||
let ignore11 = Process.exec("syncthing generate --home=" + palDir() + "/syncthing/config --no-default-folder --gui-listen=127.0.0.1:8385 2>&1")
|
||||
let ignore11 = Process.exec("syncthing generate --home=" + palDir() + "/syncthing/config 2>&1")
|
||||
printStep("Creating sync config", "done")
|
||||
} else {
|
||||
printStep("Creating sync config", "exists")
|
||||
@@ -1390,13 +1411,16 @@ fn doOnboardSteps(): Unit with {Console, Process} = {
|
||||
printHint("Install restic and run 'pal backup init <repo>' later.")
|
||||
} else {
|
||||
let existingRepo = getBackupRepo()
|
||||
if String.length(existingRepo) > 0 then {
|
||||
printStep("Backup repository", "already configured")
|
||||
printHint("Repository: " + existingRepo)
|
||||
let setupBackup = if String.length(existingRepo) > 0 then {
|
||||
printHint("Current repository: " + existingRepo)
|
||||
print("")
|
||||
askConfirm("Reconfigure backup location?", false)
|
||||
} else {
|
||||
let setupBackup = askConfirm("Set up backups?", true)
|
||||
askConfirm("Set up backups?", true)
|
||||
}
|
||||
print("")
|
||||
if setupBackup then {
|
||||
let defaultRepo = existingRepo
|
||||
printHint("Enter a path or URL where backup snapshots will be stored.")
|
||||
print("")
|
||||
let ignore15b = Process.exec("printf ' \\033[36mLocal directory\\033[0m /mnt/backup, /media/usb/backups\\n' >&2")
|
||||
@@ -1404,7 +1428,7 @@ fn doOnboardSteps(): Unit with {Console, Process} = {
|
||||
let ignore15d = Process.exec("printf ' \\033[36mBackblaze B2\\033[0m b2:bucket-name:path\\n' >&2")
|
||||
let ignore15e = Process.exec("printf ' \\033[36mAmazon S3\\033[0m s3:bucket-name/path\\n' >&2")
|
||||
print("")
|
||||
let backupRepo = askInput("Backup location", "")
|
||||
let backupRepo = askInput("Backup location", defaultRepo)
|
||||
if String.length(backupRepo) == 0 then {
|
||||
printHint("Skipping backup setup.")
|
||||
printCmd("pal backup init <repo>")
|
||||
@@ -1439,7 +1463,6 @@ fn doOnboardSteps(): Unit with {Console, Process} = {
|
||||
printCmd("pal backup init <repo>")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
print("")
|
||||
|
||||
|
||||
8
flake.lock
generated
8
flake.lock
generated
@@ -47,13 +47,13 @@
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771221263,
|
||||
"narHash": "sha256-Av4s4pelV+ueIMSY61aHuT8KjKZ6ekXtJsnjVc89gtQ=",
|
||||
"path": "/home/blu/src/lux",
|
||||
"lastModified": 1771638380,
|
||||
"narHash": "sha256-RLGfahDSlYi8ec50DtmfOZn9q8JpF2xBTcUb8K2ZQ3Q=",
|
||||
"path": "/home/blu/src/lux/lang",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"path": "/home/blu/src/lux",
|
||||
"path": "/home/blu/src/lux/lang",
|
||||
"type": "path"
|
||||
}
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user