From 746ea42ff4616024ec41b6dcb1d2588dee4b85d1 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Fri, 18 Oct 2024 21:56:16 +0200 Subject: refactor(modules/legacy/conf/lf): Move to new `by-name` dir This makes it possible to mix and match between `NixOS` and `home-manager` options and thus allows merging the secret handling directly into this module. Furthermore, the `systemd` tempfiles handling was also merged into this module. --- .../home.legacy/conf/lf/commands/scripts/trash.sh | 37 ---------------------- 1 file changed, 37 deletions(-) delete mode 100755 modules/home.legacy/conf/lf/commands/scripts/trash.sh (limited to 'modules/home.legacy/conf/lf/commands/scripts/trash.sh') diff --git a/modules/home.legacy/conf/lf/commands/scripts/trash.sh b/modules/home.legacy/conf/lf/commands/scripts/trash.sh deleted file mode 100755 index f4878c49..00000000 --- a/modules/home.legacy/conf/lf/commands/scripts/trash.sh +++ /dev/null @@ -1,37 +0,0 @@ -#! /usr/bin/env dash - -# shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.1.2" . %SHELL_LIBRARY_PATH - -# shellcheck disable=SC2269 -f="$f" -# shellcheck disable=SC2269 -fx="$fx" -# shellcheck disable=SC2269 -fs="$fs" -# shellcheck disable=SC2269 -id="$id" - -trash_output=$(mktmp) -expected_error_output=$(mktmp) - -while read -r file; do - set -- "$@" "$file" -done <"$(tmp echo "$fx")" - -# TODO: why are we using trashy at all, when trash-cli can do everything? -# -# try trashy first, through nix because both trashy and trash-cli provide a trash command, which conflicts -nix run nixpkgs#trashy -- put "$@" 2>"$trash_output" - -# FIXME: Find a way, that does not depend on parsing an error message <2023-08-29> -cat <"$expected_error_output" -error: Error during a \`trash\` operation: Unknown { description: "Path: '\"/.Trash-1000\"'. Message: Permission denied (os error 13)" } -EOF - -if [ "$(cat "$expected_error_output")" = "$(cat "$trash_output")" ]; then - warning "Deleting with trash-cli to the /.Trash folder" - # this file could not be trashed because it is on the tempfs volume, trash-cli can do this this - trash-put "$@" -fi -# vim: ft=sh -- cgit 1.4.1