mirror of
https://github.com/fspc/gbootroot.git
synced 2025-02-23 00:53:23 -05:00
Save in ABS working to specs.
This commit is contained in:
parent
323c1c2f14
commit
1246ce1aba
15
gbootroot
15
gbootroot
@ -1419,13 +1419,15 @@ sub save_as {
|
|||||||
|
|
||||||
my $button = Gtk::Button->new("OK");
|
my $button = Gtk::Button->new("OK");
|
||||||
my $event_count = 0;
|
my $event_count = 0;
|
||||||
|
my $new_template_tmp = "nothing";
|
||||||
$button->signal_connect("clicked", sub {
|
$button->signal_connect("clicked", sub {
|
||||||
|
|
||||||
$entry_advanced[4] = $new_template;
|
$entry_advanced[4] = $new_template;
|
||||||
|
|
||||||
# This is a renaming deal and this time doesn't exist in the archive
|
# This is a renaming deal and this time doesn't exist in the archive
|
||||||
if (!-f "$home_rootfs/$new_template") {
|
if (!-f "$home_rootfs/$new_template") {
|
||||||
if ($template ne $new_template) {
|
if ($template ne $new_template) {
|
||||||
return if err_custom("cp $tmp/$template $tmp/$new_template",
|
return if err_custom("mv $tmp/$template $tmp/$new_template",
|
||||||
"gBootRoot: ERROR: Could not rename $template to " .
|
"gBootRoot: ERROR: Could not rename $template to " .
|
||||||
"$new_template") == 2;
|
"$new_template") == 2;
|
||||||
}
|
}
|
||||||
@ -1435,7 +1437,7 @@ sub save_as {
|
|||||||
$save_as->destroy;
|
$save_as->destroy;
|
||||||
}
|
}
|
||||||
|
|
||||||
# This is an write-over situation .. exists in $tmp and archive
|
# This is a write-over situation .. exists in $tmp and archive
|
||||||
elsif (-e "$tmp/$new_template" && -f "$tmp/$new_template"
|
elsif (-e "$tmp/$new_template" && -f "$tmp/$new_template"
|
||||||
&& -f "$home_rootfs/$new_template" ) {
|
&& -f "$home_rootfs/$new_template" ) {
|
||||||
return if errcp(sys("cp -a $tmp/$new_template $home_rootfs")) == 2;
|
return if errcp(sys("cp -a $tmp/$new_template $home_rootfs")) == 2;
|
||||||
@ -1446,16 +1448,18 @@ sub save_as {
|
|||||||
# Here the file trying to be renamed already exist in the archive
|
# Here the file trying to be renamed already exist in the archive
|
||||||
# but doesn't exist in $tmp
|
# but doesn't exist in $tmp
|
||||||
else {
|
else {
|
||||||
|
|
||||||
$label->set_text("$new_template already exists, " .
|
$label->set_text("$new_template already exists, " .
|
||||||
"do\nyou want to write over it, " .
|
"do\nyou want to write over it, " .
|
||||||
"or\nsave it with a different name?");
|
"or\nsave it with a different name?");
|
||||||
|
|
||||||
$event_count++;
|
$event_count++;
|
||||||
my $event = pop(@_);
|
my $event = pop(@_);
|
||||||
|
|
||||||
|
if ($new_template eq $new_template_tmp) {
|
||||||
if ($event_count >= 2 && $event && $event eq "clicked") {
|
if ($event_count >= 2 && $event && $event eq "clicked") {
|
||||||
if ("$tmp/$template" ne "$tmp/$new_template") {
|
if ("$tmp/$template" ne "$tmp/$new_template") {
|
||||||
return if err_custom("cp $tmp/$template $tmp/$new_template",
|
return if err_custom("mv $tmp/$template $tmp/$new_template",
|
||||||
"gBootRoot: ERROR: Could not rename $template to " .
|
"gBootRoot: ERROR: Could not rename $template to " .
|
||||||
"$new_template") == 2;
|
"$new_template") == 2;
|
||||||
}
|
}
|
||||||
@ -1466,7 +1470,10 @@ sub save_as {
|
|||||||
$ear2->set_text($new_template);
|
$ear2->set_text($new_template);
|
||||||
$save_as->destroy;
|
$save_as->destroy;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
$new_template_tmp = $new_template;
|
||||||
}
|
}
|
||||||
|
#$new_template_tmp = $new_template;
|
||||||
},"clicked");
|
},"clicked");
|
||||||
$button->can_default(1);
|
$button->can_default(1);
|
||||||
$save_as->action_area->pack_start($button, $false, $false,0);
|
$save_as->action_area->pack_start($button, $false, $false,0);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user