luca
/
dotfiles
1
0
Fork 0
Code

fix trash-put when missing trash directories

This commit is contained in:
Luca Bilke 2024-01-13 13:57:46 +01:00
parent 7e6be8be3b
commit 3a81189d62
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.local/bin/trash-put
View File

@ -35,7 +35,7 @@ sub trash_dirs ($file_fs_root) {
} }
sub target_file_name ( $file_name, $trash_file_path ) { sub target_file_name ( $file_name, $trash_file_path ) {
opendir( my $dir, "$trash_file_path" ) or die "$!\n"; opendir( my $dir, "$trash_file_path" ) or die "$!";
my $existing_suffix_nums = my $existing_suffix_nums =
map( ( $_ =~ /^${file_name}\.~(\d)~/ ), readdir $dir ); map( ( $_ =~ /^${file_name}\.~(\d)~/ ), readdir $dir );
my $suffix_num = max($existing_suffix_nums) + 1; my $suffix_num = max($existing_suffix_nums) + 1;
@ -46,20 +46,22 @@ sub target_file_name ( $file_name, $trash_file_path ) {
} }
sub write_file ( $file_path, $contents ) { sub write_file ( $file_path, $contents ) {
open( FH, '>', $file_path ) or die "$!\n"; open( FH, '>', $file_path ) or die "$!";
print FH $contents; print FH $contents;
} }
# NOTE: Execution starts here # NOTE: Execution starts here
if ( $#ARGV + 1 != 1 ) { if ( $#ARGV + 1 != 1 ) {
die "Bad Arguments\n"; die "Bad Arguments";
} }
stat $ARGV[0] or die "$!\n"; stat $ARGV[0] or die "$!";
my ( $file_name, $file_src, $file_fs_root ) = file_info( $ARGV[0] ); my ( $file_name, $file_src, $file_fs_root ) = file_info( $ARGV[0] );
my ( $trash_info_path, $trash_file_path ) = trash_dirs($file_fs_root); my ( $trash_info_path, $trash_file_path ) = trash_dirs($file_fs_root);
make_path( $trash_info_path, $trash_file_path ) or die "$!";
my $target_name = target_file_name( $file_name, $trash_file_path ); my $target_name = target_file_name( $file_name, $trash_file_path );
chomp( my $deletion_time = `date -u +%Y%m%dUTC%T` ); chomp( my $deletion_time = `date -u +%Y%m%dUTC%T` );
@ -69,6 +71,5 @@ Path=$file_src
DeletionDate=$deletion_time DeletionDate=$deletion_time
EOF EOF
make_path( $trash_info_path, $trash_file_path ); rename( $file_src, "$trash_file_path/$target_name" ) or die "$!";
rename( $file_src, "$trash_file_path/$target_name" ) or die "$!\n"; write_file( "$trash_info_path/$target_name", $info_contents ) or die "$!";
write_file( "$trash_info_path/$target_name", $info_contents ) or die "$!\n";