Skip to content
Jump to bottom

usrlocalpackage: Fix package type change #474

Merged
merged 1 commit into from
Jul 2, 2025
Merged

usrlocalpackage: Fix package type change #474

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions usrlocalpkg/admin/makebin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ sub scandir {
sub create_file {
my ($fn,$content)=@_;
warn "create $fn\n";
-l $fn && unlink($fn) or die "$fn: $!\n";
open my $o,'>',$fn or die "$fn: $!\n";
print $o $content;
}
Expand All @@ -69,7 +70,7 @@ sub slurp_file {

sub create_file_if_changed {
my ($fn,$content)=@_;
if (-e $fn) {
if (!-l $fn && -e $fn) {
return if slurp_file($fn) eq $content;
unlink $fn or die "$fn: $!\n";
}
Expand All @@ -78,7 +79,7 @@ sub create_file_if_changed {

sub create_file_if_changed_x {
my ($fn,$content)=@_;
if (-e $fn) {
if (!-l $fn && -e $fn) {
return if slurp_file($fn) eq $content;
unlink $fn or die "$fn: $!\n";
}
Expand Down Expand Up @@ -123,7 +124,7 @@ sub create_profiles {
for my $fn (keys %WANT_SRC) {
my $src="$LIBSRC/$fn";
my $dst="$LIBDIR/$fn";
if (!-e $dst || (-M $dst > -M $src)) {
if (-l $dst || !-e $dst || (-M $dst > -M $src)) {
create_file($dst,slurp_file($src));
}
delete $HAVE{$fn};
Expand Down