Skip to content

chimera 3 #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbbletterman merged 4 commits into from
Dec 10, 2025
Merged

chimera 3 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ef352c
Merge pull request #57 from duonl/develop/ALPHA
jbbletterman Dec 9, 2025
6ec6f40
kill old screensaver
jbbletterman Dec 9, 2025
f223b2b
extend echos
jbbletterman Dec 9, 2025
15cc509
no need to kill screen saver, dies with X
jbbletterman Dec 9, 2025
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
4 changes: 2 additions & 2 deletions script/Xconfigure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,10 @@ if [[ -n "${BCLD_SCREENSAVER}" ]]; then
BCLD_SS_TIMEOUT="0:${BCLD_SCREENSAVER}:00"

/usr/bin/echo "BCLD_SCREENSAVER found!: ${BCLD_SS_TIMEOUT}"
/usr/bin/echo "timeout: ${BCLD_SS_TIMEOUT}" >> "${SS_CONFIG}"
/usr/bin/echo -e "\ntimeout: ${BCLD_SS_TIMEOUT}" >> "${SS_CONFIG}"
else
/usr/bin/echo "BCLD_SCREENSAVER not found! Using default: ${DEFAULT_SS_TIMEOUT}"
/usr/bin/echo "timeout: ${DEFAULT_SS_TIMEOUT}" >> "${SS_CONFIG}"
/usr/bin/echo -e "\ntimeout: ${DEFAULT_SS_TIMEOUT}" >> "${SS_CONFIG}"
fi

/usr/bin/xscreensaver &
Expand Down
4 changes: 2 additions & 2 deletions test/bcld.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ a1d62bcaf8202e22136ae828daf6b389 ./.gitignore
ef29c64bd35fec47b154096be5a4c7d0 ./IMG-builder.sh
65638da7960b4cfc03b3c34809d62561 ./ISO-builder.sh
524b704f7687543521a4f126f3b50422 ./LICENSE.eupl
dbdea4a3be2b93ef495c21a01d75527e ./README.md
cfde01eb893fc8ea1dcbca877ef1f340 ./README.md
f6c4276a99ee9de5b0bc0e385f7f4b57 ./RepoMan.sh
b1447f0cf092dc2f9c8770aaedd8fb5f ./SECURITY.md
5ee37144e15f8bf49e7f683935a27f15 ./assets/bcld-logo.png
Expand Down Expand Up @@ -101,7 +101,7 @@ bc8d4c92bdbadd1c62c088184f39073f ./config/trap_shutdown/virt/virt-warning-5.png
c99677e6deb495fb2b90cbfb84ac7349 ./config/udev/rules.d/BCLD-USB.rules
87ecdd57738b7ed7fe23e3da8a492593 ./image/ISO/README.diskdefines
49a4210f52e5bcc79077d12c3dfd63f5 ./image/ISO/isolinux/isolinux.cfg
25dd76d6889e35fe9800c1465067944a ./script/Xconfigure.sh
9e2a5b057da738bc2f2cdeb136639d9f ./script/Xconfigure.sh
3f0e4d55a962e4dd009c1ae8c4db7739 ./script/autocert.sh
f6604ec06c9aa1b19247785ed0f280a2 ./script/bcld_app.sh
caeaba6f3ea103a2d0ee5a68b44baa93 ./script/bcld_vendor.sh
Expand Down
2 changes: 1 addition & 1 deletion test/md5sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1196c31d71e63647f71b867192dedb4d ./test/bcld.md5
eafe14e0bf4476b39c4dace7bba90040 ./test/bcld.md5