michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 06:03:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor the way bootscript is override to reduce duplication

Browse Source
This commit is contained in:
Jamie Cameron
2022-08-13 11:40:31 -07:00
parent 0fe3479fb0
commit 95088a2bef
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup.pl
View File

@@ -132,9 +132,9 @@ if ($upgrading) {
# Get current bootscript name
if (-r "$config_directory/bootscript-name") {
open(BOOTVAR, "$config_directory/bootscript-name");
chop($bootscript = <BOOTVAR>);
chop($newbootscript = <BOOTVAR>);
close(BOOTVAR);
$bootscript ||= ($ENV{'bootscript'} || "webmin");
$bootscript = $newbootscript if ($newbootscript);
}
# Force creation if non-existant

6
setup.sh
View File

@@ -159,9 +159,9 @@ if [ "$upgrading" = 1 ]; then
# Get current bootscript
if [ -r "$config_dir/bootscript-name" ]; then
bootscript=`cat $config_dir/bootscript-name`
if [ "$bootscript" = "" ]; then
bootscript="webmin"
newbootscript=`cat $config_dir/bootscript-name`
if [ "$newbootscript" != "" ]; then
bootscript="$newbootscript"
fi
fi