Compare commits
No commits in common. "main" and "restore-browser" have entirely different histories.
main
...
restore-br
102
CHANGELOG.md
|
@ -5,108 +5,6 @@ All notable changes to this project will be documented in this file.
|
|||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [0.8.0] - 2025-04-23
|
||||
|
||||
### Added
|
||||
|
||||
- Have the oglive agent send /stopped on poweroff or restart
|
||||
|
||||
## [0.7.2] - 2025-04-21
|
||||
|
||||
### Fixed
|
||||
|
||||
- Have the partitioning functions return a meaningful rc
|
||||
|
||||
## [0.7.1] - 2025-04-15
|
||||
|
||||
### Fixed
|
||||
|
||||
- getConfiguration.py: don't fail if NTFS filesystems are mounted ro
|
||||
|
||||
## [0.7.0] - 2025-04-15
|
||||
|
||||
### Removed
|
||||
|
||||
- Removed references to ogGlobals.OGLOG in python code
|
||||
|
||||
## [0.6.1] - 2025-04-15
|
||||
|
||||
### Fixed
|
||||
|
||||
- Fixed capturing of partclone output and management of return value
|
||||
|
||||
## [0.6.0] - 2025-04-15
|
||||
|
||||
### Changed
|
||||
|
||||
- ogGetIpAddress() is no longer required in ogGlobals--move it back into NetLib
|
||||
|
||||
## [0.5.0] - 2025-04-15
|
||||
|
||||
### Changed
|
||||
|
||||
- Log to /var/log/clone-engine.log and clone-engine.json.log
|
||||
|
||||
## [0.4.1] - 2025-04-10
|
||||
|
||||
### Fixed
|
||||
|
||||
- restoreImage.py: return negated rc to the shell
|
||||
|
||||
## [0.4.0] - 2025-04-10
|
||||
|
||||
### Changed
|
||||
|
||||
- Make /opt/opengnsys writable in clients, just like it used to be
|
||||
|
||||
## [0.3.6] - 2025-04-09
|
||||
|
||||
### Fixed
|
||||
|
||||
- Fixed ogReduceFs
|
||||
|
||||
## [0.3.5] - 2025-04-09
|
||||
|
||||
### Fixed
|
||||
|
||||
- Fixed syntax
|
||||
|
||||
## [0.3.4] - 2025-04-09
|
||||
|
||||
### Fixed
|
||||
|
||||
- Fixed usage of ogEcho in FileSystemLib
|
||||
|
||||
## [0.3.3] - 2025-04-09
|
||||
|
||||
### Fixed
|
||||
|
||||
- Kill coproc'ed browser in all execution branches in Configurar.py
|
||||
|
||||
## [0.3.2] - 2025-04-07
|
||||
|
||||
### Fixed
|
||||
|
||||
- Handle invalid number of arguments pass to functions/ogCopyFile
|
||||
|
||||
## [0.3.1] - 2025-04-03
|
||||
|
||||
### Fixed
|
||||
|
||||
- Fixed invocation to ogCheckIpAddress in interfaceAdm/CrearImagen.py
|
||||
|
||||
## [0.3.0] - 2025-04-03
|
||||
|
||||
### Removed
|
||||
|
||||
- Removed burg and rsync 3.1
|
||||
|
||||
## [0.2.6] - 2025-03-31
|
||||
|
||||
### Fixed
|
||||
|
||||
- Restore qt4 browser
|
||||
|
||||
## [0.2.5] - 2025-03-31
|
||||
|
||||
### Fixed
|
||||
|
|
|
@ -48,18 +48,7 @@ pipeline {
|
|||
}
|
||||
}
|
||||
}
|
||||
stage('Generate Changelog (Nightly)'){
|
||||
when {
|
||||
branch 'main'
|
||||
}
|
||||
steps {
|
||||
script {
|
||||
def devName = params.DEV_NAME ? params.DEV_NAME : env.DEFAULT_DEV_NAME
|
||||
def devEmail = params.DEV_EMAIL ? params.DEV_EMAIL : env.DEFAULT_DEV_EMAIL
|
||||
generateDebianChangelog(env.BUILD_DIR, devName, devEmail,"nightly")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Build') {
|
||||
steps {
|
||||
script {
|
||||
|
@ -82,19 +71,6 @@ pipeline {
|
|||
}
|
||||
}
|
||||
}
|
||||
stage ('Publish to Debian Repository (Nightly)') {
|
||||
when {
|
||||
branch 'main'
|
||||
}
|
||||
agent { label 'debian-repo' }
|
||||
steps {
|
||||
script {
|
||||
// Construir el patrón de versión esperado en el nombre del paquete
|
||||
def versionPattern = "-${env.BUILD_NUMBER}~nightly"
|
||||
publicarEnAptly('/var/tmp/opengnsys/debian-repo/ogclient', 'nightly', versionPattern)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
post {
|
||||
always {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
[ogclient]
|
||||
comment = OpenGnsys Client
|
||||
browseable = no
|
||||
writeable = yes
|
||||
writeable = no
|
||||
locking = no
|
||||
path = /opt/opengnsys/ogclient
|
||||
guest ok = no
|
||||
|
|
|
@ -55,9 +55,6 @@ elif 6 == len (sys.argv):
|
|||
args = parser.parse_args()
|
||||
src = { 'container': args.src_container, 'file': args.src_file }
|
||||
dst = { 'disk': args.dst_disk, 'par': args.dst_par, 'file': args.dst_file }
|
||||
else:
|
||||
ogHelp ('ogCopyFile', 'ogCopyFile [ str_repo | int_ndisk int_npartition ] path_source [ str_repo | int_ndisk int_npartition ] path_target', ['ogCopyFile REPO newfile.txt 1 2 /tmp/newfile.txt'])
|
||||
sys.exit (1)
|
||||
|
||||
ret = ogCopyFile (src, dst)
|
||||
if ret is not None:
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
import os
|
||||
import sys
|
||||
import time
|
||||
|
||||
os.system ('pkill -f OGAgent')
|
||||
time.sleep (3)
|
||||
os.system ('poweroff')
|
||||
sys.exit (0)
|
||||
|
|
|
@ -75,11 +75,8 @@ for item in tbprm:
|
|||
elif 'tch' == k: tch = v
|
||||
|
||||
# Error si no se define el parámetro de disco (dis).
|
||||
if dis is None:
|
||||
coproc.kill()
|
||||
sys.exit (ogGlobals.OG_ERR_FORMAT)
|
||||
if tch is None:
|
||||
tch = '0'
|
||||
if dis is None: sys.exit (ogGlobals.OG_ERR_FORMAT)
|
||||
if tch is None: tch = '0'
|
||||
|
||||
# Toma valores de distribución de particiones, separados por "%".
|
||||
tbp = [] # Valores de configuración (parámetros para ogCreatePartitions)
|
||||
|
@ -114,7 +111,6 @@ for item in tbprm:
|
|||
if tam is None: missing_params.append ('tam')
|
||||
if missing_params:
|
||||
print (f'partition data ({item}) missing required parameters ({' '.join (missing_params)})')
|
||||
coproc.kill()
|
||||
sys.exit (1)
|
||||
|
||||
# Componer datos de particionado.
|
||||
|
@ -154,7 +150,6 @@ if 'CACHE' in sparam:
|
|||
rc = SystemLib.ogExecAndLog ('command', CacheLib.initCache, tch)
|
||||
if rc:
|
||||
SystemLib.ogRaiseError (['log', 'session'], ogGlobals.OG_ERR_CACHE, f'initCache failed')
|
||||
coproc.kill()
|
||||
sys.exit (1)
|
||||
|
||||
# Definir particionado.
|
||||
|
|
|
@ -66,7 +66,7 @@ repo = arg_repo
|
|||
if not repo: repo = 'REPO'
|
||||
if repo == ogGetIpAddress(): repo = 'CACHE'
|
||||
# Si es una ip y es distinta a la del recurso samba cambiamos de REPO.
|
||||
if 'REPO' == repo or ogCheckIpAddress (repo):
|
||||
if 'REPO' == repo or StringLib.ogCheckIpAddress (repo):
|
||||
# Si falla el cambio -> salimos con error repositorio no valido
|
||||
if not ogChangeRepo (repo):
|
||||
ogRaiseError ([], ogGlobals.OG_ERR_NOTFOUND, repo)
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
import os
|
||||
import sys
|
||||
import time
|
||||
|
||||
os.system ('pkill -f OGAgent')
|
||||
time.sleep (3)
|
||||
os.system ('reboot')
|
||||
sys.exit (0)
|
||||
|
|
|
@ -74,5 +74,4 @@ else:
|
|||
|
||||
# Borramos marcas de arranque de Windows
|
||||
for f in glob.glob ('/mnt/*/ogboot.*') + glob.glob ('/mnt/*/*/ogboot.*'):
|
||||
try: os.unlink (f)
|
||||
except: pass
|
||||
os.unlink (f)
|
||||
|
|
After Width: | Height: | Size: 136 B |
After Width: | Height: | Size: 73 KiB |
|
@ -0,0 +1,79 @@
|
|||
include "theme"
|
||||
|
||||
screen {
|
||||
background = "$$/background.png"
|
||||
|
||||
panel {
|
||||
halign = center
|
||||
attach_vcenter = 0
|
||||
height = 19
|
||||
# Flip so the cursor defaults to the main menu
|
||||
direction = bottom_to_top
|
||||
|
||||
### Main Menu ###
|
||||
panel {
|
||||
height = 15
|
||||
max_width = 120
|
||||
margin_top = 1
|
||||
class = container-body
|
||||
# No need for a min width and centering panel because extended width > min width
|
||||
|
||||
direction = left_to_right
|
||||
anchor = 1
|
||||
id = __menu__
|
||||
}
|
||||
|
||||
panel {
|
||||
height = 4
|
||||
width = 100%
|
||||
class = container-title
|
||||
|
||||
direction = left_to_right
|
||||
|
||||
image {
|
||||
image = "$$/images/txt-select.png"
|
||||
attach_top = 0
|
||||
attach_left = 0
|
||||
}
|
||||
|
||||
### Tools Menu ###
|
||||
image {
|
||||
attach_right = 2
|
||||
image = "$$/images/button-tools.png:$$/images/button-tools-hover.png"
|
||||
command = "menu_popup tools_menu"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
### Progress Bar ###
|
||||
panel {
|
||||
halign = center
|
||||
attach_vcenter = 20
|
||||
width = 80
|
||||
class = progressbar-background
|
||||
id = __timeout__
|
||||
|
||||
progressbar { }
|
||||
}
|
||||
}
|
||||
|
||||
template_menuitem {
|
||||
panel {
|
||||
width = 40
|
||||
height = 12
|
||||
|
||||
parameters = "class=image.class:title=panel.text.text"
|
||||
|
||||
image {
|
||||
attach_vcenter = 0
|
||||
attach_hcenter = 0
|
||||
}
|
||||
|
||||
panel {
|
||||
attach_vcenter = 0
|
||||
attach_hcenter = 0
|
||||
class = text-line
|
||||
text { font = "Helvetica Regular 22" }
|
||||
}
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 3.6 KiB |
After Width: | Height: | Size: 5.4 KiB |
After Width: | Height: | Size: 4.3 KiB |
After Width: | Height: | Size: 1.9 KiB |
After Width: | Height: | Size: 32 KiB |
After Width: | Height: | Size: 11 KiB |
After Width: | Height: | Size: 4.3 KiB |
After Width: | Height: | Size: 4.5 KiB |
After Width: | Height: | Size: 2.4 KiB |
After Width: | Height: | Size: 4.3 KiB |
After Width: | Height: | Size: 4.9 KiB |
After Width: | Height: | Size: 4.4 KiB |
After Width: | Height: | Size: 14 KiB |
After Width: | Height: | Size: 20 KiB |
After Width: | Height: | Size: 5.0 KiB |
After Width: | Height: | Size: 18 KiB |
After Width: | Height: | Size: 1.5 KiB |
|
@ -0,0 +1,21 @@
|
|||
+class
|
||||
{
|
||||
-opengnsys { image = "$$/normal_opengnsys.png:$$/hover_opengnsys.png" }
|
||||
-windows10 { image = "$$/normal_windows10.png:$$/hover_windows10.png" }
|
||||
-windows7 { image = "$$/normal_windows7.png:$$/hover_windows7.png" }
|
||||
-windows { image = "$$/normal_windows.png:$$/hover_windows.png" }
|
||||
-elementary { image = "$$/normal_elementary.png:$$/hover_elementary.png" }
|
||||
-elementaryos { image = "$$/normal_elementary.png:$$/hover_elementary.png" }
|
||||
-recovery { image = "$$/normal_recovery.png:$$/hover_recovery.png" }
|
||||
-shutdown { image = "$$/normal_shutdown.png:$$/hover_shutdown.png" }
|
||||
-restart { image = "$$/normal_restart.png:$$/hover_restart.png" }
|
||||
-linux { image = "$$/normal_linux.png:$$/hover_linux.png" }
|
||||
-ubuntu { image = "$$/normal_ubuntu.png:$$/hover_ubuntu.png" }
|
||||
-debian { image = "$$/normal_debian.png:$$/hover_debian.png" }
|
||||
-suse { image = "$$/normal_opensuse.png:$$/hover_opensuse.png" }
|
||||
-freebsd { image = "$$/normal_freebsd.png:$$/hover_freebsd.png" }
|
||||
-macosx { image = "$$/normal_osx.png:$$/hover_osx.png" }
|
||||
-haiku { image = "$$/normal_haiku.png:$$/hover_haiku.png" }
|
||||
-image { image = "$$/normal_os.png:$$/hover_os.png" }
|
||||
-os { image = "$$/normal_os.png:$$/hover_os.png" }
|
||||
}
|
After Width: | Height: | Size: 3.4 KiB |
After Width: | Height: | Size: 5.1 KiB |
After Width: | Height: | Size: 4.0 KiB |
After Width: | Height: | Size: 1.6 KiB |
After Width: | Height: | Size: 33 KiB |
After Width: | Height: | Size: 11 KiB |
After Width: | Height: | Size: 4.0 KiB |
After Width: | Height: | Size: 4.1 KiB |
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 4.0 KiB |
After Width: | Height: | Size: 4.6 KiB |
After Width: | Height: | Size: 4.1 KiB |
After Width: | Height: | Size: 14 KiB |
After Width: | Height: | Size: 20 KiB |
After Width: | Height: | Size: 4.7 KiB |
After Width: | Height: | Size: 17 KiB |
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 109 B |
After Width: | Height: | Size: 146 B |
After Width: | Height: | Size: 146 B |
After Width: | Height: | Size: 525 B |
After Width: | Height: | Size: 671 B |
After Width: | Height: | Size: 725 B |
After Width: | Height: | Size: 562 B |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 153 B |
After Width: | Height: | Size: 146 B |
After Width: | Height: | Size: 154 B |
After Width: | Height: | Size: 154 B |
After Width: | Height: | Size: 155 B |
After Width: | Height: | Size: 148 B |
After Width: | Height: | Size: 159 B |
After Width: | Height: | Size: 144 B |
After Width: | Height: | Size: 139 B |
After Width: | Height: | Size: 139 B |
After Width: | Height: | Size: 151 B |
After Width: | Height: | Size: 181 B |
After Width: | Height: | Size: 188 B |
After Width: | Height: | Size: 154 B |
After Width: | Height: | Size: 154 B |
After Width: | Height: | Size: 135 B |
After Width: | Height: | Size: 144 B |
After Width: | Height: | Size: 177 B |
After Width: | Height: | Size: 168 B |
After Width: | Height: | Size: 131 B |
After Width: | Height: | Size: 140 B |
After Width: | Height: | Size: 135 B |
After Width: | Height: | Size: 181 B |
After Width: | Height: | Size: 188 B |
After Width: | Height: | Size: 156 B |
After Width: | Height: | Size: 169 B |
After Width: | Height: | Size: 215 B |
After Width: | Height: | Size: 346 B |
After Width: | Height: | Size: 165 B |
After Width: | Height: | Size: 155 B |
After Width: | Height: | Size: 183 B |
After Width: | Height: | Size: 186 B |
After Width: | Height: | Size: 152 B |
After Width: | Height: | Size: 254 B |
After Width: | Height: | Size: 260 B |
After Width: | Height: | Size: 253 B |
After Width: | Height: | Size: 905 B |
After Width: | Height: | Size: 423 B |
After Width: | Height: | Size: 4.3 KiB |
After Width: | Height: | Size: 474 B |
After Width: | Height: | Size: 8.9 KiB |
|
@ -0,0 +1,188 @@
|
|||
tools_menu {
|
||||
panel {
|
||||
class = overlay
|
||||
|
||||
panel {
|
||||
attach_hcenter = 0
|
||||
attach_vcenter = 0
|
||||
width = 30
|
||||
|
||||
panel {
|
||||
class = dialog-title
|
||||
image { image = "$$/images/txt-tools.png" attach_left = 0 }
|
||||
}
|
||||
|
||||
panel {
|
||||
class = dialog-body
|
||||
|
||||
text { class = br }
|
||||
|
||||
text {
|
||||
text = "Toggle Mode"
|
||||
command = "menu_toggle_mode"
|
||||
class = text-menu-item
|
||||
}
|
||||
text {
|
||||
text="Terminal"
|
||||
command = "menu_popup term_window"
|
||||
class = text-menu-item
|
||||
}
|
||||
text {
|
||||
text = "Restart"
|
||||
command = reboot
|
||||
class = text-menu-item
|
||||
}
|
||||
text {
|
||||
text = "Shutdown"
|
||||
command = halt
|
||||
class = text-menu-item
|
||||
}
|
||||
text {
|
||||
text = "Help"
|
||||
command = "menu_popup help"
|
||||
class = text-menu-item
|
||||
}
|
||||
text {
|
||||
text = "About"
|
||||
command = "menu_popup about"
|
||||
class = text-menu-item
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
about {
|
||||
panel {
|
||||
class = overlay
|
||||
|
||||
panel {
|
||||
attach_hcenter = 0
|
||||
attach_vcenter = 0
|
||||
margin_left = 2
|
||||
width = 60
|
||||
|
||||
panel {
|
||||
class = dialog-title
|
||||
image { image = "$$/images/txt-about.png" attach_left = 0 }
|
||||
}
|
||||
|
||||
panel {
|
||||
class = dialog-body
|
||||
|
||||
text { class = br }
|
||||
text { text = "Darkness" class = "dialog-text" }
|
||||
text { class = br }
|
||||
text { text = "Designed & Created by LuxieRayku(luksi.reiku@gmail.com)" class = "dialog-text" }
|
||||
text { text = "Darkness theme is designed to feel clean," class = "dialog-text" }
|
||||
text { text = "light, modern & minimal." class = dialog-text }
|
||||
text { class = br }
|
||||
|
||||
panel {
|
||||
halign = center
|
||||
class = button
|
||||
command = true
|
||||
|
||||
text { text = OK class = button-text }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
help {
|
||||
panel {
|
||||
class = overlay
|
||||
|
||||
panel {
|
||||
attach_hcenter = 0
|
||||
attach_vcenter = 0
|
||||
margin_left = 2
|
||||
width = 48
|
||||
|
||||
panel {
|
||||
class = dialog-title
|
||||
image { image = "$$/images/txt-help.png" attach_left = 0 }
|
||||
}
|
||||
|
||||
panel {
|
||||
class = dialog-body
|
||||
|
||||
text { text = "F1/h - Help" class = dialog-text }
|
||||
text { text = "F2/t - Change theme" class = dialog-text }
|
||||
text { text = "F3/r - Change resolution" class = dialog-text }
|
||||
text { text = "F5/ctrl-x - Finish edit" class = dialog-text }
|
||||
text { text = "F6 - Next window" class = dialog-text }
|
||||
text { text = "F7 - Show folded items" class = dialog-text }
|
||||
text { text = "F8 - Toggle between text and graphic mode" class = dialog-text }
|
||||
text { text = "F9 - Shutdown" class = dialog-text }
|
||||
text { text = "F10 - Reboot" class = dialog-text }
|
||||
text { text = "f - Toggle between folded and unfolded mode" class = dialog-text }
|
||||
text { text = "c - Open terminal" class = dialog-text }
|
||||
text { text = "2 - Open two terminals" class = dialog-text }
|
||||
text { text = "e - Edit current command" class = dialog-text }
|
||||
text { text = "q - Quit graphic mode" class = dialog-text }
|
||||
text { text = "i - Show theme information" class = dialog-text }
|
||||
text { text = "n - Next item with the same class" class = dialog-text }
|
||||
text { text = "w - Next windows item" class = dialog-text }
|
||||
text { text = "u - Next ubuntu item" class = dialog-text }
|
||||
text { text = "ESC - Exit from window or menu" class = dialog-text }
|
||||
|
||||
panel {
|
||||
halign = center
|
||||
class = button
|
||||
command = true
|
||||
|
||||
text { text = OK class = button-text }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
term_window {
|
||||
panel {
|
||||
class = terminal
|
||||
width = 100%
|
||||
height = 100%
|
||||
term {
|
||||
width=100%
|
||||
height=100%
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
two_term {
|
||||
panel {
|
||||
width = 100%
|
||||
height = 100%
|
||||
direction = left_to_right
|
||||
|
||||
panel {
|
||||
class = terminal
|
||||
extend = 1
|
||||
|
||||
term {
|
||||
width=100%
|
||||
height=100%
|
||||
}
|
||||
}
|
||||
|
||||
panel {
|
||||
class = terminal
|
||||
extend = 1
|
||||
|
||||
term {
|
||||
width=100%
|
||||
height=100%
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/*menu {
|
||||
Shutdown {
|
||||
class = "shutdown"
|
||||
group = "group_main"
|
||||
command = "halt"
|
||||
}
|
||||
}*/
|