Skip to content

Commit b1e5d33

Browse files
committed
Undo unneded formatting changes
Change-Id: I93b4b337b5571c1391d37ed914a4fad6b5aa3660
1 parent f58ef2f commit b1e5d33

File tree

2 files changed

+101
-101
lines changed

2 files changed

+101
-101
lines changed

install-photobooth.sh

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -184,21 +184,21 @@ function error() {
184184

185185
function print_logo() {
186186
local logo="
187-
%@@@@.
188-
@@ @@*
189-
@@@@@@@@@@@@@@@@@@@@@@
190-
@@%%%%%%%%%%%%%%%%%%%%%@
191-
@@ @@@@@@ @@
192-
@@ @@ @@ @@
193-
@@ @@ @@ @@
194-
@@ @@ @@ @@
195-
@@ @@ @@ @@
196-
@@ @@@@@@ @@
197-
@@%%%%%%%%%%%%%%%%%%%%%@
198-
199-
P H O T O B O O T H
200-
201-
@@%%%%%%%%%%%%%%%%%%%%%@
187+
%@@@@.
188+
@@ @@*
189+
@@@@@@@@@@@@@@@@@@@@@@
190+
@@%%%%%%%%%%%%%%%%%%%%%@
191+
@@ @@@@@@ @@
192+
@@ @@ @@ @@
193+
@@ @@ @@ @@
194+
@@ @@ @@ @@
195+
@@ @@ @@ @@
196+
@@ @@@@@@ @@
197+
@@%%%%%%%%%%%%%%%%%%%%%@
198+
199+
P H O T O B O O T H
200+
201+
@@%%%%%%%%%%%%%%%%%%%%%@
202202
"
203203

204204
if [ "$SILENT" = true ]; then
@@ -216,28 +216,28 @@ function show_help() {
216216
echo ""
217217
echo "Adjust your setup for Photobooth. Available options:"
218218
echo ""
219-
echo " --branch=<branch> Specify the Git branch to use for installation or updates."
220-
echo " --php=<version> Set the PHP version for the setup (e.g., --php=8.3)."
221-
echo " --silent Run the Photobooth Setup Wizard in silent mode"
222-
echo " for automated installation or updates."
223-
echo " --username=\"<username>\" Required if --silent is used."
224-
echo " Provide a username for installation or updates."
225-
echo " --raspberry Skip automatic Raspberry Pi detection and enable Raspberry Pi specific configuration."
226-
echo " --wayland Skip automatic Wayland detection and enable Wayland configuration."
227-
echo " --update Requires --silent to update Photobooth if installed already."
228-
echo " --skip-webserver Skip web server setup"
229-
echo " (if already configured or e.g. Nginx is used as Webserver)."
230-
echo " --skip-php Skip PHP installation"
231-
echo " (if already configured for used Webserver)."
232-
echo " --skip-node Skip Node.js and npm installation"
233-
echo " (if already installed as required)."
234-
echo " --skip-python Skip python3 installation"
235-
echo " (if already installed as required)."
236-
echo " --skip-gunicorn Skip Gunicorn installation"
237-
echo " (for SumUp webhook service)."
238-
echo " --skip-ngrok Skip ngrok installation"
239-
echo " (for SumUp webhook tunnel)."
240-
echo " --skip-auto-update Skip automatic updates for Photobooth Setup Wizard."
219+
echo " --branch=<branch> Specify the Git branch to use for installation or updates."
220+
echo " --php=<version> Set the PHP version for the setup (e.g., --php=8.3)."
221+
echo " --silent Run the Photobooth Setup Wizard in silent mode"
222+
echo " for automated installation or updates."
223+
echo " --username=\"<username>\" Required if --silent is used."
224+
echo " Provide a username for installation or updates."
225+
echo " --raspberry Skip automatic Raspberry Pi detection and enable Raspberry Pi specific configuration."
226+
echo " --wayland Skip automatic Wayland detection and enable Wayland configuration."
227+
echo " --update Requires --silent to update Photobooth if installed already."
228+
echo " --skip-webserver Skip web server setup"
229+
echo " (if already configured or e.g. Nginx is used as Webserver)."
230+
echo " --skip-php Skip PHP installation"
231+
echo " (if already configured for used Webserver)."
232+
echo " --skip-node Skip Node.js and npm installation"
233+
echo " (if already installed as required)."
234+
echo " --skip-python Skip python3 installation"
235+
echo " (if already installed as required)."
236+
echo " --skip-gunicorn Skip Gunicorn installation"
237+
echo " (for SumUp webhook service)."
238+
echo " --skip-ngrok Skip ngrok installation"
239+
echo " (for SumUp webhook tunnel)."
240+
echo " --skip-auto-update Skip automatic updates for Photobooth Setup Wizard."
241241
echo ""
242242
echo "Examples:"
243243
echo " $0 --silent --branch=dev --php=8.3 --username=\"photobooth\" --update"
@@ -959,7 +959,7 @@ function check_username() {
959959
else
960960
confirm "Invalid Username" "The username '$USERNAME' does not exist. Please try again."
961961
USERNAME=""
962-
fi
962+
fi
963963
fi
964964
else
965965
if [ "$SILENT" = true ]; then
@@ -3591,7 +3591,7 @@ function printer_setup() {
35913591
confirm "Printer Setup" "An unknown error occurred during setup to print from any address."
35923592
;;
35933593
esac
3594-
;;
3594+
;;
35953595
2)
35963596
cups_disable_remote_any
35973597
case $? in
@@ -3608,7 +3608,7 @@ function printer_setup() {
36083608
confirm "Printer Setup" "An unknown error occurred during setup to disable print from any address."
36093609
;;
36103610
esac
3611-
;;
3611+
;;
36123612
3)
36133613
cups_enable_share
36143614
case $? in
@@ -3625,7 +3625,7 @@ function printer_setup() {
36253625
confirm "Printer Setup" "An unknown error occurred during printer sharing."
36263626
;;
36273627
esac
3628-
;;
3628+
;;
36293629
4)
36303630
cups_disable_share
36313631
case $? in
@@ -3642,7 +3642,7 @@ function printer_setup() {
36423642
confirm "Printer Setup" "An unknown error occurred during disabling printer sharing."
36433643
;;
36443644
esac
3645-
;;
3645+
;;
36463646
5)
36473647
cups_enable_remote_admin
36483648
case $? in
@@ -3659,7 +3659,7 @@ function printer_setup() {
36593659
confirm "Printer Setup" "An unknown error occurred during remote administration setup."
36603660
;;
36613661
esac
3662-
;;
3662+
;;
36633663
6)
36643664
cups_disable_remote_admin
36653665
case $? in
@@ -3676,7 +3676,7 @@ function printer_setup() {
36763676
confirm "Printer Setup" "An unknown error occurred during setup to disable remote administration."
36773677
;;
36783678
esac
3679-
;;
3679+
;;
36803680
7)
36813681
setup_printer_groups
36823682
case $? in

lib/configsetup.inc.php

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -14,68 +14,68 @@
1414
** This file defines the admin panel of photobooth. The admin panel definition is done in a JSON variable and structured as follows
1515
**
1616
** Admin panel
17-
** |- Section 1
18-
** | |- Parameter 1
19-
** | |- Parameter 2
20-
** | |- Setting A
21-
** | |- Setting B
22-
** |
23-
** |- Section 2
24-
** | |- Setting C
25-
** | |- Setting D
26-
** | |- Setting E
27-
** |
28-
** |- Section 3
29-
** | |- Parameter 1
30-
** | |- ...
31-
** |
32-
** |...
17+
** |- Section 1
18+
** | |- Parameter 1
19+
** | |- Parameter 2
20+
** | |- Setting A
21+
** | |- Setting B
22+
** |
23+
** |- Section 2
24+
** | |- Setting C
25+
** | |- Setting D
26+
** | |- Setting E
27+
** |
28+
** |- Section 3
29+
** | |- Parameter 1
30+
** | |- ...
31+
** |
32+
** |...
3333
**
3434
** * Section descriptor
35-
** - Always key / array pair
36-
** * 'key': always starts with a character, consists of characters, numbers and underscore only
37-
** - Admin panel sort order is defined by the order in this config file
38-
** - The i18n tag for translation is identified by the actual section key
39-
** - Parameter: Key / Value pairs are parameters which apply to how the section is displayed in the admin panel
40-
** * 'view' (optional): Accepted values are 'basic', 'advanced' or 'expert'. Defines in which admin panel view mode
41-
** the section is shown or not. Missing parameter defaults to 'expert'.
42-
** * 'platform' (optional): Accepted values are 'all', 'linux', 'windows'. Defines whether the section is visible
43-
** by platform. Missing parameter defaults to 'all'
44-
** - Settings: Key / Array pairs define a setting (see next)
35+
** - Always key / array pair
36+
** * 'key': always starts with a character, consists of characters, numbers and underscore only
37+
** - Admin panel sort order is defined by the order in this config file
38+
** - The i18n tag for translation is identified by the actual section key
39+
** - Parameter: Key / Value pairs are parameters which apply to how the section is displayed in the admin panel
40+
** * 'view' (optional): Accepted values are 'basic', 'advanced' or 'expert'. Defines in which admin panel view mode
41+
** the section is shown or not. Missing parameter defaults to 'expert'.
42+
** * 'platform' (optional): Accepted values are 'all', 'linux', 'windows'. Defines whether the section is visible
43+
** by platform. Missing parameter defaults to 'all'
44+
** - Settings: Key / Array pairs define a setting (see next)
4545
**
4646
** * Settings descriptor
47-
** - Is a key / array pair where the key string is distinct across the entire admin panel. Even with different sections, no
48-
** duplicate setting keys are allowed across the file.
49-
** * 'key': always starts with a character, consists of characters, numbers and underscore only
50-
** - Admin panel sort order is defined by the order in this config file
51-
** - The i18n tag for translation is identified by concatenation of section key, ':', setting key. Tags for manual entries
52-
** start with "manual:"
53-
** Examples:
54-
** "general:ui_language"
55-
** "user_interface:button_show_fs"
56-
** "manual:print:print_from_result"
47+
** - Is a key / array pair where the key string is distinct across the entire admin panel. Even with different sections, no
48+
** duplicate setting keys are allowed across the file.
49+
** * 'key': always starts with a character, consists of characters, numbers and underscore only
50+
** - Admin panel sort order is defined by the order in this config file
51+
** - The i18n tag for translation is identified by concatenation of section key, ':', setting key. Tags for manual entries
52+
** start with "manual:"
53+
** Examples:
54+
** "general:ui_language"
55+
** "user_interface:button_show_fs"
56+
** "manual:print:print_from_result"
5757
**
58-
** - Parameter: Can be key/value or key/array pairs. Sort order does not matter.
59-
** * 'view' (optional): Accepted values are 'basic', 'advanced' or 'expert'. Defines in which admin panel view mode
60-
** the section is shown or not. Missing parameter defaults to 'expert'.
61-
** * 'name': Matches the name of the config variable or array. For type 'button' this has no effect.
62-
** * 'data-theme-field'
63-
** * 'type': Values are 'input', 'number', 'range', 'color', 'hidden', 'checkbox', 'multi-select', 'select', 'button'. Defines the actual
64-
** input type in the admin panel for this setting.
65-
** * 'value': Value is a reference to the actual PB config (i.e. 'value' => $config['dev']['reload_on_error']) and pre-
66-
** populates the current config value into the admin panel
67-
** Exceptionally, for type 'button' this is the HTML element ID applied to the actual button itself.
68-
** * 'placeholder': For types 'input', 'range', 'color' to prepopulate / preset the admin panel setting entry
69-
** field / range selector. Often references the default config for this setting
70-
** (i.e 'placeholder' => $defaultConfig['picture']['time_to_live'])
71-
** For type 'button' this is the i18ntag string for the actual button text.
72-
** * 'option': Only for types 'select','multi-select'. Lists the options available in this setting (i.e.
73-
** 'options' => [
74-
** '360px' => 'XS',
75-
** '540px' => 'S',
76-
** ])
77-
** * 'range_min', 'range_max', 'range_step': Only for type 'range'. Define the slider range and step when moved
78-
** * 'unit': Only for type 'range'. Defines the unit of the slider and is used to identify the i18n tag for translation of the unit
58+
** - Parameter: Can be key/value or key/array pairs. Sort order does not matter.
59+
** * 'view' (optional): Accepted values are 'basic', 'advanced' or 'expert'. Defines in which admin panel view mode
60+
** the section is shown or not. Missing parameter defaults to 'expert'.
61+
** * 'name': Matches the name of the config variable or array. For type 'button' this has no effect.
62+
** * 'data-theme-field'
63+
** * 'type': Values are 'input', 'number', 'range', 'color', 'hidden', 'checkbox', 'multi-select', 'select', 'button'. Defines the actual
64+
** input type in the admin panel for this setting.
65+
** * 'value': Value is a reference to the actual PB config (i.e. 'value' => $config['dev']['reload_on_error']) and pre-
66+
** populates the current config value into the admin panel
67+
** Exceptionally, for type 'button' this is the HTML element ID applied to the actual button itself.
68+
** * 'placeholder': For types 'input', 'range', 'color' to prepopulate / preset the admin panel setting entry
69+
** field / range selector. Often references the default config for this setting
70+
** (i.e 'placeholder' => $defaultConfig['picture']['time_to_live'])
71+
** For type 'button' this is the i18ntag string for the actual button text.
72+
** * 'option': Only for types 'select','multi-select'. Lists the options available in this setting (i.e.
73+
** 'options' => [
74+
** '360px' => 'XS',
75+
** '540px' => 'S',
76+
** ]
77+
** * 'range_min', 'range_max', 'range_step': Only for type 'range'. Define the slider range and step when moved
78+
** * 'unit': Only for type 'range'. Defines the unit of the slider and is used to identify the i18n tag for translation of the unit
7979
*/
8080

8181
$configurationService = ConfigurationService::getInstance();

0 commit comments

Comments
 (0)