Skip to content

Commit

Permalink
VERSIONE 3.6.9
Browse files Browse the repository at this point in the history
  • Loading branch information
astrgl committed May 29, 2023
1 parent 58af368 commit 40cccf5
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 28 deletions.
2 changes: 2 additions & 0 deletions .directory
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[Desktop Entry]
Icon=./.icon.png
18 changes: 18 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#---- Gambas files to ignore (v5)
*.gambas
.lock
*~
core
core.*
vgcore
vgcore.*
.kdbg*
.*.prof
.lang/*.pot
.gambas/*
.settings
.startup
.list
.info
.fuse_hidden*
#----
Binary file modified .icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion .project
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Title=DnfDrake
Startup=Fmain
Icon=dnfdrake.svg
Version=3.6.8
Version=3.6.9
Component=gb.image
Component=gb.gui
Component=gb.form
Expand Down
2 changes: 1 addition & 1 deletion .src/FABOUT.form
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
MoveScaled(1,1,50,4)
Font = Font["+7"]
Alignment = Align.Center
Text = ("DNFDRAKE 3.6.8")
Text = ("DNFDRAKE 3.6.9")
}
}
}
4 changes: 2 additions & 2 deletions .src/FRUN.class
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ End

Public Sub BTNSTOP_Click()
BTNSTOP.Enabled = False
Fmain.VERIFYSUSPEND
' Fmain.VERIFYSUSPEND ' RIMOSSO IL RIPRISTINO DEL SUSPEND ORA AVVIENE SOLO ALLA CHIUSURA DI DNFDRAKE
If ProgressBar1.Value = 1 Then
If Fmain.txtConsole.Visible = True Then
Endif
Expand All @@ -66,7 +66,7 @@ If ProgressBar1.Value = 1 Then
Fmain.Btnclear_Click
Fmain.$ABORT = 1
Fmain.$FRUNMAIN = 0
Fmain.$CLEARLOGSUSPEND = 1
'Fmain.$CLEARLOGSUSPEND = 1 ' RIMOSSO IL RIPRISTINO DEL SUSPEND ORA AVVIENE SOLO ALLA CHIUSURA DI DNFDRAKE
Fmain.TMPLISTCLEAN
Me.Close
Endif
Expand Down
50 changes: 26 additions & 24 deletions .src/Fmain.class
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ Public $SUSPENDONTTP As String
Public $SUSPENDOFFTTP As String
Public $WAITSUSPEND As Integer
Public $ABORT As Integer
Public $COUNTRECOVERSUSPEND As Integer
'Public $COUNTRECOVERSUSPEND As Integer ' RIMOSSO IL RIPRISTINO DEL SUSPEND ORA AVVIENE SOLO ALLA CHIUSURA DI DNFDRAKE
Public $AUTOSUSPEND As Integer
Public $CLEARLOGSUSPEND As Integer
Public $PROGRESSBARFORCESUSPEND As Integer
Public $CLEARLOGSUSPEND As Integer
Public $PROGRESSBARFORCESUSPEND As Integer
Public $COUNTBTNCLOSE As Integer
Public $CLOSEPASS As Integer
Public $SI As String
Expand Down Expand Up @@ -613,8 +613,8 @@ $VERBOSE = " | tee /dev/null " & User.Home & "/.config/dnfdrake/log/last.log"
VERIFYSUSPEND
$WAITSUSPEND = 0
$ABORT = 0
$CLEARLOGSUSPEND = 1
$PROGRESSBARFORCESUSPEND = 0
$CLEARLOGSUSPEND = 1
$PROGRESSBARFORCESUSPEND = 0
$COUNTBTNCLOSE = 0
'ABILITA AUTOSUSPEND****************************************
If Exist(User.Home &/ ".config/dnfdrake/autosuspend") Then
Expand Down Expand Up @@ -684,10 +684,10 @@ Public Sub Process_Read()
FSELECTION.Show
Endif
'****************************************************************************************
If InStr($sText, $FATTO) > 0 Then ' OPERAZIONE TERMINATA (FATTO)"
If $MEMOCOMMAND = "RECOVERSUSPEND" Then
$CLEARLOGSUSPEND = 0
Endif
If InStr($sText, $FATTO) > 0 Then ' OPERAZIONE TERMINATA (FATTO)"
' If $MEMOCOMMAND = "RECOVERSUSPEND" Then ' RIMOSSO IL RIPRISTINO DEL SUSPEND ORA AVVIENE SOLO ALLA CHIUSURA DI DNFDRAKE
' $CLEARLOGSUSPEND = 0
' Endif
FOK.Show
Endif
If InStr($sText, $NONRIUSCITO) > 0 Then ' OPERAZIONE TERMINATA (NON RIUSCITO)"
Expand Down Expand Up @@ -781,16 +781,17 @@ Public Sub Process_Read()
Endif
Endif
'**************************************************************************
If $MEMOCOMMAND = "RECOVERSUSPEND" Then
If $COUNTRECOVERSUSPEND = 1 Then
$MEMOCOMMAND = ""
FRESETSUSPEND.Show
$COUNTRECOVERSUSPEND = 0
Else
$COUNTRECOVERSUSPEND = $COUNTRECOVERSUSPEND + 1
$CLEARLOGSUSPEND = 0
Endif
Endif
' RIMOSSO IL RIPRISTINO DEL SUSPEND ORA AVVIENE SOLO ALLA CHIUSURA DI DNFDRAKE
' If $MEMOCOMMAND = "RECOVERSUSPEND" Then
' If $COUNTRECOVERSUSPEND = 1 Then
' $MEMOCOMMAND = ""
' FRESETSUSPEND.Show
' $COUNTRECOVERSUSPEND = 0
' Else
' $COUNTRECOVERSUSPEND = $COUNTRECOVERSUSPEND + 1
' $CLEARLOGSUSPEND = 0
' Endif
' Endif

'**************************************************************************
If $MEMOEXEC = "txtpkgclear" And $ListpkgWR = 0 Then
Expand Down Expand Up @@ -2163,22 +2164,23 @@ Private Sub DSTRSYNC()
FUPDATERESUME.Show
Else
Me.Mouse = Mouse.Wait
' $MEMOCOMMAND = "RECOVERSUSPEND"
' $MEMOCOMMAND = "RECOVERSUSPEND" ' RIMOSSO IL RIPRISTINO DEL SUSPEND ORA AVVIENE SOLO ALLA CHIUSURA DI DNFDRAKE
If $LOG = "NOLOG"
Print #$hProcess, "sudo dnf clean all; dnf clean all; dnf repolist; sudo dnf --refresh --allowerasing distro-sync" & $VERBOSE & gb.NewLine;
FRUNSHOW
Wait 2
$MEMOCOMMAND = "RECOVERSUSPEND"
'$MEMOCOMMAND = "RECOVERSUSPEND" ' RIMOSSO IL RIPRISTINO DEL SUSPEND ORA AVVIENE SOLO ALLA CHIUSURA DI DNFDRAKE
Endif
If $LOG = "LOG" Then
DATATIME
Print #$hProcess, "sudo dnf clean all; dnf clean all; dnf repolist; sudo dnf --refresh --allowerasing distro-sync | tee " & User.Home & "/.config/dnfdrake/log/" & $DATATIME & "-dnfdrakelog-sync.log " & User.Home & "/.config/dnfdrake/log/last.log" & gb.NewLine;
FRUNSHOW
'Wait 2
Endif
If $AUTOSUSPEND = 1 Then
$MEMOCOMMAND = "RECOVERSUSPEND"
Endif
' RIMOSSO IL RIPRISTINO DEL SUSPEND ORA AVVIENE SOLO ALLA CHIUSURA DI DNFDRAKE
' If $AUTOSUSPEND = 1 Then
' '$MEMOCOMMAND = "RECOVERSUSPEND"
'Endif
Endif
End

Expand Down

0 comments on commit 40cccf5

Please sign in to comment.