Skip to content

Commit a60e34e

Browse files
Merge branch 'main' into brdge_detection
2 parents 608b9f0 + 35c99ae commit a60e34e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+287
-281
lines changed

.github/CONTRIBUTOR_AND_GUIDES/install/AppName-install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ msg_info "Installing Dependencies"
184184
$STD apt-get install -y ...
185185
msg_ok "Installed Dependencies"
186186

187-
read -p "Do you wish to enable HTTPS mode? (y/N): " httpschoice
187+
read -p "${TAB3}Do you wish to enable HTTPS mode? (y/N): " httpschoice
188188
```
189189

190190
### 6.2 **Verbosity**

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ All LXC instances created using this repository come pre-installed with Midnight
1616

1717
## 2025-05-15
1818

19+
### 🚀 Updated Scripts
20+
21+
- Update scripts that use "read -p" to properly indent text [@tremor021](https://github.com/tremor021) ([#4498](https://github.com/community-scripts/ProxmoxVE/pull/4498))
22+
- core: Add TAB3 formatting var to core [@tremor021](https://github.com/tremor021) ([#4496](https://github.com/community-scripts/ProxmoxVE/pull/4496))
23+
1924
## 2025-05-14
2025

2126
### 🆕 New Scripts

ct/homarr.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ EOF
151151
systemctl start homarr
152152
msg_ok "Started Services"
153153
msg_ok "Updated Successfully"
154-
read -p "It's recommended to reboot the LXC after an update, would you like to reboot the LXC now ? (y/n): " choice
154+
read -p "${TAB3}It's recommended to reboot the LXC after an update, would you like to reboot the LXC now ? (y/n): " choice
155155
if [[ "$choice" =~ ^[Yy]$ ]]; then
156156
reboot
157157
fi

ct/homeassistant-core.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ function update_script() {
114114

115115
if [ "$UPD" == "3" ]; then
116116
set +Eeuo pipefail
117-
read -r -p "Would you like to use No Authentication? <y/N> " prompt
117+
read -r -p "${TAB3}Would you like to use No Authentication? <y/N> " prompt
118118
msg_info "Installing FileBrowser"
119119
RELEASE=$(curl -fsSL https://api.github.com/repos/filebrowser/filebrowser/releases/latest | grep -o '"tag_name": ".*"' | sed 's/"//g' | sed 's/tag_name: //g')
120120
$STD curl -fsSL https://github.com/filebrowser/filebrowser/releases/download/$RELEASE/linux-amd64-filebrowser.tar.gz | tar -xzv -C /usr/local/bin

install/alpine-docker-install.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ $STD rc-update add docker default
2929
msg_ok "Installed Docker"
3030

3131
get_latest_release() {
32-
curl -fsSL https://api.github.com/repos/$1/releases/latest | grep '"tag_name":' | cut -d'"' -f4
32+
curl -fsSL https://api.github.com/repos/"$1"/releases/latest | grep '"tag_name":' | cut -d'"' -f4
3333
}
3434
PORTAINER_LATEST_VERSION=$(get_latest_release "portainer/portainer")
3535
DOCKER_COMPOSE_LATEST_VERSION=$(get_latest_release "docker/compose")
3636
PORTAINER_AGENT_LATEST_VERSION=$(get_latest_release "portainer/agent")
3737

38-
read -r -p "Would you like to add Portainer? <y/N> " prompt
38+
read -r -p "${TAB3}Would you like to add Portainer? <y/N> " prompt
3939
if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
4040
msg_info "Installing Portainer $PORTAINER_LATEST_VERSION"
4141
docker volume create portainer_data >/dev/null
@@ -49,7 +49,7 @@ if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
4949
portainer/portainer-ce:latest
5050
msg_ok "Installed Portainer $PORTAINER_LATEST_VERSION"
5151
else
52-
read -r -p "Would you like to add the Portainer Agent? <y/N> " prompt
52+
read -r -p "${TAB3}Would you like to add the Portainer Agent? <y/N> " prompt
5353
if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
5454
msg_info "Installing Portainer agent $PORTAINER_AGENT_LATEST_VERSION"
5555
$STD docker run -d \
@@ -62,13 +62,13 @@ else
6262
msg_ok "Installed Portainer Agent $PORTAINER_AGENT_LATEST_VERSION"
6363
fi
6464
fi
65-
read -r -p "Would you like to add Docker Compose? <y/N> " prompt
65+
read -r -p "${TAB3}Would you like to add Docker Compose? <y/N> " prompt
6666
if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
6767
msg_info "Installing Docker Compose $DOCKER_COMPOSE_LATEST_VERSION"
6868
DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker}
69-
mkdir -p $DOCKER_CONFIG/cli-plugins
70-
curl -fsSL https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_LATEST_VERSION/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
71-
chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose
69+
mkdir -p "$DOCKER_CONFIG"/cli-plugins
70+
curl -fsSL https://github.com/docker/compose/releases/download/"$DOCKER_COMPOSE_LATEST_VERSION"/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
71+
chmod +x "$DOCKER_CONFIG"/cli-plugins/docker-compose
7272
msg_ok "Installed Docker Compose $DOCKER_COMPOSE_LATEST_VERSION"
7373
fi
7474

install/alpine-komodo-install.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ $STD rc-update add docker boot
2626
$STD service docker start
2727
msg_ok "Enabled Docker Service"
2828

29-
echo "Choose the database for Komodo installation:"
30-
echo "1) MongoDB (recommended)"
31-
echo "2) SQLite"
32-
echo "3) PostgreSQL"
33-
read -rp "Enter your choice (default: 1): " DB_CHOICE
29+
echo "${TAB3}Choose the database for Komodo installation:"
30+
echo "${TAB3}1) MongoDB (recommended)"
31+
echo "${TAB3}2) SQLite"
32+
echo "${TAB3}3) PostgreSQL"
33+
read -rp "${TAB3}Enter your choice (default: 1): " DB_CHOICE
3434
DB_CHOICE=${DB_CHOICE:-1}
3535

3636
case $DB_CHOICE in

install/alpine-mariadb-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql >/dev/null
2929
$STD rc-service mariadb start
3030
msg_ok "MariaDB Configured"
3131

32-
read -r -p "Would you like to install Adminer with lighttpd? <y/N>: " prompt
32+
read -r -p "${TAB3}Would you like to install Adminer with lighttpd? <y/N>: " prompt
3333
if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
3434
msg_info "Installing Adminer and dependencies"
3535
$STD apk add --no-cache \

install/alpine-postgresql-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ sed -i '/^host\s\+all\s\+all\s\+127.0.0.1\/32\s\+md5/ s/.*/host all all 0.0.0.0\
3333
$STD rc-service postgresql restart
3434
msg_ok "Configured and Restarted PostgreSQL"
3535

36-
read -r -p "Would you like to install Adminer with lighttpd? <y/N>: " prompt
36+
read -r -p "${TAB3}Would you like to install Adminer with lighttpd? <y/N>: " prompt
3737
if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
3838
msg_info "Installing Adminer and dependencies"
3939
$STD apk add --no-cache \

install/alpine-traefik-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ msg_info "Installing Traefik"
2121
$STD apk add traefik --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community
2222
msg_ok "Installed Traefik"
2323

24-
read -p "Enable Traefik WebUI (Port 8080)? [y/N]: " enable_webui
24+
read -p "${TAB3}Enable Traefik WebUI (Port 8080)? [y/N]: " enable_webui
2525
if [[ "$enable_webui" =~ ^[Yy]$ ]]; then
2626
msg_info "Configuring Traefik WebUI"
2727
mkdir -p /etc/traefik/config

install/alpine-wireguard-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ $STD rc-update add sysctl
4646
$STD sysctl -p /etc/sysctl.conf
4747
msg_ok "Installed WireGuard"
4848

49-
read -rp "Do you want to install WGDashboard? (y/N): " INSTALL_WGD
49+
read -rp "${TAB3}Do you want to install WGDashboard? (y/N): " INSTALL_WGD
5050
if [[ "$INSTALL_WGD" =~ ^[Yy]$ ]]; then
5151
msg_info "Installing additional dependencies for WGDashboard"
5252
$STD apk add --no-cache \

0 commit comments

Comments
 (0)