Merge pull request 'refs #2000 run the new browser' (#39) from browser into main
ogclient/pipeline/head This commit looks good Details
ogclient/pipeline/tag This commit looks good Details

Reviewed-on: #39
pull/41/head 0.10.0
Natalia Serrano 2025-05-14 14:53:17 +02:00
commit ed070bc566
2 changed files with 16 additions and 3 deletions

View File

@ -5,6 +5,12 @@ 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.10.0] - 2025-05-14
### Changed
- Run the new browser
## [0.9.0] - 2025-05-09
### Added

View File

@ -25,16 +25,23 @@ if [ -f "/usr/share/OGAgent/opengnsys/linux/OGAgentService.py" -a "$ogstatus" !=
export OGAGENTCFG_OGLOG_IP=$oglog
export OGAGENTCFG_URLMENU_IP=$ogcore
python3 -m opengnsys.linux.OGAgentService fg
#GROUP_CONFIG=/opt/opengnsys/ogClient/cfg/${group/ /_}.json
#PYMAJMIN=`python3 --version | cut -d" " -f2 | cut -d. -f1,2`
#export PYTHONPATH=/opt/opengnsys/lib/python$PYMAJMIN
#if [ -f $GROUP_CONFIG ]; then
# /opt/opengnsys/ogClient/./ogclient -c $GROUP_CONFIG
#else
# /opt/opengnsys/ogClient/./ogclient
#fi
else
for FILE in index $OGGROUP $(ogGetIpAddress)
do
[ -f $OGCAC/menus/$FILE.html ] && OGMENU="$OGCAC/menus/$FILE.html"
done
echo "exec /usr/bin/OGBrowser $OGMENU" > /home/root/
/usr/bin/OGBrowser -qws $OGMENU
$OPENGNSYS/bin/launch_browser $OGMENU
fi
# Si fallo en cliente y modo "admin", cargar shell; si no, salir.
if [ "$ogactiveadmin" == "true" ]; then
bash
fi
fi