First commit calamares options into manjaro-tools.conf
Signed-off-by: Ste74 <stefano@manjaro.org>
This commit is contained in:
parent
5ace583e7d
commit
e1b179cd45
5 changed files with 147 additions and 27 deletions
5
Makefile
5
Makefile
|
@ -1,10 +1,11 @@
|
|||
Version=0.15.8
|
||||
Version=0.15.9
|
||||
|
||||
PREFIX = /usr/local
|
||||
SYSCONFDIR = /etc
|
||||
|
||||
SYSCONF = \
|
||||
data/manjaro-tools.conf
|
||||
data/manjaro-tools.conf \
|
||||
data/branding.desc.d
|
||||
|
||||
BIN_BASE = \
|
||||
bin/mkchroot \
|
||||
|
|
87
data/branding.desc.d
Normal file
87
data/branding.desc.d
Normal file
|
@ -0,0 +1,87 @@
|
|||
---
|
||||
componentName: manjaro
|
||||
|
||||
# This selects between different welcome texts. When false, uses
|
||||
# the traditional "Welcome to the %1 installer.", and when true,
|
||||
# uses "Welcome to the Calamares installer for %1." This allows
|
||||
# to distinguish this installer from other installers for the
|
||||
# same distribution.
|
||||
welcomeStyleCalamares: ${welcomestyle}
|
||||
|
||||
# Should the welcome image (productWelcome, below) be scaled
|
||||
# up beyond its natural size? If false, the image does not grow
|
||||
# with the window but remains the same size throughout (this
|
||||
# may have surprising effects on HiDPI monitors).
|
||||
welcomeExpandingLogo: ${welcomelogo}
|
||||
|
||||
# Size and expansion policy for Calamares.
|
||||
# - "normal" or unset, expand as needed, use *windowSize*
|
||||
# - "fullscreen", start as large as possible, ignore *windowSize*
|
||||
# - "noexpand", never expand, use *windowSize*
|
||||
windowExpanding: ${windowexp}
|
||||
|
||||
# Size of Calamares window, expressed as w,h. Both w and h
|
||||
# may be either pixels (suffix px) or font-units (suffix em).
|
||||
# e.g. "800px,600px"
|
||||
# "60em,480px"
|
||||
# This setting is ignored if "fullscreen" is selected for
|
||||
# *windowExpanding*, above. If not set, use constants defined
|
||||
# in CalamaresUtilsGui, 800x520.
|
||||
windowSize: ${windowsize}
|
||||
|
||||
# These are strings shown to the user in the user interface.
|
||||
# There is no provision for translating them -- since they
|
||||
# are names, the string is included as-is.
|
||||
#
|
||||
# The four Url strings are the Urls used by the buttons in
|
||||
# the welcome screen, and are not shown to the user. Clicking
|
||||
# on the "Support" button, for instance, opens the link supportUrl.
|
||||
# If a Url is empty, the corresponding button is not shown.
|
||||
#
|
||||
# bootloaderEntryName is how this installation / distro is named
|
||||
# in the boot loader (e.g. in the GRUB menu).
|
||||
strings:
|
||||
productName: ${dist_name} Linux
|
||||
shortProductName: ${dist_name}
|
||||
version: ${dist_release}
|
||||
shortVersion: ${dist_release}
|
||||
versionedName: ${dist_name} Linux ${dist_release} "${dist_codename}"
|
||||
shortVersionedName: ${dist_name} ${dist_release}
|
||||
bootloaderEntryName: ${dist_name}
|
||||
|
||||
# These images are loaded from the branding module directory.
|
||||
#
|
||||
# productIcon is used as the window icon, and will (usually) be used
|
||||
# by the window manager to represent the application. This image
|
||||
# should be square, and may be displayed by the window manager
|
||||
# as small as 16x16 (but possibly larger).
|
||||
# productLogo is used as the logo at the top of the left-hand column
|
||||
# which shows the steps to be taken. The image should be square,
|
||||
# and is displayed at 80x80 pixels (also on HiDPI).
|
||||
# productWelcome is shown on the welcome page of the application in
|
||||
# the middle of the window, below the welcome text. It can be
|
||||
# any size and proportion, and will be scaled to fit inside
|
||||
# the window. Use `welcomeExpandingLogo` to make it non-scaled.
|
||||
# Recommended size is 320x150.
|
||||
images:
|
||||
productLogo: "logo.png"
|
||||
productIcon: "logo.png"
|
||||
productWelcome: "languages.png"
|
||||
|
||||
# The slideshow is displayed during execution steps (e.g. when the
|
||||
# installer is actually writing to disk and doing other slow things).
|
||||
slideshow: "show.qml"
|
||||
|
||||
# Colors for text and background components.
|
||||
#
|
||||
# - sidebarBackground is the background of the sidebar
|
||||
# - sidebarText is the (foreground) text color
|
||||
# - sidebarTextHighlight sets the background of the selected (current) step.
|
||||
# Optional, and defaults to the application palette.
|
||||
# - sidebarSelect is the text color of the selected step.
|
||||
#
|
||||
style:
|
||||
sidebarBackground: "${sidebackground}"
|
||||
sidebarText: "${sidebartext}"
|
||||
sidebarTextSelect: "${sidebartextselect}"
|
||||
sidebarTextHighlight: "${sidebartexthighlight}"
|
|
@ -49,6 +49,9 @@
|
|||
# the dist codename; default: auto
|
||||
# dist_codename=Illyria
|
||||
|
||||
# the OS branding; default: auto
|
||||
# dist_name
|
||||
|
||||
# the branding; default: auto
|
||||
# dist_branding="MJRO"
|
||||
|
||||
|
@ -62,6 +65,36 @@
|
|||
# gpg key; leave empty or commented to skip sfs signing
|
||||
# gpgkey=""
|
||||
|
||||
########## calamares preferences ##########
|
||||
#See branding.desc.d for reference
|
||||
|
||||
# welcome style for calamares: true="Welcome to the %1 installer." ; false="Welcome to the Calamares installer for %1." (default)
|
||||
# welcomestyle=false
|
||||
|
||||
# welcome image scaled (productWelcome)
|
||||
# welcomelogo=true
|
||||
|
||||
# size and expansion policy for Calamares (possible value: normal,fullscreen,noexpand)
|
||||
# windowexp=noexpand
|
||||
|
||||
# size of Calamares window, expressed as w,h.
|
||||
# (possible units: pixel (px) or font-units (em))
|
||||
# windowsize="800px,520px"
|
||||
|
||||
# colors for text and background components:
|
||||
|
||||
# background of the sidebar
|
||||
# sidebarbackground=#454948
|
||||
|
||||
# text color
|
||||
# sidebartext=#efefef
|
||||
|
||||
# background of the selected step
|
||||
# sidebartextselect=#4d915e
|
||||
|
||||
# text color of the selected step
|
||||
# sidebartexthighlight=#1a1c1b
|
||||
|
||||
################ deployiso ################
|
||||
|
||||
# the server user
|
||||
|
|
|
@ -96,32 +96,9 @@ configure_lsb(){
|
|||
}
|
||||
|
||||
configure_branding(){
|
||||
|
||||
msg2 "Configuring branding"
|
||||
echo "---
|
||||
componentName: manjaro
|
||||
|
||||
strings:
|
||||
productName: Manjaro Linux
|
||||
shortProductName: Manjaro
|
||||
version: ${dist_release}
|
||||
shortVersion: ${dist_release}
|
||||
versionedName: Manjaro Linux ${dist_release} "${dist_codename}"
|
||||
shortVersionedName: Manjaro ${dist_release}
|
||||
bootloaderEntryName: Manjaro
|
||||
|
||||
images:
|
||||
productLogo: "logo.png"
|
||||
productIcon: "logo.png"
|
||||
productWelcome: "languages.png"
|
||||
|
||||
slideshow: "show.qml"
|
||||
|
||||
style:
|
||||
sidebarBackground: "#454948"
|
||||
sidebarText: "#efefef"
|
||||
sidebarTextSelect: "#9E4F5D"
|
||||
|
||||
" > $1/usr/share/calamares/branding/manjaro/branding.desc
|
||||
cat /etc/manjaro-tools/branding.desc.d > $1/usr/share/calamares/branding/manjaro/branding.desc
|
||||
}
|
||||
|
||||
configure_logind(){
|
||||
|
|
22
lib/util.sh
22
lib/util.sh
|
@ -333,6 +333,26 @@ init_buildiso(){
|
|||
mhwd_repo="/opt/pkg"
|
||||
}
|
||||
|
||||
init_calamares(){
|
||||
|
||||
[[ -z ${welcomestyle} ]] && welcomestyle=false
|
||||
|
||||
[[ -z ${welcomelogo} ]] && welcomelogo=true
|
||||
|
||||
[[ -z ${windowexp} ]] && windowexp=noexpand
|
||||
|
||||
[[ -z ${windowsize} ]] && windowsize="800px,520px"
|
||||
|
||||
[[ -z ${sidebarbackground} ]] && sidebarbackground=#454948
|
||||
|
||||
[[ -z ${sidebartext} ]] && sidebartext=#efefef
|
||||
|
||||
[[ -z ${sidebartextselect} ]] && sidebartextselect=#4d915e
|
||||
|
||||
[[ -z ${sidebartexthighlight} ]] && sidebartexthighlight=#1a1c1b
|
||||
}
|
||||
|
||||
|
||||
init_deployiso(){
|
||||
|
||||
host="osdn.net"
|
||||
|
@ -364,6 +384,8 @@ load_config(){
|
|||
|
||||
init_buildiso
|
||||
|
||||
init_calamares
|
||||
|
||||
init_deployiso
|
||||
|
||||
return 0
|
||||
|
|
Loading…
Reference in a new issue