diff --git a/README.md b/README.md index daf45a42..58bdc05e 100644 --- a/README.md +++ b/README.md @@ -9,13 +9,13 @@ href="https://ko-fi.com/D1D7EP4GF"> Proxmox VE 7 Post Install - +

Proxmox VE 7 Post Install

The script will give options to Disable the Enterprise Repo, Add/Correct PVE7 Sources, Enable the No-Subscription Repo, Add Test Repo, Disable Subscription Nag, Update Proxmox VE and Reboot PVE. - + Run the following in the Proxmox Shell. ⚠️ **PVE7 ONLY** ```yaml @@ -24,31 +24,31 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/post-pve-i It's recommended to answer `y` to all options. -____________________________________________________________________________________________ +____________________________________________________________________________________________
Proxmox Kernel Clean - +

Proxmox Kernel Clean

Cleaning unused kernel images is not only good because of a reduced grub menu, but also gains some disk space. - + Run the following in the Proxmox Shell. ```yaml bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/kernel-clean.sh)" ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
Proxmox Edge Kernel Tool - +

Proxmox Edge Kernel Tool

@@ -60,13 +60,13 @@ Run the following in the Proxmox Shell. ```yaml bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/edge-kernel.sh)" ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
Proxmox CPU Scaling Governor - +

Proxmox CPU Scaling Governor

@@ -74,43 +74,43 @@ ________________________________________________________________________________ CPU Scaling Governor enables the operating system to scale the CPU frequency up or down in order to save power or improve performance. [Generic Scaling Governors](https://www.kernel.org/doc/html/latest/admin-guide/pm/cpufreq.html?#generic-scaling-governors) - + Run the following in the Proxmox Shell. ```yaml bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/scaling-governor.sh)" ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
Proxmox LXC Updater - +

Proxmox LXC Updater

Update All LXC's Fast & Easy - + Run the following in the Proxmox Shell. ```yaml bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/update-lxcs.sh)" ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
Proxmox Dark Theme - +

Proxmox Discord Dark Theme

A dark theme for the Proxmox Web UI by [Weilbyte](https://github.com/Weilbyte/PVEDiscordDark) - + Run the following in the Proxmox Shell. ```yaml @@ -119,19 +119,19 @@ bash <(curl -s https://raw.githubusercontent.com/Weilbyte/PVEDiscordDark/master/ To uninstall the theme, simply run the script with the `uninstall` command. -____________________________________________________________________________________________ +____________________________________________________________________________________________
Proxmox Backup Server Post Install - +

Proxmox Backup Server Post Install

The script will give options to Disable the Enterprise Repo, Add/Correct PBS Sources, Enable the No-Subscription Repo, Add Test Repo, Disable Subscription Nag, Update Proxmox Backup Server and Reboot PBS. - + Run the following in the Proxmox Shell. ⚠️ **Proxmox Backup Server ONLY** ```yaml @@ -140,7 +140,7 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/post-pbs-i It's recommended to answer `y` to all options. -____________________________________________________________________________________________ +____________________________________________________________________________________________
⬆__________________________________________________________________________________________ @@ -152,9 +152,9 @@ ________________________________________________________________________________
Home Assistant OS VM - +

- +

Home Assistant OS VM

Option to create VM using Stable, Beta, Dev or Latest Image

@@ -166,20 +166,20 @@ To create a new Proxmox Home Assistant OS VM, run the following in the Proxmox S bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/vm/haos-vm-v4.sh)" ```

⚡ Default Settings: 4GB RAM - 32GB Storage - 2vCPU - Stable Image⚡

- + After the script completes, click on the VM, then on the **_Summary_** tab to find the VM IP. **Home Assistant Interface - IP:8123** -____________________________________________________________________________________________ - +____________________________________________________________________________________________ +
PiMox HAOS VM - +

- +

PiMox HAOS VM

Option to create VM using Stable, Beta or Dev Image

@@ -191,18 +191,18 @@ To create a new PiMox HAOS VM, run the following in the Proxmox Shell bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/vm/pimox-haos-vm-v4.sh)" ```

⚡ Default Settings: 4GB RAM - 32GB Storage - 2vCPU - Stable Image⚡

- + After the script completes, click on the VM Console to find the Home Assistant IP. **Home Assistant Interface - IP:8123** -____________________________________________________________________________________________ - +____________________________________________________________________________________________ +
Home Assistant Container LXC - +

Docker Logos | Docker @home-assistantGitHub - portainer/portainer-docs: Portainer documentation

@@ -213,11 +213,11 @@ A standalone container-based installation of Home Assistant Core 🛈 *If the LXC is created Privileged, the script will automatically set up USB passthrough.* To create a new Proxmox Home Assistant Container LXC, run the following in the Proxmox Shell. - + ```yaml bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/homeassistant-v4.sh)" ``` - +

⚡ Default Settings: 2GB RAM - 16GB Storage - 2vCPU ⚡

**Home Assistant Interface - IP:8123** @@ -229,7 +229,7 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/homeassistan /var/lib/docker/volumes/hass_config/_data ``` ⚙️ **To Edit the HA configuration.yaml** (Recommend Using File Browser) - + Run in the LXC console ```yaml nano /var/lib/docker/volumes/hass_config/_data/configuration.yaml @@ -258,12 +258,12 @@ Run in the LXC console ```yaml ./update ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
Home Assistant Core LXC - +

Home Assistant Core LXC

@@ -273,11 +273,11 @@ A standalone installation of Home Assistant Core 🛈 *If the LXC is created Privileged, the script will automatically set up USB passthrough.* To create a new Proxmox Home Assistant Core LXC, run the following in the Proxmox Shell. - + ```yaml bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/homeassistant-core-v4.sh)" ``` - +

⚡ Default Settings: 1GB RAM - 8GB Storage - 2vCPU ⚡

⚠️ Initialize Home Assistant-Core (Only required once) @@ -296,7 +296,7 @@ cd /srv/homeassistant && python3 -m venv . && source bin/activate && hass nano .homeassistant/configuration.yaml ``` Save and exit the editor with “Ctrl+O”, “Enter” and “Ctrl+X” - + ⚙️ **Install HACS:** Run in the LXC console @@ -311,29 +311,29 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/hacs-core. ```yaml systemctl stop homeassistant.service && source /srv/homeassistant/bin/activate && pip3 install --upgrade homeassistant && systemctl start homeassistant.service && exit ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
Podman Home Assistant Container LXC - +

@home-assistant

- +

Podman Home Assistant Container LXC

A standalone container-based installation of Home Assistant Core ⚠️ Podman seems to need a privileged LXC -To create a new Proxmox Podman Home Assistant Container LXC, run the following in the Proxmox Shell. +To create a new Proxmox Podman Home Assistant Container LXC, run the following in the Proxmox Shell. ```yaml bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/podman-homeassistant-v4.sh)" ```

⚡ Default Settings: 2GB RAM - 16GB Storage - 2vCPU ⚡

- + **Home Assistant Interface - IP:8123** - + **Yacht Interface - IP:8000** ⚙️ **Path to HA /config** @@ -341,7 +341,7 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/podman-homea /var/lib/containers/storage/volumes/hass_config/_data ``` ⚙️ **To edit the HA configuration.yaml** - + Run in the LXC console ```yaml nano /var/lib/containers/storage/volumes/hass_config/_data/configuration.yaml @@ -356,12 +356,12 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/ha-copy-da ``` ⚙️ **To allow USB device passthrough:** - + Run in the Proxmox Shell. (**replace `106` with your LXC ID**) ```yaml bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/usb-passthrough.sh)" -s 106 ``` - + Reboot the LXC to apply the changes ⚙️ **To Install HACS:** @@ -374,16 +374,16 @@ After install, reboot Home Assistant and **clear browser cache** then Add HACS i ⚙️ **Initial Yacht Login** -**username** +**username** ```yaml admin@yacht.local ``` - **password** + **password** ```yaml pass ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
⬆__________________________________________________________________________________________ @@ -394,13 +394,13 @@ ________________________________________________________________________________
ioBroker LXC - +

ioBroker LXC

- + [ioBroker](https://www.iobroker.net/#en/intro) is an open source automation platform. - + To create a new Proxmox ioBroker LXC, run the following in the Proxmox Shell. ```yaml @@ -408,7 +408,7 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/iobroker-v4. ```

⚡ Default Settings: 2GB RAM - 8GB Storage - 2vCPU ⚡

- + **ioBroker Interface - IP:8081** ⚙️ **To Update ioBroker** @@ -417,19 +417,19 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/iobroker-v4. update from the ioBroker UI ``` -____________________________________________________________________________________________ - +____________________________________________________________________________________________ +
openHAB LXC - +

openHAB LXC

- + [openHAB](https://www.openhab.org/), a vendor and technology agnostic open source automation software for your home. - + To create a new Proxmox openHAB LXC, run the following in the Proxmox Shell. ```yaml @@ -437,7 +437,7 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/openhab-v4.s ```

⚡ Default Settings: 2GB RAM - 8GB Storage - 2vCPU ⚡

- + **openHAB Interface - IP:8080** ⚙️ **To Update openHAB** @@ -446,13 +446,13 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/openhab-v4.s apt update && apt upgrade -y ``` -____________________________________________________________________________________________ - +____________________________________________________________________________________________ +
Homebridge LXC - +

Homebridge LXC

@@ -466,33 +466,33 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/homebridge-v ```

⚡ Default Settings: 1GB RAM - 4GB Storage - 1vCPU ⚡

- + **Homebridge Interface - IP:8581** ⚙️ **Initial Login** -**username** +**username** ```yaml admin ``` - **password** + **password** ```yaml admin ``` Config File Path `/var/lib/homebridge/config.json` - + Storage Path `/var/lib/homebridge` - + Restart Command `sudo hb-service restart` - + Stop Command `sudo hb-service stop` - + Start Command `sudo hb-service start` - + View Logs Command `sudo hb-service logs` - + Systemd Service File `/etc/systemd/system/homebridge.service` - + Systemd Env File `/etc/default/homebridge` ⚙️ **To Update Homebridge** @@ -501,15 +501,15 @@ Systemd Env File `/etc/default/homebridge` Update from the Homebridge UI ``` - ___________________________________________________________________________________________ - + ___________________________________________________________________________________________ +
ESPHome LXC - +

ESPHome LXC

@@ -523,7 +523,7 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/esphome-v4.s ```

⚡ Default Settings: 1GB RAM - 4GB Storage - 2vCPU ⚡

- + **ESPHome Interface - IP:6052** ⚙️ **To Update ESPHome** @@ -533,17 +533,17 @@ Run in the LXC console pip3 install esphome --upgrade ``` -____________________________________________________________________________________________ - +____________________________________________________________________________________________ +
Node-Red LXC - +

Node-Red LXC

- + [Node-RED](https://nodered.org/) is a programming tool for wiring together hardware devices, APIs and online services in new and interesting ways. To create a new Proxmox Node-RED LXC, run the following in the Proxmox Shell. @@ -553,9 +553,9 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/node-red-v4. ```

⚡ Default Settings: 1GB RAM - 4GB Storage - 1vCPU ⚡

- + **Node-Red Interface - IP:1880** - + ⚙️ **To Restart Node-Red:** Run in the LXC console @@ -577,19 +577,19 @@ Run in the LXC console bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/node-red-themes.sh)" ``` -____________________________________________________________________________________________ - +____________________________________________________________________________________________ +
n8n LXC - +

n8n LXC

- + [n8n](https://n8n.io/) is an extendable workflow automation tool which enables you to connect anything to everything. - + To create a new Proxmox n8n LXC, run the following in the Proxmox Shell. ```yaml @@ -597,7 +597,7 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/n8n-v4.sh)" ```

⚡ Default Settings: 2GB RAM - 3GB Storage - 2vCPU ⚡

- + **n8n Interface: IP:5678** ⚙️ **To Update n8n** @@ -606,8 +606,8 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/n8n-v4.sh)" npm update -g n8n ``` -____________________________________________________________________________________________ - +____________________________________________________________________________________________ +
⬆__________________________________________________________________________________________ @@ -618,7 +618,7 @@ ________________________________________________________________________________
MQTT LXC - +

MQTT LXC

@@ -632,7 +632,7 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/mqtt-v4.sh)" ```

⚡ Default Settings: 512MiB RAM - 2GB Storage - 1vCPU ⚡

- + Mosquitto comes with a password file generating utility called mosquitto_passwd. ```yaml sudo mosquitto_passwd -c /etc/mosquitto/passwd @@ -664,13 +664,13 @@ Run in the LXC console apt update && apt upgrade -y ``` -____________________________________________________________________________________________ - +____________________________________________________________________________________________ +
EMQX LXC - +

@@ -686,15 +686,15 @@ To create a new Proxmox EMQX LXC, run the following in the Proxmox Shell.

⚡ Default Settings: 1GB RAM - 4GB Storage - 2vCPU ⚡

-**EMQX Interface - IP:18083** - +**EMQX Interface - IP:18083** + ⚙️ **Initial Login** -**username** +**username** ```yaml admin ``` - **password** + **password** ```yaml public ``` @@ -709,7 +709,7 @@ Run in the LXC console apt update && apt upgrade -y ``` - ____________________________________________________________________________________________ + ____________________________________________________________________________________________
⬆__________________________________________________________________________________________ @@ -722,7 +722,7 @@ apt update && apt upgrade -y
Mariadb LXC - +

MariaDB

Mariadb LXC

@@ -731,13 +731,13 @@ apt update && apt upgrade -y [MariaDB](https://mariadb.org/) is a community-developed, commercially supported fork of the MySQL relational database management system. To create a new Proxmox Mariadb LXC, run the following in the Proxmox Shell. - + ```yaml bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/mariadb-v4.sh)" ```

⚡ Default Settings: 1GB RAM - 4GB Storage - 1vCPU ⚡

- + To enable MariaDB to listen to remote connections, you need to edit your defaults file. To do this, open the console in your MariaDB lxc: ```yaml nano /etc/mysql/my.cnf @@ -758,23 +758,23 @@ Run the security script: sudo mysql_secure_installation ``` Enter current password for root (enter for none): `enter` - -Switch to unix_socket authentication [Y/n] `y` - -Change the root password? [Y/n] `n` - -Remove anonymous users? [Y/n] `y` - -Disallow root login remotely? [Y/n] `y` - -Remove test database and access to it? [Y/n] `y` - -Reload privilege tables now? [Y/n] `y` -We will create a new account called admin with the same capabilities as the root account, but configured for password authentication. +Switch to unix_socket authentication [Y/n] `y` + +Change the root password? [Y/n] `n` + +Remove anonymous users? [Y/n] `y` + +Disallow root login remotely? [Y/n] `y` + +Remove test database and access to it? [Y/n] `y` + +Reload privilege tables now? [Y/n] `y` + +We will create a new account called admin with the same capabilities as the root account, but configured for password authentication. ```yaml sudo mysql -``` +``` Prompt will change to ```MariaDB [(none)]>``` Create a new local admin (Change the username and password to match your preferences) @@ -810,20 +810,20 @@ Following this, exit the MariaDB shell: ```yaml exit ``` -⚠️ Reboot the lxc +⚠️ Reboot the lxc Checking status. ```yaml sudo systemctl status mariadb -``` +``` Change the recorder: `db_url:` in your HA configuration.yaml - + Example: ```yaml recorder: db_url: mysql://admin:password@192.168.100.26:3306/homeassistant?charset=utf8mb4 ``` - + ⚙️ **To Update Mariadb:** Run in the LXC console @@ -831,16 +831,16 @@ Run in the LXC console apt update && apt upgrade -y ``` ⚙️ [**Adminer**](https://raw.githubusercontent.com/tteck/Proxmox/main/misc/images/adminer.png) (formerly phpMinAdmin) is a full-featured database management tool - + `http://your-mariadb-lxc-ip/adminer/` -____________________________________________________________________________________________ +____________________________________________________________________________________________
PostgreSQL LXC - +

PostgreSQL LXC

@@ -849,7 +849,7 @@ ________________________________________________________________________________ [PostgreSQL](https://www.postgresql.org/), also known as Postgres, is a free and open-source relational database management system emphasizing extensibility and SQL compliance. To create a new Proxmox PostgreSQL LXC, run the following in the Proxmox Shell. - + ```yaml bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/postgresql-v4.sh)" ``` @@ -863,11 +863,11 @@ Change user password passwd postgres ``` Login using Postgres system account - + ```yaml su - postgres ``` -Now, change the Admin database password +Now, change the Admin database password ```yaml psql -c "ALTER USER postgres WITH PASSWORD 'your-password';" ``` @@ -889,16 +889,16 @@ GRANT ALL ON DATABASE homeassistant TO admin; To exit psql ```yaml \q -``` +``` Then type exit to get back to root Change the recorder: `db_url:` in your HA configuration.yaml - + Example: ```yaml recorder: db_url: postgresql://admin:your-password@192.168.100.20:5432/homeassistant?client_encoding=utf8 -``` +``` ⚙️ **To Update PostgreSQL** Run in the LXC console @@ -906,16 +906,16 @@ Run in the LXC console apt update && apt upgrade -y ``` ⚙️ [**Adminer**](https://raw.githubusercontent.com/tteck/Proxmox/main/misc/images/adminer.png) (formerly phpMinAdmin) is a full-featured database management tool - + `http://your-PostgreSQL-lxc-ip/adminer/` -____________________________________________________________________________________________ +____________________________________________________________________________________________
InfluxDB LXC - +

InfluxDB LXC

@@ -955,7 +955,7 @@ Run in the LXC console apt update && apt upgrade -y ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
⬆__________________________________________________________________________________________ @@ -967,7 +967,7 @@ ________________________________________________________________________________
Zigbee2MQTT LXC - +

@@ -984,9 +984,9 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/zigbee2mqtt- ```

⚡ Default Settings: 1GB RAM - 4GB Storage - 2vCPU ⚡

- + ⚙️ **Determine the location of your adapter** - + Run in the LXC console ```yaml ls -l /dev/serial/by-id @@ -995,7 +995,7 @@ Example Output: ```lrwxrwxrwx 1 root root 13 Jun 19 17:30 usb-1a86_USB_Serial-if ⚙️ ⚠️ **Before you start Zigbee2MQTT you need to edit the [configuration.yaml](https://www.zigbee2mqtt.io/guide/configuration/)** - + Run in the LXC console ```yaml nano /opt/zigbee2mqtt/data/configuration.yaml @@ -1026,13 +1026,13 @@ advanced: channel: 20 ``` ⚙️ **Zigbee2MQTT can be started after completing the configuration** - + Run in the LXC console ```yaml cd /opt/zigbee2mqtt && npm start ``` ⚙️ **To update Zigbee2MQTT** - + Run in the LXC console ```yaml cd /opt/zigbee2mqtt && bash update.sh @@ -1044,13 +1044,13 @@ Run in the Proxmox Shell bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/z2m-copy-data.sh)" ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
deCONZ LXC - +

deCONZ LXC

@@ -1073,13 +1073,13 @@ Run in the LXC Console apt update && apt upgrade -y ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
Z-Wave JS UI LXC - +

Z-Wave JS UI LXC

@@ -1108,7 +1108,7 @@ Run in the LXC Console bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/zwave-js-ui-update.sh)" ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
⬆__________________________________________________________________________________________ @@ -1119,7 +1119,7 @@ ________________________________________________________________________________
Uptime Kuma LXC - +

Uptime Kuma LXC

@@ -1142,13 +1142,13 @@ Run in the LXC console ```yaml bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/uptimekuma-update.sh)" ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
Prometheus LXC - +

Prometheus LXC

@@ -1171,14 +1171,14 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/prometheus-v Working On ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
Grafana LXC - +

Grafana LXC

@@ -1192,16 +1192,16 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/grafana-v4.s ```

⚡ Default Settings: 512MiB RAM - 2GB Storage - 1vCPU ⚡

- + **Grafana Interface - IP:3000** ⚙️ **Initial Login** -**username** +**username** ```yaml admin ``` - **password** + **password** ```yaml admin ``` @@ -1212,7 +1212,7 @@ Run in the LXC console ```yaml apt update && apt upgrade -y ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
⬆__________________________________________________________________________________________ @@ -1224,7 +1224,7 @@ ________________________________________________________________________________
Docker LXC - +

Docker LXC

@@ -1251,7 +1251,7 @@ Run in the LXC console apt update && apt upgrade -y ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
@@ -1261,7 +1261,7 @@ ________________________________________________________________________________

Umbrel LXC

- + [Umbrel](https://umbrel.com/) is a beautiful personal server OS for self-hosting. @@ -1281,7 +1281,7 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/umbrel-v4.sh update from the Umbrel UI ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________ @@ -1291,7 +1291,7 @@ ________________________________________________________________________________

CasaOS LXC

- + [CasaOS](https://www.casaos.io/) is a community-based open source software focused on delivering simple home cloud experience around Docker ecosystem. @@ -1311,7 +1311,7 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/casaos-v4.sh update from the CasaOS UI ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________ ⬆__________________________________________________________________________________________ @@ -1323,7 +1323,7 @@ ________________________________________________________________________________
Debian LXC - +

Debian

Debian LXC

@@ -1344,14 +1344,14 @@ Run in the LXC console apt update && apt upgrade -y ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
Ubuntu LXC - +

Ubuntu

Ubuntu LXC

@@ -1372,7 +1372,7 @@ Run in the LXC console apt update && apt upgrade -y ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
⬆__________________________________________________________________________________________ @@ -1384,7 +1384,7 @@ ________________________________________________________________________________
Nginx Proxy Manager LXC - +

hero

@@ -1400,7 +1400,7 @@ To create a new Proxmox Nginx Proxy Manager LXC Container, run the following in

⚡ Default Settings: 1GB RAM - 3GB Storage - 1vCPU ⚡

____________________________________________________________________________________ - + Forward port `80` and `443` from your router to your Nginx Proxy Manager LXC IP. Add the following to your `configuration.yaml` in Home Assistant. @@ -1412,14 +1412,14 @@ Add the following to your `configuration.yaml` in Home Assistant. ``` **Nginx Proxy Manager Interface - IP:81** - + ⚙️ **Initial Login** -**username** +**username** ```yaml admin@example.com ``` - **password** + **password** ```yaml changeme ``` @@ -1430,13 +1430,13 @@ Run in the LXC console bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/npm_update.sh)" ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
UniFi Network Application LXC - +

UniFi Network Application LXC

@@ -1461,13 +1461,13 @@ Run in the LXC console ```yaml bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/unifi-update.sh)" ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
Omada Controller LXC - +

Omada Controller LXC

@@ -1489,12 +1489,12 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/omada-v4.sh) `tpeap start` start Omada Controller `tpeap stop` stop Omada Controller - + ⚙️ **To Update Omada** [#403](https://github.com/tteck/Proxmox/issues/402#issue-1328460983) -____________________________________________________________________________________________ +____________________________________________________________________________________________
@@ -1505,7 +1505,7 @@ ________________________________________________________________________________

WireGuard LXC

With WGDashboard

- + To create a new Proxmox WireGuard LXC, run the following in the Proxmox Shell. ``` @@ -1518,41 +1518,41 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/wireguard-v4 ⚙️ **Initial Login** -**username** +**username** ```yaml admin ``` - **password** + **password** ```yaml admin ``` - + ⚙️ **Host Configuration** - + Run in the LXC console ```yaml nano /etc/pivpn/wireguard/setupVars.conf ``` - ⚙️**Add Clients** - + ⚙️**Add Clients** + Run in the LXC console ```yaml pivpn add ``` ⚙️ **To Update WireGuard** - + Run in the LXC console ```yaml apt update && apt upgrade -y ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
MeshCentral LXC - +

MeshCentral LXC

@@ -1574,13 +1574,13 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/meshcentral- ```yaml Update from the MeshCentral UI ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
Tailscale - +

Tailscale

@@ -1597,19 +1597,19 @@ After the script finishes, reboot the LXC then run `tailscale up` in the LXC con [**Tailscale Login**](https://login.tailscale.com/start) ⚙️ **To Update Tailscale** - + Run in the LXC console ```yaml apt update && apt upgrade -y ``` -___________________________________________________________________________________________ +___________________________________________________________________________________________
CrowdSec - +

CrowdSec

@@ -1624,13 +1624,13 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/crowdsec.s [**Control center for your CrowdSec machines.**](https://app.crowdsec.net/product-tour) -___________________________________________________________________________________________ +___________________________________________________________________________________________
Keycloak LXC - +

Keycloak LXC

@@ -1650,7 +1650,7 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/keycloak-v4. The initial admin user can be added manually using the web frontend when accessed from localhost or automatically using environment variables. To add the initial admin user using environment variables, set `KEYCLOAK_ADMIN` for the initial admin username and `KEYCLOAK_ADMIN_PASSWORD` for the initial admin password. - + First, stop Keycloak ```yaml systemctl stop keycloak.service @@ -1661,25 +1661,25 @@ cd /opt/keycloak export KEYCLOAK_ADMIN=admin export KEYCLOAK_ADMIN_PASSWORD=changeme -bin/kc.sh start-dev +bin/kc.sh start-dev ``` ⚙️ **To Update Keycloak** ```yaml working On ``` -___________________________________________________________________________________________ +___________________________________________________________________________________________
Mikrotik RouterOS VM - +

Mikrotik RouterOS VM

- -[Mikrotik RouterOS](https://wiki.mikrotik.com/wiki/Manual:TOC) can be installed on a PC and will turn it into a router with all the necessary features - routing, firewall, bandwidth management, wireless access point, backhaul link, hotspot gateway, VPN server and more. + +[Mikrotik RouterOS](https://wiki.mikrotik.com/wiki/Manual:TOC) can be installed on a PC and will turn it into a router with all the necessary features - routing, firewall, bandwidth management, wireless access point, backhaul link, hotspot gateway, VPN server and more. To create a new Proxmox Mikrotik RouterOS VM, run the following in the Proxmox Shell. @@ -1691,7 +1691,7 @@ Setup is done via VM console.

⚡ Default Settings: 1GB RAM - 2GB Storage - 1CPU ⚡

-____________________________________________________________________________________________ +____________________________________________________________________________________________
⬆__________________________________________________________________________________________ @@ -1707,7 +1707,7 @@ ________________________________________________________________________________

Plex Media Server LXC

-

With Hardware Acceleration Support

+

With Hardware Acceleration Support

To create a new Proxmox Plex Media Server LXC, run the following in the Proxmox Shell. ```yaml @@ -1730,7 +1730,7 @@ Run in the Proxmox Shell bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/pms-copy-data.sh)" ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________ @@ -1752,7 +1752,7 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/emby-v4.sh)" ⚙️ **Emby Media Server Utilizes Automatic Updates** -____________________________________________________________________________________________ +____________________________________________________________________________________________ @@ -1780,13 +1780,13 @@ Run in the LXC console ```yaml apt update && apt upgrade -y ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
NextCloudPi LXC - +

NextCloudPi LXC

@@ -1799,7 +1799,7 @@ To create a new Proxmox NextCloudPi LXC, run the following in the Proxmox Shell. bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/nextcloudpi-v4.sh)" ```

⚡ Default Settings: 2GB RAM - 8GB Storage - 2vCPU ⚡

- + ❗1️. Set nc trusted domains Run in the LXC console @@ -1812,13 +1812,13 @@ Get back to the command prompt, and restart Apache2 `sudo service apache2 restar ❗2. **NextCloudPi Interface - https:// IP/** -____________________________________________________________________________________________ +____________________________________________________________________________________________
OpenMediaVault LXC - +

OpenMediaVault LXC

@@ -1837,27 +1837,27 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/omv-v4.sh)" ⚙️ **Initial Login** -**username** +**username** ```yaml admin ``` - **password** + **password** ```yaml openmediavault ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
Navidrome LXC - +

Navidrome LXC

- -[Navidrome](https://www.navidrome.org/) allows you to enjoy your music collection from anywhere, by making it available through a modern Web UI and through a wide range of third-party compatible mobile apps, for both iOS and Android devices. + +[Navidrome](https://www.navidrome.org/) allows you to enjoy your music collection from anywhere, by making it available through a modern Web UI and through a wide range of third-party compatible mobile apps, for both iOS and Android devices. To create a new Proxmox Navidrome LXC, run the following in the Proxmox Shell. @@ -1878,18 +1878,18 @@ Run in the LXC Console bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/navidrome-update.sh)" ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
PhotoPrism LXC - +

PhotoPrism LXC

- -[PhotoPrism](https://photoprism.app/) is an AI-powered app for browsing, organizing & sharing your photo collection. + +[PhotoPrism](https://photoprism.app/) is an AI-powered app for browsing, organizing & sharing your photo collection. To create a new Proxmox PhotoPrism LXC, run the following in the Proxmox Shell. @@ -1903,11 +1903,11 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/photoprism-v ⚙️ **Initial Login** -**username** +**username** ```yaml admin ``` - **password** + **password** ```yaml changeme ``` @@ -1919,7 +1919,7 @@ Run in the LXC Console ```yaml bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/photoprism-update.sh)" ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
⬆__________________________________________________________________________________________ @@ -1931,7 +1931,7 @@ ________________________________________________________________________________
Pi-hole LXC - +

Pi-hole LXC

@@ -1950,19 +1950,19 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/pihole-v4.sh **Pi-hole Interface - http:// IP/admin** ⚙️ **To set your password:** - + Run in the LXC console ```yaml pihole -a -p ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
Technitium DNS LXC - +

Technitium DNS LXC

@@ -1975,7 +1975,7 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/technitiumdn ```

⚡ Default Settings: 512MiB RAM - 2GB Storage - 1vCPU ⚡

- + **Technitium DNS Interface - IP:5380** ⚙️ **To Update Technitium DNS** @@ -1983,14 +1983,14 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/technitiumdn ```yaml bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/technitiumdns-update.sh)" ``` -__________________________________________________________________________________________ +__________________________________________________________________________________________
- - + +
AdGuard Home LXC - +

AdGuard Home LXC

@@ -2002,9 +2002,9 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/adguard-v4.s ```

⚡ Default Settings: 512MiB RAM - 2GB Storage - 1vCPU ⚡

- + **AdGuard Home Setup Interface - IP:3000 (After Setup use only IP)** - + (For the Home Assistant Integration, use port `80` not `3000`) ⚙️ **To Update Adguard** @@ -2012,13 +2012,13 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/adguard-v4.s ```yaml Update from the Adguard UI ``` -__________________________________________________________________________________________ +__________________________________________________________________________________________
Blocky LXC - +

Blocky LXC

@@ -2039,7 +2039,7 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/blocky-v4.sh ```yaml /opt/blocky/config.yml ``` -__________________________________________________________________________________________ +__________________________________________________________________________________________
@@ -2052,11 +2052,11 @@ ________________________________________________________________________________
Paperless-ngx LXC - +

Paperless-ngx LXC

- + [Paperless-ngx](https://paperless-ngx.readthedocs.io/en/latest/#) is a document management system that transforms your physical documents into a searchable online archive so you can keep, well, less paper. To create a new Proxmox Paperless-ngx LXC, run the following in the Proxmox Shell. @@ -2082,17 +2082,17 @@ Run in the LXC Console ```yaml bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/paperless-ngx-update.sh)" ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
Trilium LXC - +

Trilium LXC

- + [Trilium](https://github.com/zadam/trilium#trilium-notes) is a hierarchical note taking application with focus on building large personal knowledge bases. To create a new Proxmox Trilium LXC, run the following in the Proxmox Shell. @@ -2112,18 +2112,18 @@ Run in the LXC Console bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/trilium-update.sh)" ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
Wiki.js LXC - +

Wiki.js LXC

- -[Wiki.js](https://js.wiki/) is a modern, lightweight and powerful wiki app built on NodeJS. + +[Wiki.js](https://js.wiki/) is a modern, lightweight and powerful wiki app built on NodeJS. To create a new Proxmox Wiki.js LXC, run the following in the Proxmox Shell. @@ -2135,13 +2135,13 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/wikijs-v4.sh **Wiki.js Interface - IP:3000** -____________________________________________________________________________________________ +____________________________________________________________________________________________
NocoDB LXC - +

NocoDB LXC

@@ -2165,7 +2165,7 @@ Run in the LXC console cd /opt/nocodb && npm run upgrade ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
⬆__________________________________________________________________________________________ @@ -2177,7 +2177,7 @@ ________________________________________________________________________________
Heimdall Dashboard LXC - +

Heimdall Dashboard LXC

@@ -2190,7 +2190,7 @@ To create a new Proxmox Heimdall Dashboard LXC, run the following in the Proxmox bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/heimdalldashboard-v4.sh)" ```

⚡ Default Settings: 512MiB RAM - 2GB Storage - 1vCPU ⚡

- + **Heimdall Dashboard Interface - IP:7990** ⚙️ **To Update Heimdall Dashboard** @@ -2200,7 +2200,7 @@ Run in the LXC console bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/heimdalldashboard-all-update.sh)" ``` -__________________________________________________________________________________________ +__________________________________________________________________________________________
@@ -2210,7 +2210,7 @@ ________________________________________________________________________________

Homepage LXC

- + [Homepage](https://github.com/benphelps/homepage) is a self-hosted dashboard. To create a new Proxmox Homepage LXC, run the following in the Proxmox Shell. @@ -2232,13 +2232,13 @@ Run in the LXC console bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/homepage-update.sh)" ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
Dashy LXC - +

Dashy LXC

@@ -2251,9 +2251,9 @@ To create a new Proxmox Dashy LXC, run the following in the Proxmox Shell. bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/dashy-v4.sh)" ```

⚡ Default Settings: 2GB RAM - 3GB Storage - 2vCPU ⚡

- + **Dashy Interface - IP:4000** - + After getting everything setup the way you want in interactive mode and saved to disk, you have to go into update configuration and rebuild application. ⚙️ **To Update Dashy** @@ -2263,7 +2263,7 @@ Run in the LXC Console bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/dashy-update.sh)" ``` -__________________________________________________________________________________________ +__________________________________________________________________________________________
⬆__________________________________________________________________________________________ @@ -2275,7 +2275,7 @@ ________________________________________________________________________________ ⬇__________________________________________________________________________________________
File Browser - +

File Browser

@@ -2294,27 +2294,27 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/filebrowse ⚙️ **Initial Login** -**username** +**username** ```yaml admin ``` - **password** + **password** ```yaml changeme ``` - + ⚙️ **To Update File Browser** ```yaml curl -fsSL https://raw.githubusercontent.com/filebrowser/get/master/get.sh | bash ``` -___________________________________________________________________________________________ +___________________________________________________________________________________________
VS Code Server - +

VS Code Server

@@ -2331,13 +2331,13 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/code-serve **VS Code Server Interface - http:// IP:8680** -___________________________________________________________________________________________ +___________________________________________________________________________________________
Webmin System Administration - +

Webmin System Administration

@@ -2358,39 +2358,39 @@ Benefits include automatic daily security updates, backup and restore, file mana ⚙️ **Initial Login** -**username** +**username** ```yaml root ``` - **password** + **password** ```yaml root ``` - + ⚙️ **To Update Webmin** ```yaml Update from the Webmin UI ``` ⚙️ **To Uninstall Webmin** - + Run in the LXC console ```yaml bash /etc/webmin/uninstall.sh ``` -___________________________________________________________________________________________ +___________________________________________________________________________________________
- +
Syncthing LXC - +

Syncthing LXC

- + [Syncthing](https://syncthing.net/) is a continuous file synchronization program. It synchronizes files between two or more computers. - + To create a new Proxmox Syncthing LXC, run the following in the Proxmox Shell. ```yaml @@ -2398,8 +2398,8 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/syncthing-v4 ```

⚡ Default Settings: 2GB RAM - 8GB Storage - 2vCPU ⚡

- -⚙️ For the initial start, run `syncthing --gui-address=0.0.0.0:8384` in the LXC console, then go to the LXC IP:8384 In settings set the LXC IP address under the GUI (also set the GUI Authentication User and GUI Authentication Password) and Connections tab's and save. Reboot the LXC. + +⚙️ For the initial start, run `syncthing --gui-address=0.0.0.0:8384` in the LXC console, then go to the LXC IP:8384 In settings set the LXC IP address under the GUI (also set the GUI Authentication User and GUI Authentication Password) and Connections tab's and save. Reboot the LXC. **Syncthing Interface - IP:8384** @@ -2409,13 +2409,13 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/syncthing-v4 apt update && apt upgrade -y ``` -____________________________________________________________________________________________ - +____________________________________________________________________________________________ +
Daemon Sync Server LXC - +

Daemon Sync Server LXC

@@ -2429,12 +2429,12 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/daemonsync-v ```

⚡ Default Settings: 512MiB RAM - 8GB Storage - 1vCPU ⚡

- + **Daemon Sync Server Interface - IP:8084** - + Search: `DAEMON Sync` in your favorite app store -__________________________________________________________________________________________ +__________________________________________________________________________________________
⬆________________________________________________________________________________________ @@ -2447,13 +2447,13 @@ ________________________________________________________________________________
Vaultwarden LXC - +

Vaultwarden LXC

Alternative implementation of the Bitwarden server API written in Rust and compatible with upstream [Bitwarden clients](https://bitwarden.com/download/), perfect for self-hosted deployment where running the official resource-heavy service might not be ideal. - + To create a new Proxmox Vaultwarden LXC, run the following in the Proxmox Shell. ```yaml @@ -2461,7 +2461,7 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/vaultwarden- ``` ⚠️ Vaultwarden needs to be behind a proxy (Nginx Proxy Manager) to obtain HTTPS and to allow clients to connect. -The script builds from source, which takes time and resources. After the build, the script will automatically set resources to Normal Settings. +The script builds from source, which takes time and resources. After the build, the script will automatically set resources to Normal Settings. Expect 30+ minute install time.

⚡ Build Settings: 2048Mib RAM - 6GB Storage - 2vCPU ⚡

@@ -2473,7 +2473,7 @@ Expect 30+ minute install time. ```yaml /opt/vaultwarden/.env ``` - + ⚙️ **To Update Vaultwarden (post 2022-05-29 installs only)** Run in the LXC console @@ -2487,13 +2487,13 @@ Run in the LXC console bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/misc/web-vault-update.sh)" ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
grocy LXC - +

grocy LXC

@@ -2512,22 +2512,22 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/grocy-v4.sh) ⚙️ **Initial Login** -**username** +**username** ```yaml admin ``` - **password** + **password** ```yaml admin ``` - + ⚙️ **To Update grocy** - + Run in the LXC console ```yaml bash /var/www/html/update.sh ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
@@ -2537,7 +2537,7 @@ ________________________________________________________________________________

MagicMirror Server LXC

- + [MagicMirror²](https://docs.magicmirror.builders/) is an open source modular smart mirror platform. To create a new MagicMirror Server LXC, run the following in the Proxmox Shell. @@ -2560,13 +2560,13 @@ Run in the LXC Console ```yaml cd /opt/magicmirror && git pull && npm install --only=prod --omit=dev ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
Whoogle LXC - +

Whoogle LXC

@@ -2589,13 +2589,13 @@ Run in the LXC console ```yaml pip3 install whoogle-search --upgrade ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
MotionEye VMS LXC - +

MotionEye VMS LXC

@@ -2612,22 +2612,22 @@ bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/motioneye-v4 ⚙️ **Initial Login** -**username** +**username** ```yaml admin ``` - **password** + **password** ```yaml - + ``` - + ⚙️ **To Update MotionEye** - + Run in the LXC console ```yaml pip install motioneye --upgrade ``` -____________________________________________________________________________________________ +____________________________________________________________________________________________
⬆__________________________________________________________________________________________ diff --git a/ct/adguard-v2.sh b/ct/adguard-v2.sh index 9838585b..2b480c59 100644 --- a/ct/adguard-v2.sh +++ b/ct/adguard-v2.sh @@ -2,10 +2,10 @@ YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will create a New Adguard Home LXC. Proceed(y/n)?" yn case $yn in @@ -17,15 +17,15 @@ done clear function header_info { echo -e "${GN} - _ _ + _ _ /\ | | | | / \ __| | __ _ _ _ __ _ _ __ __| | / /\ \ / _ |/ _ | | | |/ _ | __/ _ | / ____ \ (_| | (_| | |_| | (_| | | | (_| | /_/ \_\__,_|\__, |\__,_|\__,_|_| \__,_| - __/ | - |___/ - + __/ | + |___/ + ${CL}" } @@ -182,7 +182,7 @@ function info() { function msg() { local TEXT="$1" echo -e "$TEXT" -} +} function cleanup_ctid() { if $(pct status $CTID &>/dev/null); then if [ "$(pct status $CTID | awk '{print $2}')" == "running" ]; then @@ -197,7 +197,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" @@ -253,4 +253,3 @@ IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2 echo -e "${GN}Successfully created Adguard Home LXC to${CL} ${BL}$CTID${CL}. ${GN}Adguard${CL} Setup should be reachable by going to the following URL. ${BL}http://${IP}:3000${CL} \n" - diff --git a/ct/adguard-v3.sh b/ct/adguard-v3.sh index 26955d34..cc60fcfc 100644 --- a/ct/adguard-v3.sh +++ b/ct/adguard-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,14 +43,14 @@ done clear function header_info { echo -e "${GN} - _ _ + _ _ /\ | | | | / \ __| | __ _ _ _ __ _ _ __ __| | / /\ \ / _ |/ _ | | | |/ _ | __/ _ | / ____ \ (_| | (_| | |_| | (_| | | | (_| | /_/ \_\__,_|\__, |\__,_|\__,_|_| \__,_| - v3__/ | - |___/ + v3__/ | + |___/ ${CL}" } @@ -111,12 +111,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -126,7 +126,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -251,7 +251,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -275,7 +275,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -309,15 +309,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/adguard-v4.sh b/ct/adguard-v4.sh index 1a8fe6cc..d4bc8623 100644 --- a/ct/adguard-v4.sh +++ b/ct/adguard-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,10 +46,10 @@ function header_info { echo -e "${GN} ___ __ __ / | ____/ /___ ___ ______ __________/ / - / /| |/ __ / __ / / / / __ / ___/ __ / - / ___ / /_/ / /_/ / /_/ / /_/ / / / /_/ / -/_/v4|_\__,_/\__, /\__,_/\__,_/_/ \__,_/ - /____/ + / /| |/ __ / __ / / / / __ / ___/ __ / + / ___ / /_/ / /_/ / /_/ / /_/ / / / /_/ / +/_/v4|_\__,_/\__, /\__,_/\__,_/_/ \__,_/ + /____/ ${CL}" } function msg_info() { @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/blocky-v4.sh b/ct/blocky-v4.sh index a2e79c5f..9769ec15 100644 --- a/ct/blocky-v4.sh +++ b/ct/blocky-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,12 +44,12 @@ else fi function header_info { cat << "EOF" - ____ __ __ + ____ __ __ / __ )/ /___v4_____/ /____ __ / __ / / __ \/ ___/ //_/ / / / - / /_/ / / /_/ / /__/ ,< / /_/ / -/_____/_/\____/\___/_/|_|\__, / - /____/ + / /_/ / / /_/ / /__/ ,< / /_/ / +/_____/_/\____/\___/_/|_|\__, / + /____/ EOF } function msg_info() { @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/casaos-v4.sh b/ct/casaos-v4.sh index 73d38b3c..385ebb61 100644 --- a/ct/casaos-v4.sh +++ b/ct/casaos-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,10 +46,10 @@ function header_info { cat << "EOF" ______ ____ _____ / ____/___ __v4______ _/ __ \/ ___/ - / / / __ `/ ___/ __ `/ / / /\__ \ -/ /___/ /_/ (__ ) /_/ / /_/ /___/ / -\____/\__,_/____/\__,_/\____//____/ - + / / / __ `/ ___/ __ `/ / / /\__ \ +/ /___/ /_/ (__ ) /_/ / /_/ /___/ / +\____/\__,_/____/\__,_/\____//____/ + EOF } function msg_info() { @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/create_lxc.sh b/ct/create_lxc.sh index f82768a5..b59828e4 100644 --- a/ct/create_lxc.sh +++ b/ct/create_lxc.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` CM="${GN}✓${CL}" CROSS="${RD}✗${CL}" BFR="\\r\\033[K" @@ -66,11 +66,11 @@ function select_storage() { MENU+=( "$TAG" "$ITEM" "OFF" ) done < <(pvesm status -content $CONTENT | awk 'NR>1') - if [ $((${#MENU[@]}/3)) -eq 1 ]; then + if [ $((${#MENU[@]}/3)) -eq 1 ]; then printf ${MENU[0]} - else + else local STORAGE - while [ -z "${STORAGE:+x}" ]; do + while [ -z "${STORAGE:+x}" ]; do STORAGE=$(whiptail --title "Storage Pools" --radiolist \ "Which storage pool you would like to use for the ${CONTENT_LABEL,,}?\n\n" \ 16 $(($MSG_MAX_LENGTH + 23)) 6 \ @@ -115,7 +115,7 @@ fi DEFAULT_PCT_OPTIONS=( -arch $(dpkg --print-architecture)) - + PCT_OPTIONS=( ${PCT_OPTIONS[@]:-${DEFAULT_PCT_OPTIONS[@]}} ) [[ " ${PCT_OPTIONS[@]} " =~ " -rootfs " ]] || PCT_OPTIONS+=( -rootfs $CONTAINER_STORAGE:${PCT_DISK_SIZE:-8} ) diff --git a/ct/daemonsync-v2.sh b/ct/daemonsync-v2.sh index 5b47dfa6..b78f8dd4 100644 --- a/ct/daemonsync-v2.sh +++ b/ct/daemonsync-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will create a New Daemon Sync Server LXC. Proceed(y/n)?" yn case $yn in @@ -16,14 +16,14 @@ done clear function header_info { echo -e "${BL} - _____ _____ - | __ \ / ____| - | | | | __ _ ___ _ __ ___ ___ _ __ | (___ _ _ _ __ ___ + _____ _____ + | __ \ / ____| + | | | | __ _ ___ _ __ ___ ___ _ __ | (___ _ _ _ __ ___ | | | |/ _ |/ _ \ _ _ \ / _ \| _ \ \___ \| | | | _ \ / __| - | |__| | (_| | __/ | | | | | (_) | | | | ____) | |_| | | | | (__ + | |__| | (_| | __/ | | | | | (_) | | | | ____) | |_| | | | | (__ |_____/ \__,_|\___|_| |_| |_|\___/|_| |_| |_____/ \__, |_| |_|\___| - __/ | - |___/ + __/ | + |___/ ${CL}" } @@ -195,7 +195,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/daemonsync-v3.sh b/ct/daemonsync-v3.sh index df44541e..0af99212 100644 --- a/ct/daemonsync-v3.sh +++ b/ct/daemonsync-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,14 +43,14 @@ done clear function header_info { echo -e "${BL} - _____ _____ - | __ \ / ____| - | | | | __ _v3___ _ __ ___ ___ _ __ | (___ _ _ _ __ ___ + _____ _____ + | __ \ / ____| + | | | | __ _v3___ _ __ ___ ___ _ __ | (___ _ _ _ __ ___ | | | |/ _ |/ _ \ _ _ \ / _ \| _ \ \___ \| | | | _ \ / __| - | |__| | (_| | __/ | | | | | (_) | | | | ____) | |_| | | | | (__ + | |__| | (_| | __/ | | | | | (_) | | | | ____) | |_| | | | | (__ |_____/ \__,_|\___|_| |_| |_|\___/|_| |_| |_____/ \__, |_| |_|\___| - __/ | - |___/ + __/ | + |___/ ${CL}" } @@ -111,12 +111,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -126,7 +126,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -251,7 +251,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -275,7 +275,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -309,15 +309,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/daemonsync-v4.sh b/ct/daemonsync-v4.sh index 1eacbab4..6793d836 100644 --- a/ct/daemonsync-v4.sh +++ b/ct/daemonsync-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,12 +44,12 @@ else fi function header_info { echo -e "${BL} - ____ _____ + ____ _____ / __ \____ ____ ____ ___ ____ ____ / ___/__ ______ _____ / / / / __ / _ \/ __ __ \/ __ \/ __ \ \__ \/ / / / __ \/ ___/ - / /_/ / /_/ / __/ / / / / / /_/ / / / / ___/ / /_/ / / / / /__ -/_____/\__,_/\___/_/ /_/ /_/\____/_/ /_/ v4/____/\__, /_/ /_/\___/ - /____/ + / /_/ / /_/ / __/ / / / / / /_/ / / / / ___/ / /_/ / / / / /__ +/_____/\__,_/\___/_/ /_/ /_/\____/_/ /_/ v4/____/\__, /_/ /_/\___/ + /____/ ${CL}" } function msg_info() { @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/dashy-v2.sh b/ct/dashy-v2.sh index 49e63390..66214d5a 100644 --- a/ct/dashy-v2.sh +++ b/ct/dashy-v2.sh @@ -2,10 +2,10 @@ clear YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will create a New Dashy LXC. Proceed(y/n)?" yn case $yn in @@ -17,14 +17,14 @@ done clear function header_info { echo -e "${RD} - _____ _ - | __ \ | | - | | | | __ _ ___| |__ _ _ + _____ _ + | __ \ | | + | | | | __ _ ___| |__ _ _ | | | |/ _ / __| _ \| | | | | |__| | (_| \__ \ | | | |_| | |_____/ \__,_|___/_| |_|\__, | __/ | - |___/ + |___/ ${CL}" } @@ -196,7 +196,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/dashy-v3.sh b/ct/dashy-v3.sh index b7e795d2..eb5c5a30 100644 --- a/ct/dashy-v3.sh +++ b/ct/dashy-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,14 +43,14 @@ done clear function header_info { echo -e "${RD} - _____ _ - | __ \ | | - | | | | __ _ ___| |__ _ _ + _____ _ + | __ \ | | + | | | | __ _ ___| |__ _ _ | | | |/ _ / __| _ \| | | | | |__| | (_| \__ \ | | | |_| | |_____/ \__,_|___/_| |_|\__, | v3__/ | - |___/ + |___/ ${CL}" } @@ -111,12 +111,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -126,7 +126,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -251,7 +251,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -275,7 +275,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -309,15 +309,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/dashy-v4.sh b/ct/dashy-v4.sh index 8eaaf93d..763c01c9 100644 --- a/ct/dashy-v4.sh +++ b/ct/dashy-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,12 +44,12 @@ else fi function header_info { echo -e "${RD} - ____ __ + ____ __ / __ \____ ______/ /_ __ __ / / / / __ / ___/ __ \/ / / / - / /_/ / /_/ (__ ) / / / /_/ / -/_____/\__,_/____/_/ /_/\__, / - v4 /____/ + / /_/ / /_/ (__ ) / / / /_/ / +/_____/\__,_/____/_/ /_/\__, / + v4 /____/ ${CL}" } function msg_info() { @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/debian-v2.sh b/ct/debian-v2.sh index 36ed693b..7737742e 100644 --- a/ct/debian-v2.sh +++ b/ct/debian-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` APP="Debian" HN=$(echo ${APP,,} | tr -d ' ') while true; do @@ -18,13 +18,13 @@ done clear function header_info { echo -e "${RD} - _____ _ _ - | __ \ | | (_) - | | | | ___| |__ _ __ _ _ __ - | | | |/ _ \ _ \| |/ _ | _ \ + _____ _ _ + | __ \ | | (_) + | | | | ___| |__ _ __ _ _ __ + | | | |/ _ \ _ \| |/ _ | _ \ | |__| | __/ |_) | | (_| | | | | |_____/ \___|_.__/|_|\__,_|_| |_| - + ${CL}" } @@ -196,7 +196,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/debian-v3.sh b/ct/debian-v3.sh index 79c9bdd1..72bdd22d 100644 --- a/ct/debian-v3.sh +++ b/ct/debian-v3.sh @@ -12,11 +12,11 @@ NSAPP=$(echo ${APP,,} | tr -d ' ') var_install="${NSAPP}-install" YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -59,10 +59,10 @@ done clear function header_info { echo -e "${RD} - _____ _ _ - | __ \ | | (_) - | | | | ___| |__ _ __ _ _ __ - | | | |/ _ \ _ \| |/ _ | _ \ + _____ _ _ + | __ \ | | (_) + | | | | ___| |__ _ __ _ _ __ + | | | |/ _ \ _ \| |/ _ | _ \ | |__| | __/ |_) | | (_| | | | | |_${YW}v3${RD}__/ \___|_.__/|_|\__,_|_| |_| ${CL}" @@ -115,12 +115,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -130,7 +130,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -255,7 +255,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -279,7 +279,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -313,15 +313,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/debian-v4.sh b/ct/debian-v4.sh index 3a7f61ae..171e63ff 100644 --- a/ct/debian-v4.sh +++ b/ct/debian-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,9 +46,9 @@ function header_info { echo -e "${RD} ____ __________ _______ _ __ / __ \/ ____/ __ )/ _/ | / | / / - / / / / __/ / __ |/ // /| | / |/ / - / /_/ / /_v4/ /_/ // // ___ |/ /| / -/_____/_____/_____/___/_/ |_/_/ |_/ + / / / / __/ / __ |/ // /| | / |/ / + / /_/ / /_v4/ /_/ // // ___ |/ /| / +/_____/_____/_____/___/_/ |_/_/ |_/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/deconz-v3.sh b/ct/deconz-v3.sh index 3679fb6c..ac81fb68 100644 --- a/ct/deconz-v3.sh +++ b/ct/deconz-v3.sh @@ -12,11 +12,11 @@ NSAPP=$(echo ${APP,,} | tr -d ' ') var_install="${NSAPP}-install" YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -59,11 +59,11 @@ done clear function header_info { echo -e "${YW} - _ _____ - | | / ____| + _ _____ + | | / ____| __| | v3_| | ___ _ __ ____ / _ |/ _ \ | / _ \| _ \|_ / - | (_| | __/ |___| (_) | | | |/ / + | (_| | __/ |___| (_) | | | |/ / \__,_|\___|\_____\___/|_| |_/___| ${CL}" } @@ -115,12 +115,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Unprivileged, or Press [ENTER] for Default: Privileged" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Privileged" CT_TYPE="0"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Privileged" CT_TYPE="0"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Unprivileged" CT_TYPE="1" - echo -en "${DGN}Set CT Type ${BL}Unprivileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Unprivileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -130,7 +130,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -255,7 +255,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -279,7 +279,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -313,15 +313,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/deconz-v4.sh b/ct/deconz-v4.sh index 8225b32d..a29a8a99 100644 --- a/ct/deconz-v4.sh +++ b/ct/deconz-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,7 +46,7 @@ function header_info { echo -e "${YW} __ __________ _ _______ ____/ /v4 / ____/ __ \/ | / /__ / - / __ / _ \/ / / / / / |/ / / / + / __ / _ \/ / / / / / |/ / / / / /_/ / __/ /___/ /_/ / /| / / /__ \__,_/\___/\____/\____/_/ |_/ /____/ ${CL}" @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/docker-v2.sh b/ct/docker-v2.sh index 43ceb81b..5d9e7e7d 100644 --- a/ct/docker-v2.sh +++ b/ct/docker-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will create a New Docker LXC. Proceed(y/n)?" yn case $yn in @@ -16,12 +16,12 @@ done clear function header_info { echo -e "${BL} - _____ _ - | __ \ | | - | | | | ___ ___| | _____ _ __ + _____ _ + | __ \ | | + | | | | ___ ___| | _____ _ __ | | | |/ _ \ / __| |/ / _ \ __| - | |__| | (_) | (__| < __/ | - |_____/ \___/ \___|_|\_\___|_| + | |__| | (_) | (__| < __/ | + |_____/ \___/ \___|_|\_\___|_| ${CL}" } @@ -190,7 +190,7 @@ while [ "$opt" != " " ] ;; esac done - + set -o errexit set -o errtrace set -o nounset @@ -237,13 +237,13 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ] && [ "$STORAGE_DRIVER" == " " ]; then + if [ "$IM" == "1" ] && [ "$STORAGE_DRIVER" == " " ]; then FEATURES="nesting=1,keyctl=1" elif - [ "$IM" == "1" ] && [ "$STORAGE_DRIVER" == "fuse" ]; then + [ "$IM" == "1" ] && [ "$STORAGE_DRIVER" == "fuse" ]; then FEATURES="nesting=1,keyctl=1,fuse=1" elif - [ "$IM" == "0" ] && [ "$STORAGE_DRIVER" == "fuse" ]; then + [ "$IM" == "0" ] && [ "$STORAGE_DRIVER" == "fuse" ]; then FEATURES="nesting=1,fuse=1" else FEATURES="nesting=1" diff --git a/ct/docker-v3.sh b/ct/docker-v3.sh index 3c2c71a4..a15e10fc 100644 --- a/ct/docker-v3.sh +++ b/ct/docker-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,12 +43,12 @@ done clear function header_info { echo -e "${BL} - _____ _ - | __ \ | | - | | | | ___ ___| | _____ _ __ + _____ _ + | __ \ | | + | | | | ___ ___| | _____ _ __ | |v3| |/ _ \ / __| |/ / _ \ __| - | |__| | (_) | (__| < __/ | - |_____/ \___/ \___|_|\_\___|_| + | |__| | (_) | (__| < __/ | + |_____/ \___/ \___|_|\_\___|_| ${CL}" } @@ -109,12 +109,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -124,7 +124,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -249,7 +249,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -273,7 +273,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -307,16 +307,16 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } PVE_CHECK start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/docker-v4.sh b/ct/docker-v4.sh index a5e4b72a..14387be4 100644 --- a/ct/docker-v4.sh +++ b/ct/docker-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,11 +44,11 @@ else fi function header_info { echo -e "${BL} - ____ __ + ____ __ / __ \____ _____/ /_v4__ _____ / / / / __ \/ ___/ //_/ _ \/ ___/ - / /_/ / /_/ / /__/ ,< / __/ / -/_____/\____/\___/_/|_|\___/_/ + / /_/ / /_/ / /__/ ,< / __/ / +/_____/\____/\___/_/|_|\___/_/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/emby-v4.sh b/ct/emby-v4.sh index 66ddb644..fb7f91ad 100644 --- a/ct/emby-v4.sh +++ b/ct/emby-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,12 +44,12 @@ else fi function header_info { echo -e "${DGN} - ______ __ + ______ __ / ____/___ v4_ / /_ __ __ / __/ / __ __ \/ __ \/ / / / - / /___/ / / / / / /_/ / /_/ / -/_____/_/ /_/ /_/_.___/\__, / - /____/ + / /___/ / / / / / /_/ / /_/ / +/_____/_/ /_/ /_/_.___/\__, / + /____/ ${CL}" } function msg_info() { @@ -194,7 +194,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -218,7 +218,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/emqx-v4.sh b/ct/emqx-v4.sh index f43d6508..20c0d4b6 100644 --- a/ct/emqx-v4.sh +++ b/ct/emqx-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,10 +46,10 @@ function header_info { cat << "EOF" ________ _______v4 _ __ / ____/ |/ / __ \ | |/ / - / __/ / /|_/ / / / / | / - / /___/ / / / /_/ / / | -/_____/_/ /_/\___\_\/_/|_| - + / __/ / /|_/ / / / / | / + / /___/ / / / /_/ / / | +/_____/_/ /_/\___\_\/_/|_| + EOF } function msg_info() { @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/esphome-v1.sh b/ct/esphome-v1.sh index 902c9969..f607078a 100644 --- a/ct/esphome-v1.sh +++ b/ct/esphome-v1.sh @@ -2,10 +2,10 @@ YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will create a New ESPHome LXC Container. Proceed(y/n)?" yn @@ -18,13 +18,13 @@ done clear function header_info { echo -e "${CL} - ______ _____ _____ _ _ ____ __ __ ______ + ______ _____ _____ _ _ ____ __ __ ______ | ____|/ ____| __ \| | | |/ __ \| \/ | ____| - | |__ | (___ | |__) | |__| | | | | \ / | |__ - | __| \___ \| ___/| __ | | | | |\/| | __| - | |____ ____) | | | | | | |__| | | | | |____ + | |__ | (___ | |__) | |__| | | | | \ / | |__ + | __| \___ \| ___/| __ | | | | |\/| | __| + | |____ ____) | | | | | | |__| | | | | |____ |______|_____/|_| |_| |_|\____/|_| |_|______| - + ${CL}" } diff --git a/ct/esphome-v2.sh b/ct/esphome-v2.sh index 8fcbf29b..58cbe032 100644 --- a/ct/esphome-v2.sh +++ b/ct/esphome-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` APP="ESPHome" HN=$(echo ${APP,,} | tr -d ' ') while true; do @@ -18,11 +18,11 @@ done clear function header_info { echo -e "${RD} - ______ _____ _____ _ _ ____ __ __ ______ + ______ _____ _____ _ _ ____ __ __ ______ | ____|/ ____| __ \| | | |/ __ \| \/ | ____| - | |__ | (___ | |__) | |__| | | | | \ / | |__ - | __| \___ \| ___/| __ | | | | |\/| | __| - | |____ ____) | | | | | | |__| | | | | |____ + | |__ | (___ | |__) | |__| | | | | \ / | |__ + | __| \___ \| ___/| __ | | | | |\/| | __| + | |____ ____) | | | | | | |__| | | | | |____ |______|_____/|_| |_| |_|\____/|_| |_|______| ${CL}" @@ -196,7 +196,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/esphome-v3.sh b/ct/esphome-v3.sh index b39f4f07..17b44b25 100644 --- a/ct/esphome-v3.sh +++ b/ct/esphome-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,11 +43,11 @@ done clear function header_info { echo -e "${RD} - ______ _____ _____ _ _ ____ __ __ ______ + ______ _____ _____ _ _ ____ __ __ ______ | ____|/ ____| __ \| | | |/ __ \| \/ | ____| - | |__ | (___ | |__) | |__| | | | | \ / | |__ - | __| \___ \| ___/| __ | | | | |\/| | __| - | |____ ____) | | | | | | |__| | | | | |____ + | |__ | (___ | |__) | |__| | | | | \ / | |__ + | __| \___ \| ___/| __ | | | | |\/| | __| + | |____ ____) | | | | | | |__| | | | | |____ |______|_____/|_| v3 |_| |_|\____/|_| |_|______| ${CL}" @@ -110,12 +110,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -125,7 +125,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -250,7 +250,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -274,7 +274,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -308,15 +308,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/esphome-v4.sh b/ct/esphome-v4.sh index d3cc16e3..93d0c559 100644 --- a/ct/esphome-v4.sh +++ b/ct/esphome-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,9 +46,9 @@ function header_info { echo -e "${CL} ___________ ____ __ ______ __ _________ / ____/ ___// __ \/ / / / __ \/ |/ / ____/ - / __/ \__ \/ /_/ / /_/ / / / / /|_/ / __/ - / /___ ___/ / ____/ __ / /_/ / / / / /_v4 -/_____//____/_/ /_/ /_/\____/_/ /_/_____/ + / __/ \__ \/ /_/ / /_/ / / / / /|_/ / __/ + / /___ ___/ / ____/ __ / /_/ / / / / /_v4 +/_____//____/_/ /_/ /_/\____/_/ /_/_____/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/grafana-v2.sh b/ct/grafana-v2.sh index 04d65207..5417768a 100644 --- a/ct/grafana-v2.sh +++ b/ct/grafana-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will create a New Grafana LXC. Proceed(y/n)?" yn case $yn in @@ -16,9 +16,9 @@ done clear function header_info { echo -e "${YW} - _____ __ - / ____| / _| - | | __ _ __ __ _| |_ __ _ _ __ __ _ + _____ __ + / ____| / _| + | | __ _ __ __ _| |_ __ _ _ __ __ _ | | |_ | __/ _ | _/ _ | _ \ / _ | | |__| | | | (_| | || (_| | | | | (_| | \_____|_| \__,_|_| \__,_|_| |_|\__,_| @@ -194,7 +194,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/grafana-v3.sh b/ct/grafana-v3.sh index cf708a67..3c00dcbf 100644 --- a/ct/grafana-v3.sh +++ b/ct/grafana-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,9 +43,9 @@ done clear function header_info { echo -e "${YW} - _____ __ - / ____| / _| - | | __ _ __ __ _| |_ __ _ _ __ __ _ + _____ __ + / ____| / _| + | | __ _ __ __ _| |_ __ _ _ __ __ _ | | |_ | __/ _ | _/ _ | _ \ / _ | | |__| | | | (_| | || (_| | | | | (_| | \_____|_|v3\__,_|_| \__,_|_| |_|\__,_| @@ -109,12 +109,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -124,7 +124,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -249,7 +249,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -273,7 +273,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -307,15 +307,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/grafana-v4.sh b/ct/grafana-v4.sh index fc40f4ff..6fad7795 100644 --- a/ct/grafana-v4.sh +++ b/ct/grafana-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,11 +44,11 @@ else fi function header_info { echo -e "${YW} - ______ ____ + ______ ____ / ____/________ _/ __/___ _____ ____ _ / / __/ ___/ __ / /_/ __ / __ \/ __ / -/ /_/ / / / /_/ / __/ /_/ / / / / /_/ / -\____/_/ v4\__,_/_/ \__,_/_/ /_/\__,_/ +/ /_/ / / / /_/ / __/ /_/ / / / / /_/ / +\____/_/ v4\__,_/_/ \__,_/_/ /_/\__,_/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/grocy-v3.sh b/ct/grocy-v3.sh index 38f6b555..a5c893f1 100644 --- a/ct/grocy-v3.sh +++ b/ct/grocy-v3.sh @@ -12,11 +12,11 @@ NSAPP=$(echo ${APP,,} | tr -d ' ') var_install="${NSAPP}-install" YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -58,13 +58,13 @@ while true; do done clear function header_info { -echo -e "${YW} - __ _ _ __ ___ ___ _ _ +echo -e "${YW} + __ _ _ __ ___ ___ _ _ / _ | __/ _ \ / __| | | | | (_| | | | (_) | (__| |_| | \__, |_| \___/ \___|\__, | __/ | v3 __/ | - |___/ |___/ + |___/ |___/ ${CL}" } @@ -115,12 +115,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -130,7 +130,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -255,7 +255,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -279,7 +279,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -313,15 +313,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/grocy-v4.sh b/ct/grocy-v4.sh index 21f73bb1..194f8971 100644 --- a/ct/grocy-v4.sh +++ b/ct/grocy-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,9 +46,9 @@ function header_info { echo -e "${BL} ____ __________ _______ __ / __ / ___/ __ \/ ___/ / / / - / /_/ / / / /_/ / /__/ /_/ / - \__, /_/ \____/\___/\__, / -/____/ v4 /____/ + / /_/ / / / /_/ / /__/ /_/ / + \__, /_/ \____/\___/\__, / +/____/ v4 /____/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/heimdalldashboard-v2.sh b/ct/heimdalldashboard-v2.sh index 1a60e74c..4faeeaef 100644 --- a/ct/heimdalldashboard-v2.sh +++ b/ct/heimdalldashboard-v2.sh @@ -2,10 +2,10 @@ PP=`echo "\e[1;35m"` YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` APP="Heimdall Dashboard" HN=$(echo ${APP,,} | tr -d ' ') while true; do @@ -19,7 +19,7 @@ done clear function header_info { echo -e "${PP} - _ _ _ _ _ _ _____ _ _ _ + _ _ _ _ _ _ _____ _ _ _ | | | | (_) | | | | | | __ \ | | | | | | | |__| | ___ _ _ __ ___ __| | __ _| | | | | | | __ _ ___| |__ | |__ ___ __ _ _ __ __| | | __ |/ _ \ | _ _ \ / _ |/ _ | | | | | | |/ _ / __| _ \| _ \ / _ \ / _ | __/ _ | @@ -196,7 +196,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" @@ -254,6 +254,6 @@ lxc-cmd bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/m IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}') -echo -e "${GN}Successfully created ${APP} LXC to${CL} ${BL}$CTID${CL}. +echo -e "${GN}Successfully created ${APP} LXC to${CL} ${BL}$CTID${CL}. ${BL}${APP}${CL} should be reachable by going to the following URL. ${BL}http://${IP}:7990${CL} \n" diff --git a/ct/heimdalldashboard-v3.sh b/ct/heimdalldashboard-v3.sh index 1a1eb641..47401c14 100644 --- a/ct/heimdalldashboard-v3.sh +++ b/ct/heimdalldashboard-v3.sh @@ -5,11 +5,11 @@ INTEGER='^[0-9]+$' PP=`echo "\e[1;35m"` YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,7 +44,7 @@ done clear function header_info { echo -e "${PP} - _ _ _ _ _ _ _____ _ _ _ + _ _ _ _ _ _ _____ _ _ _ | | | | (_) | | | | | | __ \ | | | | | | | |__| | ___ _ _ __ ___ __| | __v3| | | | | | | __ _ ___| |__ | |__ ___ __ _ _ __ __| | | __ |/ _ \ | _ _ \ / _ |/ _ | | | | | | |/ _ / __| _ \| _ \ / _ \ / _ | __/ _ | @@ -110,12 +110,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -125,7 +125,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -250,7 +250,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -274,7 +274,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -308,15 +308,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/heimdalldashboard-v4.sh b/ct/heimdalldashboard-v4.sh index de568b9b..63d94fc7 100644 --- a/ct/heimdalldashboard-v4.sh +++ b/ct/heimdalldashboard-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,9 +46,9 @@ function header_info { echo -e "${BL} __ __ _ __ ____ ____ __ __ __ / / / /__ (_)___ ___ ____/ /_v4 _/ / / / __ \____ ______/ /_ / /_ ____ ____ __________/ / - / /_/ / _ \/ / __ __ \/ __ / __ / / / / / / / __ / ___/ __ \/ __ \/ __ \/ __ / ___/ __ / - / __ / __/ / / / / / / /_/ / /_/ / / / / /_/ / /_/ (__ ) / / / /_/ / /_/ / /_/ / / / /_/ / -/_/ /_/\___/_/_/ /_/ /_/\__,_/\__,_/_/_/ /_____/\__,_/____/_/ /_/_.___/\____/\__,_/_/ \__,_/ + / /_/ / _ \/ / __ __ \/ __ / __ / / / / / / / __ / ___/ __ \/ __ \/ __ \/ __ / ___/ __ / + / __ / __/ / / / / / / /_/ / /_/ / / / / /_/ / /_/ (__ ) / / / /_/ / /_/ / /_/ / / / /_/ / +/_/ /_/\___/_/_/ /_/ /_/\__,_/\__,_/_/_/ /_____/\__,_/____/_/ /_/_.___/\____/\__,_/_/ \__,_/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/homeassistant-core-v4.sh b/ct/homeassistant-core-v4.sh index c6b1ba10..15688616 100644 --- a/ct/homeassistant-core-v4.sh +++ b/ct/homeassistant-core-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,12 +44,12 @@ else fi function header_info { cat << "EOF" - __ __ ___ _ __ __ ______ - / / / /___ ____ ___ ___ / | __________(_)____/ /_____ _____ / /_ / ____/___v4________ + __ __ ___ _ __ __ ______ + / / / /___ ____ ___ ___ / | __________(_)____/ /_____ _____ / /_ / ____/___v4________ / /_/ / __ \/ __ `__ \/ _ \ / /| | / ___/ ___/ / ___/ __/ __ `/ __ \/ __/ / / / __ \/ ___/ _ \ / __ / /_/ / / / / / / __/ / ___ |(__ |__ ) (__ ) /_/ /_/ / / / / /_ / /___/ /_/ / / / __/ -/_/ /_/\____/_/ /_/ /_/\___/ /_/ |_/____/____/_/____/\__/\__,_/_/ /_/\__/ \____/\____/_/ \___/ - +/_/ /_/\____/_/ /_/ /_/\___/ /_/ |_/____/____/_/____/\__/\__,_/_/ /_/\__/ \____/\____/_/ \___/ + EOF } function msg_info() { @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/homeassistant-v2.sh b/ct/homeassistant-v2.sh index 938b6921..9167b1bb 100644 --- a/ct/homeassistant-v2.sh +++ b/ct/homeassistant-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[94m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will create a New Home Assistant Container LXC. Proceed(y/n)?" yn case $yn in @@ -16,13 +16,13 @@ done clear function header_info { echo -e "${BL} - _ _ _ _ - | | (_) | | | | - | |__ ___ _ __ ___ ___ __ _ ___ ___ _ ___| |_ __ _ _ __ | |_ + _ _ _ _ + | | (_) | | | | + | |__ ___ _ __ ___ ___ __ _ ___ ___ _ ___| |_ __ _ _ __ | |_ | _ \ / _ \| _ _ \ / _ \/ _ / __/ __| / __| __/ _ | _ \| __| - | | | | (_) | | | | | | __/ (_| \__ \__ \ \__ \ || (_| | | | | |_ + | | | | (_) | | | | | | __/ (_| \__ \__ \ \__ \ || (_| | | | | |_ |_| |_|\___/|_| |_| |_|\___|\__,_|___/___/_|___/\__\__,_|_| |_|\__| - + ${CL}" } @@ -191,7 +191,7 @@ while [ "$opt" != " " ] ;; esac done - + set -o errexit set -o errtrace set -o nounset @@ -238,13 +238,13 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ] && [ "$STORAGE_DRIVER" == " " ]; then + if [ "$IM" == "1" ] && [ "$STORAGE_DRIVER" == " " ]; then FEATURES="nesting=1,keyctl=1" elif - [ "$IM" == "1" ] && [ "$STORAGE_DRIVER" == "fuse" ]; then + [ "$IM" == "1" ] && [ "$STORAGE_DRIVER" == "fuse" ]; then FEATURES="nesting=1,keyctl=1,fuse=1" elif - [ "$IM" == "0" ] && [ "$STORAGE_DRIVER" == "fuse" ]; then + [ "$IM" == "0" ] && [ "$STORAGE_DRIVER" == "fuse" ]; then FEATURES="nesting=1,fuse=1" else FEATURES="nesting=1" diff --git a/ct/homeassistant-v3.sh b/ct/homeassistant-v3.sh index ad4dc553..16618903 100644 --- a/ct/homeassistant-v3.sh +++ b/ct/homeassistant-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,11 +43,11 @@ done clear function header_info { echo -e "${BL} - _ _ _ _ - | | ${YW}v3${CL}${BL} (_) | | | | - | |__ ___ _ __ ___ ___ __ _ ___ ___ _ ___| |_ __ _ _ __ | |_ + _ _ _ _ + | | ${YW}v3${CL}${BL} (_) | | | | + | |__ ___ _ __ ___ ___ __ _ ___ ___ _ ___| |_ __ _ _ __ | |_ | _ \ / _ \| _ _ \ / _ \/ _ / __/ __| / __| __/ _ | _ \| __| - | | | | (_) | | | | | | __/ (_| \__ \__ \ \__ \ || (_| | | | | |_ + | | | | (_) | | | | | | __/ (_| \__ \__ \ \__ \ || (_| | | | | |_ |_| |_|\___/|_| |_| |_|\___|\__,_|___/___/_|___/\__\__,_|_| |_|\__| ${CL}" } @@ -109,12 +109,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -124,7 +124,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -249,7 +249,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -273,7 +273,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -307,16 +307,16 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } PVE_CHECK start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/homeassistant-v4.sh b/ct/homeassistant-v4.sh index 767a5bb8..1a85d358 100644 --- a/ct/homeassistant-v4.sh +++ b/ct/homeassistant-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,11 +44,11 @@ else fi function header_info { echo -e "${BL} - __ __ ___ _ __ __ + __ __ ___ _ __ __ / / / /___ ____ ___ ___ v4 / | __________(_)____/ /_____ _____ / /_ / /_/ / __ \/ __ __ \/ _ \ / /| | / ___/ ___/ / ___/ __/ __ / __ \/ __/ - / __ / /_/ / / / / / / __/ / ___ |(__ |__ ) (__ ) /_/ /_/ / / / / /_ -/_/ /_/\____/_/ /_/ /_/\___/ /_/ |_/____/____/_/____/\__/\__,_/_/ /_/\__/ + / __ / /_/ / / / / / / __/ / ___ |(__ |__ ) (__ ) /_/ /_/ / / / / /_ +/_/ /_/\____/_/ /_/ /_/\___/ /_/ |_/____/____/_/____/\__/\__,_/_/ /_/\__/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/homebridge-v2.sh b/ct/homebridge-v2.sh index 3e045697..4f8a6451 100644 --- a/ct/homebridge-v2.sh +++ b/ct/homebridge-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will create a New Homebridge LXC. Proceed(y/n)?" yn case $yn in @@ -16,11 +16,11 @@ done clear function header_info { echo -e "${YW} - _ _ ____ __ __ ______ ____ _____ _____ _____ _____ ______ + _ _ ____ __ __ ______ ____ _____ _____ _____ _____ ______ | | | |/ __ \| \/ | ____| _ \| __ \|_ _| __ \ / ____| ____| - | |__| | | | | \ / | |__ | |_) | |__) | | | | | | | | __| |__ - | __ | | | | |\/| | __| | _ <| _ / | | | | | | | |_ | __| - | | | | |__| | | | | |____| |_) | | \ \ _| |_| |__| | |__| | |____ + | |__| | | | | \ / | |__ | |_) | |__) | | | | | | | | __| |__ + | __ | | | | |\/| | __| | _ <| _ / | | | | | | | |_ | __| + | | | | |__| | | | | |____| |_) | | \ \ _| |_| |__| | |__| | |____ |_| |_|\____/|_| |_|______|____/|_| \_\_____|_____/ \_____|______| ${CL}" } @@ -193,7 +193,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/homebridge-v3.sh b/ct/homebridge-v3.sh index 629a9a19..30106fe9 100644 --- a/ct/homebridge-v3.sh +++ b/ct/homebridge-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,11 +43,11 @@ done clear function header_info { echo -e "${YW} - _ _ ____ __ __ ______ ____ _____ _____ _____ _____ ______ + _ _ ____ __ __ ______ ____ _____ _____ _____ _____ ______ | | | |/ __ \| \/ | ____| _ \| __ \|_ _| __ \ / ____| ____| - | |__| | | | | \ / | |__ | |_) | |__) | | | | | | | | __| |__ - | __ | | | | |\/| | __| | _ <| _ / | | | | | | | |_ | __| - | | | | |__| | | | | |____| |_) | | \ \ _| |_| |__| | |__| | |____ + | |__| | | | | \ / | |__ | |_) | |__) | | | | | | | | __| |__ + | __ | | | | |\/| | __| | _ <| _ / | | | | | | | |_ | __| + | | | | |__| | | | | |____| |_) | | \ \ _| |_| |__| | |__| | |____ |_|v3|_|\____/|_| |_|______|____/|_| \_\_____|_____/ \_____|______| ${CL}" } @@ -109,12 +109,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -124,7 +124,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -249,7 +249,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -273,7 +273,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -307,15 +307,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/homebridge-v4.sh b/ct/homebridge-v4.sh index 508bc15d..ac0c01d9 100644 --- a/ct/homebridge-v4.sh +++ b/ct/homebridge-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,9 +46,9 @@ function header_info { echo -e "${YW} __ ______ __ _____________ ____ ________ ____________ / / / / __ \/ |/ / ____/ __ )/ __ \/ _/ __ \/ ____/ ____/ - / /_/ / / / / /|_/ / __/ / __ / /_/ // // / / / / __/ __/ - / __ / /_/ / / / / /___/ /_/ / _, _// // /_/ / /_/ / /___ -/_/ /_/\____/_/v4/_/_____/_____/_/ |_/___/_____/\____/_____/ + / /_/ / / / / /|_/ / __/ / __ / /_/ // // / / / / __/ __/ + / __ / /_/ / / / / /___/ /_/ / _, _// // /_/ / /_/ / /___ +/_/ /_/\____/_/v4/_/_____/_____/_/ |_/___/_____/\____/_____/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/homepage-v4.sh b/ct/homepage-v4.sh index 4d28a5f2..7f36c07f 100644 --- a/ct/homepage-v4.sh +++ b/ct/homepage-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,12 +44,12 @@ else fi function header_info { cat << "EOF" - __ __ - / / / /___ ____ ___ ___ ____ ____ _____ ____ + __ __ + / / / /___ ____ ___ ___ ____ ____ _____ ____ / /_/ / __ \/ __ `__ \/ _ \/ __ \/ __ `/ __ `/ _ \ / __ / /_/ / / / / / / __/ /_/ / /_/ / /_/ / __/ -/_/ /_/\____/_/ /_/ /_/\___/ .___/\__,_/\__, /\___/ - /_/ v4 /____/ +/_/ /_/\____/_/ /_/ /_/\___/ .___/\__,_/\__, /\___/ + /_/ v4 /____/ EOF } function msg_info() { @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/influxdb-v2.sh b/ct/influxdb-v2.sh index 0d9e113c..6b224f31 100644 --- a/ct/influxdb-v2.sh +++ b/ct/influxdb-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will create a New InfluxDB LXC. Proceed(y/n)?" yn case $yn in @@ -16,12 +16,12 @@ done clear function header_info { echo -e "${YW} - _____ __ _ _____ ____ - |_ _| / _| | | __ \| _ \ + _____ __ _ _____ ____ + |_ _| / _| | | __ \| _ \ | | _ __ | |_| |_ ___ _| | | | |_) | - | | | _ \| _| | | | \ \/ / | | | _ < + | | | _ \| _| | | | \ \/ / | | | _ < _| |_| | | | | | | |_| |> <| |__| | |_) | - |_____|_| |_|_| |_|\__,_/_/\_\_____/|____/ + |_____|_| |_|_| |_|\__,_/_/\_\_____/|____/ with Telegraf ${CL}" } @@ -194,7 +194,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/influxdb-v3.sh b/ct/influxdb-v3.sh index d4288d8b..1d12e7e8 100644 --- a/ct/influxdb-v3.sh +++ b/ct/influxdb-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,12 +43,12 @@ done clear function header_info { echo -e "${YW} - _____ __ _ _____ ____ - |_ _| / _| | | __ \| _ \ + _____ __ _ _____ ____ + |_ _| / _| | | __ \| _ \ | | _ __ | |_| |_ v3___ _| | | | |_) | - | | | _ \| _| | | | \ \/ / | | | _ < + | | | _ \| _| | | | \ \/ / | | | _ < _| |_| | | | | | | |_| |> <| |__| | |_) | - |_____|_| |_|_| |_|\__,_/_/\_\_____/|____/ + |_____|_| |_|_| |_|\__,_/_/\_\_____/|____/ with Telegraf ${CL}" } @@ -110,12 +110,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -125,7 +125,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -250,7 +250,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -274,7 +274,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -308,15 +308,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/influxdb-v4.sh b/ct/influxdb-v4.sh index b931f6b5..64f02d94 100644 --- a/ct/influxdb-v4.sh +++ b/ct/influxdb-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,11 +44,11 @@ else fi function header_info { echo -e "${YW} - ____ ______ ____ ____ + ____ ______ ____ ____ / _/_v4 / __/ /_ ___ __/ __ \/ __ ) / // __ \/ /_/ / / / / |/_/ / / / __ | - _/ // / / / __/ / /_/ /> /dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" @@ -247,6 +247,6 @@ lxc-cmd bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/m IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}') -echo -e "${GN}Successfully created Mariadb LXC to${CL} ${BL}$CTID${CL}. +echo -e "${GN}Successfully created Mariadb LXC to${CL} ${BL}$CTID${CL}. ${BL}Adminer${CL} should be reachable by going to the following URL. ${BL}http://${IP}/adminer/${CL} \n" diff --git a/ct/mariadb-v3.sh b/ct/mariadb-v3.sh index 74c52575..23a37a16 100644 --- a/ct/mariadb-v3.sh +++ b/ct/mariadb-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,12 +43,12 @@ done clear function header_info { echo -e "${BL} - __ __ _ _ _ - | \/ | (_) | | | - | \ / | __ _ _ __ _ __ _ __| | |__ - | |\/| |/ _ | __| |/ _ |/ _ | _ \ + __ __ _ _ _ + | \/ | (_) | | | + | \ / | __ _ _ __ _ __ _ __| | |__ + | |\/| |/ _ | __| |/ _ |/ _ | _ \ | | | | (_| | | | | (_| | (_| | |_) | - |_| |_|\__,_|_|v3|_|\__,_|\__,_|_.__/ + |_| |_|\__,_|_|v3|_|\__,_|\__,_|_.__/ ${CL}" } @@ -109,12 +109,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -124,7 +124,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -249,7 +249,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -273,7 +273,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -307,15 +307,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/mariadb-v4.sh b/ct/mariadb-v4.sh index bb162f47..9d87de85 100644 --- a/ct/mariadb-v4.sh +++ b/ct/mariadb-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,11 +44,11 @@ else fi function header_info { echo -e "${BL} - __ ___ _ ____ ____ + __ ___ _ ____ ____ / |/ /___ ______(_)___ _/ __ \/ __ ) / /|_/ / __ / ___/ / __ / / / / __ | - / / / / /_/ / / / / /_/ / /_/ / /_/ / -/_/ /_/\__,_/_/v4/_/\__,_/_____/_____/ + / / / / /_/ / / / / /_/ / /_/ / /_/ / +/_/ /_/\__,_/_/v4/_/\__,_/_____/_____/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/meshcentral-v2.sh b/ct/meshcentral-v2.sh index f8df0b17..cb252f07 100644 --- a/ct/meshcentral-v2.sh +++ b/ct/meshcentral-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` APP="MeshCentral" HN=$(echo ${APP,,} | tr -d ' ') while true; do @@ -18,7 +18,7 @@ done clear function header_info { echo -e "${BL} - __ __ _ _____ _ _ + __ __ _ _____ _ _ | \/ | | | / ____| | | | | | \ / | ___ ___| |__ | | ___ _ __ | |_ _ __ __ _| | | |\/| |/ _ \/ __| _ \| | / _ \ _ \| __| __/ _ | | @@ -195,7 +195,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" @@ -253,6 +253,6 @@ lxc-cmd bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/m IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}') -echo -e "${GN}Successfully created ${APP} LXC to${CL} ${BL}$CTID${CL}. +echo -e "${GN}Successfully created ${APP} LXC to${CL} ${BL}$CTID${CL}. ${APP} should be reachable by going to the following URL. ${BL}http://${IP}${CL} \n" diff --git a/ct/meshcentral-v3.sh b/ct/meshcentral-v3.sh index ff411439..24063ba9 100644 --- a/ct/meshcentral-v3.sh +++ b/ct/meshcentral-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,7 +43,7 @@ done clear function header_info { echo -e "${BL} - __ __ _ _____ _ _ + __ __ _ _____ _ _ | \/ | | | / ____| | | | | | \ / | ___ ___| |__ | | ___ _ __ | |_ _ __ __ _| | | |\/| |/ _ \/ __| _ \| | v3 / _ \ _ \| __| __/ _ | | @@ -109,12 +109,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -124,7 +124,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -249,7 +249,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -273,7 +273,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -307,15 +307,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/meshcentral-v4.sh b/ct/meshcentral-v4.sh index 20b01de8..0aab7ebd 100644 --- a/ct/meshcentral-v4.sh +++ b/ct/meshcentral-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,9 +46,9 @@ function header_info { echo -e "${BL} __ ___ __ ______ __ __ / |/ /__ _____/ /_ / ____/__ ____ / /__________ _/ / - / /|_/ / _ \/ ___/ __ \/ / / _ \/ __ \/ __/ ___/ __ / / - / / / / __(__ ) / / / /___/ __/ / / / /_/ / / /_/ / / -/_/ /_/\___/____/_/ /_/\____/\___/_/ /_/\__/_/ v4\__,_/_/ + / /|_/ / _ \/ ___/ __ \/ / / _ \/ __ \/ __/ ___/ __ / / + / / / / __(__ ) / / / /___/ __/ / / / /_/ / / /_/ / / +/_/ /_/\___/____/_/ /_/\____/\___/_/ /_/\__/_/ v4\__,_/_/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/motioneye-v2.sh b/ct/motioneye-v2.sh index 0c3449b3..1c79e086 100644 --- a/ct/motioneye-v2.sh +++ b/ct/motioneye-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` APP="Motioneye" HN=$(echo ${APP,,} | tr -d ' ') while true; do @@ -18,11 +18,11 @@ done clear function header_info { echo -e "${BL} - __ __ ____ _______ _____ ____ _ _ ________ ________ + __ __ ____ _______ _____ ____ _ _ ________ ________ | \/ |/ __ \__ __|_ _/ __ \| \ | | ____\ \ / / ____| - | \ / | | | | | | | || | | | \| | |__ \ \_/ /| |__ - | |\/| | | | | | | | || | | | | __| \ / | __| - | | | | |__| | | | _| || |__| | |\ | |____ | | | |____ + | \ / | | | | | | | || | | | \| | |__ \ \_/ /| |__ + | |\/| | | | | | | | || | | | | __| \ / | __| + | | | | |__| | | | _| || |__| | |\ | |____ | | | |____ |_| |_|\____/ |_| |_____\____/|_| \_|______| |_| |______| ${CL}" } @@ -195,7 +195,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/motioneye-v3.sh b/ct/motioneye-v3.sh index 1c3ca29e..5c680514 100644 --- a/ct/motioneye-v3.sh +++ b/ct/motioneye-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,11 +43,11 @@ done clear function header_info { echo -e "${BL} - __ __ ____ _______ _____ ____ _ _ ________ ________ + __ __ ____ _______ _____ ____ _ _ ________ ________ | \/ |/ __ \__ __|_ _/ __ \| \ | | ____\ \ / / ____| - | \ / | | | | | | | || | | | \| | |__ \ \_/ /| |__ - | |\/| | | | | | | | || | | | | __| \ / | __| - | | | | |__| | | | v3_| || |__| | |\ | |____ | | | |____ + | \ / | | | | | | | || | | | \| | |__ \ \_/ /| |__ + | |\/| | | | | | | | || | | | | __| \ / | __| + | | | | |__| | | | v3_| || |__| | |\ | |____ | | | |____ |_| |_|\____/ |_| |_____\____/|_| \_|______| |_| |______| ${CL}" } @@ -109,12 +109,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -124,7 +124,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -249,7 +249,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -273,7 +273,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -307,15 +307,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/motioneye-v4.sh b/ct/motioneye-v4.sh index ca5ba0e2..0ff78def 100644 --- a/ct/motioneye-v4.sh +++ b/ct/motioneye-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,9 +46,9 @@ function header_info { echo -e "${BL} __ ___ __ _ ________ ________ / |/ /___ / /_(_)___ ____ / ____/\ \/ / ____/ - / /|_/ / __ \/ __/ / __ \/ __ \/ __/ \ / __/ - / / / / /_/ / /_/ / /_/ / / / / /___v4 / / /___ -/_/ /_/\____/\__/_/\____/_/ /_/_____/ /_/_____/ + / /|_/ / __ \/ __/ / __ \/ __ \/ __/ \ / __/ + / / / / /_/ / /_/ / /_/ / / / / /___v4 / / /___ +/_/ /_/\____/\__/_/\____/_/ /_/_____/ /_/_____/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/mqtt-v2.sh b/ct/mqtt-v2.sh index 7bd70ed0..9b122af4 100644 --- a/ct/mqtt-v2.sh +++ b/ct/mqtt-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will create a New MQTT LXC. Proceed(y/n)?" yn case $yn in @@ -16,13 +16,13 @@ done clear function header_info { echo -e "${BL} - __ __ ____ _______ _______ + __ __ ____ _______ _______ | \/ |/ __ \__ __|__ __| - | \ / | | | | | | | | - | |\/| | | | | | | | | - | | | | |__| | | | | | - |_| |_|\___\_\ |_| |_| - + | \ / | | | | | | | | + | |\/| | | | | | | | | + | | | | |__| | | | | | + |_| |_|\___\_\ |_| |_| + ${CL}" } @@ -194,7 +194,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/mqtt-v3.sh b/ct/mqtt-v3.sh index 7d74a950..76a38d53 100644 --- a/ct/mqtt-v3.sh +++ b/ct/mqtt-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,12 +43,12 @@ done clear function header_info { echo -e "${BL} - __ __ ____ _______ _______ + __ __ ____ _______ _______ | \/ |/ __ \__ __|__ __| - | \ / | | | | | | | | - | |\/| | | | | | | | | - | | | | |__| | | | | | - |_| |_|\___\_\ |_| v3 |_| + | \ / | | | | | | | | + | |\/| | | | | | | | | + | | | | |__| | | | | | + |_| |_|\___\_\ |_| v3 |_| ${CL}" } @@ -109,12 +109,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -124,7 +124,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -249,7 +249,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -273,7 +273,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -307,15 +307,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/mqtt-v4.sh b/ct/mqtt-v4.sh index c9b3cfe6..05c340ee 100644 --- a/ct/mqtt-v4.sh +++ b/ct/mqtt-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,9 +46,9 @@ function header_info { echo -e "${GN} __ _______ ____________ / |/ / __ \/_ __/_ __/ - / /|_/ / / / / / / / / - / / / / /_/ / / / / / -/_/ /_/\___\_\/_/ v4/_/ + / /|_/ / / / / / / / / + / / / / /_/ / / / / / +/_/ /_/\___\_\/_/ v4/_/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/n8n-v3.sh b/ct/n8n-v3.sh index 1347f25c..903f321e 100644 --- a/ct/n8n-v3.sh +++ b/ct/n8n-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,10 +43,10 @@ done clear function header_info { echo -e "${RD} - ___ - / _ \ - _ __ | (_) |_v3_ - | _ \ > _ <| _ \ + ___ + / _ \ + _ __ | (_) |_v3_ + | _ \ > _ <| _ \ | | | | (_) | | | | |_| |_|\___/|_| |_| ${CL}" diff --git a/ct/n8n-v4.sh b/ct/n8n-v4.sh index b12a26ac..0a9885f4 100644 --- a/ct/n8n-v4.sh +++ b/ct/n8n-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,10 +44,10 @@ else fi function header_info { echo -e "${RD} - ___ - / _ \ - _ __ | (_) |_v4_ - | _ \ > _ <| _ \ + ___ + / _ \ + _ __ | (_) |_v4_ + | _ \ > _ <| _ \ | | | | (_) | | | | |_| |_|\___/|_| |_| ${CL}" @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/navidrome-v4.sh b/ct/navidrome-v4.sh index 52940afc..ac736111 100644 --- a/ct/navidrome-v4.sh +++ b/ct/navidrome-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,11 +44,11 @@ else fi function header_info { cat << "EOF" - _ __ _ __ - / | / /___ __ v4__(_)___/ /________ ____ ___ ___ + _ __ _ __ + / | / /___ __ v4__(_)___/ /________ ____ ___ ___ / |/ / __ / | / / / __ / ___/ __ \/ __ __ \/ _ \ / /| / /_/ /| |/ / / /_/ / / / /_/ / / / / / / __/ -/_/ |_/\__,_/ |___/_/\__,_/_/ \____/_/ /_/ /_/\___/ +/_/ |_/\__,_/ |___/_/\__,_/_/ \____/_/ /_/ /_/\___/ EOF } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/nextcloudpi-v4.sh b/ct/nextcloudpi-v4.sh index feb45833..b8e64f4a 100644 --- a/ct/nextcloudpi-v4.sh +++ b/ct/nextcloudpi-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,12 +44,12 @@ else fi function header_info { cat << "EOF" - _ __ __ ________ ______ _ + _ __ __ ________ ______ _ / | / /__ _ __/ /_/ ____/ /___ __v4______/ / __ \(_) - / |/ / _ \| |/_/ __/ / / / __ \/ / / / __ / /_/ / / - / /| / __/> /dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/nginx-proxy-manager-v3.sh b/ct/nginx-proxy-manager-v3.sh index bfcf2225..97932155 100644 --- a/ct/nginx-proxy-manager-v3.sh +++ b/ct/nginx-proxy-manager-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,7 +43,7 @@ done clear function header_info { echo -e "${RD} - _ _ _____ __ __ + _ _ _____ __ __ | \ | | __ \| \/ | | \| | |__) | \ / | | | ___/| |\/| | @@ -109,12 +109,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -124,7 +124,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -249,7 +249,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -273,7 +273,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -307,15 +307,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/nginx-proxy-manager-v4.sh b/ct/nginx-proxy-manager-v4.sh index 68dbbf6e..78dc09e7 100644 --- a/ct/nginx-proxy-manager-v4.sh +++ b/ct/nginx-proxy-manager-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,12 +44,12 @@ else fi function header_info { echo -e "${RD} - _ __ _ ____ __ ___ + _ __ _ ____ __ ___ / | / /___ _(_)___ _ __ / __ \_________ _ ____ __ / |/ /___ _____ ____ _____ ____ _____ / |/ / __ / / __ \| |/_/ / /_/ / ___/ __ \| |/_/ / / / / /|_/ / __ / __ \/ __ / __ / _ \/ ___/ - / /| / /_/ / / / / /> < / ____/ / / /_/ /> < / ____/ / / /_/ /> /dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" @@ -253,6 +253,6 @@ lxc-cmd bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/m IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}') -echo -e "${GN}Successfully created ${APP} LXC to${CL} ${BL}$CTID${CL}. +echo -e "${GN}Successfully created ${APP} LXC to${CL} ${BL}$CTID${CL}. ${BL}${APP}${CL} should be reachable by going to the following URL. ${BL}http://${IP}:8080/dashboard${CL}\n" diff --git a/ct/nocodb-v3.sh b/ct/nocodb-v3.sh index 9ede88a8..1fcbb463 100644 --- a/ct/nocodb-v3.sh +++ b/ct/nocodb-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,12 +43,12 @@ done clear function header_info { echo -e "${YW} - _ _ _____ ____ - | \ | | | __ \| _ \ + _ _ _____ ____ + | \ | | | __ \| _ \ | \| | ___ v3___ ___ | | | | |_) | - | |/ _ \ / __/ _ \| | | | _ < + | |/ _ \ / __/ _ \| | | | _ < | |\ | (_) | (_| (_) | |__| | |_) | - |_| \_|\___/ \___\___/|_____/|____/ + |_| \_|\___/ \___\___/|_____/|____/ ${CL}" } @@ -109,12 +109,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -124,7 +124,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -249,7 +249,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -273,7 +273,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -307,15 +307,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/nocodb-v4.sh b/ct/nocodb-v4.sh index a4eccffb..fcbc1c70 100644 --- a/ct/nocodb-v4.sh +++ b/ct/nocodb-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,11 +44,11 @@ else fi function header_info { echo -e "${YW} - _ __ ____ ____ + _ __ ____ ____ / | / /___ ____v4___ / __ \/ __ ) / |/ / __ \/ ___/ __ \/ / / / __ | - / /| / /_/ / /__/ /_/ / /_/ / /_/ / -/_/ |_/\____/\___/\____/_____/_____/ + / /| / /_/ / /__/ /_/ / /_/ / /_/ / +/_/ |_/\____/\___/\____/_____/_____/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/node-red-v2.sh b/ct/node-red-v2.sh index 9ecc7d17..3252d2ea 100644 --- a/ct/node-red-v2.sh +++ b/ct/node-red-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will create a New Node-Red LXC. Proceed(y/n)?" yn case $yn in @@ -16,13 +16,13 @@ done clear function header_info { echo -e "${RD} - _ _ _ _____ _ + _ _ _ _____ _ | \ | | | | | __ \ | | | \| | ___ __| | ___ ______| |__) |___ __| | | |/ _ \ / _ |/ _ \______| _ // _ \/ _ | | |\ | (_) | (_| | __/ | | \ \ __/ (_| | |_| \_|\___/ \__,_|\___| |_| \_\___|\__,_| - + ${CL}" } @@ -194,7 +194,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/node-red-v3.sh b/ct/node-red-v3.sh index 58252e17..a18baaac 100644 --- a/ct/node-red-v3.sh +++ b/ct/node-red-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,7 +43,7 @@ done clear function header_info { echo -e "${RD} - _ _ _ _____ _ + _ _ _ _____ _ | \ | | | | | __ \ | | | \| | ___ __| | ___ ______| |__) |___ __| | | |/ _ \ / _ |/ _ \__v3__| _ // _ \/ _ | @@ -109,12 +109,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -124,7 +124,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -249,7 +249,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -273,7 +273,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -307,15 +307,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/node-red-v4.sh b/ct/node-red-v4.sh index 0c356ee0..cc07d71b 100644 --- a/ct/node-red-v4.sh +++ b/ct/node-red-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,9 +46,9 @@ function header_info { echo -e "${RD} _ __ __ ____ __ / | / /___ ____/ /__ v4 / __ \___ ____/ / - / |/ / __ \/ __ / _ \ / /_/ / _ \/ __ / - / /| / /_/ / /_/ / __/ / _, _/ __/ /_/ / -/_/ |_/\____/\__,_/\___/ /_/ |_|\___/\__,_/ + / |/ / __ \/ __ / _ \ / /_/ / _ \/ __ / + / /| / /_/ / /_/ / __/ / _, _/ __/ /_/ / +/_/ |_/\____/\__,_/\___/ /_/ |_|\___/\__,_/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/omada-v2.sh b/ct/omada-v2.sh index 6ec8036b..c1ce8a8b 100644 --- a/ct/omada-v2.sh +++ b/ct/omada-v2.sh @@ -2,10 +2,10 @@ clear YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will create a New Omada Controller LXC. Proceed(y/n)?" yn case $yn in @@ -17,12 +17,12 @@ done clear function header_info { echo -e "${BL} - ____ _ _____ _ _ _ - / __ \ | | / ____| | | | | | - | | | |_ __ ___ __ _ __| | __ _ | | ___ _ __ | |_ _ __ ___ | | | ___ _ __ + ____ _ _____ _ _ _ + / __ \ | | / ____| | | | | | + | | | |_ __ ___ __ _ __| | __ _ | | ___ _ __ | |_ _ __ ___ | | | ___ _ __ | | | | _ _ \ / _ |/ _ |/ _ | | | / _ \| _ \| __| __/ _ \| | |/ _ \ __| - | |__| | | | | | | (_| | (_| | (_| | | |___| (_) | | | | |_| | | (_) | | | __/ | - \____/|_| |_| |_|\__,_|\__,_|\__,_| \_____\___/|_| |_|\__|_| \___/|_|_|\___|_| + | |__| | | | | | | (_| | (_| | (_| | | |___| (_) | | | | |_| | | (_) | | | __/ | + \____/|_| |_| |_|\__,_|\__,_|\__,_| \_____\___/|_| |_|\__|_| \___/|_|_|\___|_| ${CL}" } @@ -194,7 +194,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/omada-v3.sh b/ct/omada-v3.sh index 7b97dace..5b61be21 100644 --- a/ct/omada-v3.sh +++ b/ct/omada-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,12 +43,12 @@ done clear function header_info { echo -e "${BL} - ____ _ _____ _ _ _ - / __ \ | | / ____| | | | | | - | | | |_ __ ___ v3__ _ __| | __ _ | | ___ _ __ | |_ _ __ ___ | | | ___ _ __ + ____ _ _____ _ _ _ + / __ \ | | / ____| | | | | | + | | | |_ __ ___ v3__ _ __| | __ _ | | ___ _ __ | |_ _ __ ___ | | | ___ _ __ | | | | _ _ \ / _ |/ _ |/ _ | | | / _ \| _ \| __| __/ _ \| | |/ _ \ __| - | |__| | | | | | | (_| | (_| | (_| | | |___| (_) | | | | |_| | | (_) | | | __/ | - \____/|_| |_| |_|\__,_|\__,_|\__,_| \_____\___/|_| |_|\__|_| \___/|_|_|\___|_| + | |__| | | | | | | (_| | (_| | (_| | | |___| (_) | | | | |_| | | (_) | | | __/ | + \____/|_| |_| |_|\__,_|\__,_|\__,_| \_____\___/|_| |_|\__|_| \___/|_|_|\___|_| ${CL}" } @@ -109,12 +109,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -124,7 +124,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -249,7 +249,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -273,7 +273,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -307,15 +307,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/omada-v4.sh b/ct/omada-v4.sh index 51b2f592..d96bd714 100644 --- a/ct/omada-v4.sh +++ b/ct/omada-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,11 +44,11 @@ else fi function header_info { echo -e "${BL} - ____ __ + ____ __ / __ \____ ___v4____ _____/ /___ _ / / / / __ __ \/ __ / __ / __ / -/ /_/ / / / / / / /_/ / /_/ / /_/ / -\____/_/ /_/ /_/\__,_/\__,_/\__,_/ +/ /_/ / / / / / / /_/ / /_/ / /_/ / +\____/_/ /_/ /_/\__,_/\__,_/\__,_/ ${CL}" } function msg_info() { @@ -194,7 +194,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -218,7 +218,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/omv-v4.sh b/ct/omv-v4.sh index 322e0373..439b8476 100644 --- a/ct/omv-v4.sh +++ b/ct/omv-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,12 +44,12 @@ else fi function header_info { cat << "EOF" - ____ __ ___ ___ _ __ ____ + ____ __ ___ ___ _ __ ____ / __ \____v4___ ____ / |/ /__ ____/ (_)___ | | / /___ ___ __/ / /_ / / / / __ \/ _ \/ __ \/ /|_/ / _ \/ __ / / __ `/ | / / __ `/ / / / / __/ -/ /_/ / /_/ / __/ / / / / / / __/ /_/ / / /_/ /| |/ / /_/ / /_/ / / /_ -\____/ .___/\___/_/ /_/_/ /_/\___/\__,_/_/\__,_/ |___/\__,_/\__,_/_/\__/ - /_/ +/ /_/ / /_/ / __/ / / / / / / __/ /_/ / / /_/ /| |/ / /_/ / /_/ / / /_ +\____/ .___/\___/_/ /_/_/ /_/\___/\__,_/_/\__,_/ |___/\__,_/\__,_/_/\__/ + /_/ EOF } function msg_info() { @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" @@ -235,7 +235,7 @@ bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/c LXC_CONFIG=/etc/pve/lxc/${CTID}.conf cat <> $LXC_CONFIG lxc.cgroup2.devices.allow: a -lxc.cap.drop: +lxc.cap.drop: lxc.cgroup2.devices.allow: c 188:* rwm lxc.cgroup2.devices.allow: c 189:* rwm lxc.mount.entry: /dev/serial/by-id dev/serial/by-id none bind,optional,create=dir diff --git a/ct/openhab-v3.sh b/ct/openhab-v3.sh index a4726cb0..38487edd 100644 --- a/ct/openhab-v3.sh +++ b/ct/openhab-v3.sh @@ -12,11 +12,11 @@ NSAPP=$(echo ${APP,,} | tr -d ' ') var_install="${NSAPP}-install" YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -59,14 +59,14 @@ done clear function header_info { echo -e "${YW} - _ _ ____ - | | | | /\ | _ \ + _ _ ____ + | | | | /\ | _ \ ___ _ __ ___ _ __ | |__| | / \ | |_) | - / _ \| _ \ / _ \ _ \| __ | / /\ \ | _ < + / _ \| _ \ / _ \ _ \| __ | / /\ \ | _ < | (_) | |_) | __/ | | | | | |/ ____ \| |_) | - \___/| .__/ \___|_| |_|_| |_/_/ v3 \_\____/ - | | - |_| + \___/| .__/ \___|_| |_|_| |_/_/ v3 \_\____/ + | | + |_| ${CL}" } @@ -117,12 +117,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Unprivileged, or Press [ENTER] for Default: Privileged" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Privileged" CT_TYPE="0"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Privileged" CT_TYPE="0"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Unprivileged" CT_TYPE="1" - echo -en "${DGN}Set CT Type ${BL}Unprivileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Unprivileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -132,7 +132,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -257,7 +257,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -281,7 +281,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -315,15 +315,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/openhab-v4.sh b/ct/openhab-v4.sh index 28aa3454..41459888 100644 --- a/ct/openhab-v4.sh +++ b/ct/openhab-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,12 +44,12 @@ else fi function header_info { echo -e "${YW} - __ _____ ____ + __ _____ ____ ____v4____ ___ ____ / / / / | / __ ) / __ \/ __ \/ _ \/ __ \/ /_/ / /| | / __ | -/ /_/ / /_/ / __/ / / / __ / ___ |/ /_/ / -\____/ .___/\___/_/ /_/_/ /_/_/ |_/_____/ - /_/ +/ /_/ / /_/ / __/ / / / __ / ___ |/ /_/ / +\____/ .___/\___/_/ /_/_/ /_/_/ |_/_____/ + /_/ ${CL}" } function msg_info() { @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/paperless-ngx-v4.sh b/ct/paperless-ngx-v4.sh index 7092b27b..1cc8c5e2 100644 --- a/ct/paperless-ngx-v4.sh +++ b/ct/paperless-ngx-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,12 +44,12 @@ else fi function header_info { cat << "EOF" - ____ __ + ____ __ / __ \____ _____ ___ _____/ /__v4__________ ____ ____ __ __ / /_/ / __ `/ __ \/ _ \/ ___/ / _ \/ ___/ ___/___/ __ \/ __ `/ |/_/ - / ____/ /_/ / /_/ / __/ / / / __(__ |__ )___/ / / / /_/ /> < -/_/ \__,_/ .___/\___/_/ /_/\___/____/____/ /_/ /_/\__, /_/|_| - /_/ /____/ + / ____/ /_/ / /_/ / __/ / / / __(__ |__ )___/ / / / /_/ /> < +/_/ \__,_/ .___/\___/_/ /_/\___/____/____/ /_/ /_/\__, /_/|_| + /_/ /____/ EOF } function msg_info() { @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/photoprism-v2.sh b/ct/photoprism-v2.sh index 31035d89..e8da1c3c 100644 --- a/ct/photoprism-v2.sh +++ b/ct/photoprism-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` PP=`echo "\e[1;35m"` APP="PhotoPrism" HN=$(echo ${APP,,} | tr -d ' ') @@ -19,10 +19,10 @@ done clear function header_info { echo -e "${PP} - _____ _ _ _____ _ - | __ \| | | | | __ \ (_) - | |__) | |__ ___ | |_ ___ | |__) | __ _ ___ _ __ ___ - | ___/| _ \ / _ \| __/ _ \| ___/ __| / __| _ _ \ + _____ _ _ _____ _ + | __ \| | | | | __ \ (_) + | |__) | |__ ___ | |_ ___ | |__) | __ _ ___ _ __ ___ + | ___/| _ \ / _ \| __/ _ \| ___/ __| / __| _ _ \ | | | | | | (_) | || (_) | | | | | \__ \ | | | | | |_| |_| |_|\___/ \__\___/|_| |_| |_|___/_| |_| |_| ${CL}" @@ -196,7 +196,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" @@ -254,6 +254,6 @@ lxc-cmd bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/m IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}') -echo -e "${GN}Successfully created ${APP} LXC to${CL} ${BL}$CTID${CL}. +echo -e "${GN}Successfully created ${APP} LXC to${CL} ${BL}$CTID${CL}. ${APP} should be reachable by going to the following URL. ${BL}http://${IP}:2342${CL} \n" diff --git a/ct/photoprism-v3.sh b/ct/photoprism-v3.sh index 3f90236f..a0f1cb3e 100644 --- a/ct/photoprism-v3.sh +++ b/ct/photoprism-v3.sh @@ -5,11 +5,11 @@ INTEGER='^[0-9]+$' PP=`echo "\e[1;35m"` YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,10 +44,10 @@ done clear function header_info { echo -e "${PP} - _____ _ _ _____ _ - | __ \| | | | | __ \ (_) - | |__) | |__ ___ | |_ ___ | |__) | __ _ ___ _ __ ___ - | ___/| _ \ / _ \| __/ _ \| ___/ __| / __| _ _ \ + _____ _ _ _____ _ + | __ \| | | | | __ \ (_) + | |__) | |__ ___ | |_ ___ | |__) | __ _ ___ _ __ ___ + | ___/| _ \ / _ \| __/ _ \| ___/ __| / __| _ _ \ | | | | | | (_) | || (_) | | | | | \__ \ | | | | | |_| v3 |_| |_|\___/ \__\___/|_| |_| |_|___/_| |_| |_| ${CL}" @@ -110,12 +110,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -125,7 +125,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -250,7 +250,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -274,7 +274,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -308,15 +308,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/photoprism-v4.sh b/ct/photoprism-v4.sh index d7f06465..f2385225 100644 --- a/ct/photoprism-v4.sh +++ b/ct/photoprism-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,9 +46,9 @@ function header_info { echo -e "${RD} ____ __ ______ __________ ____ ____ _________ __ ___ / __ \/ / / / __ \/_ __/ __ \/ __ \/ __ \/ _/ ___// |/ / - / /_/ / /_/ / / / / / / / / / / /_/ / /_/ // / \__ \/ /|_/ / - / ____/ __ / /_/ / / / / /_/ / ____/ _, _// / v4_/ / / / / -/_/ /_/ /_/\____/ /_/ \____/_/ /_/ |_/___//____/_/ /_/ + / /_/ / /_/ / / / / / / / / / / /_/ / /_/ // / \__ \/ /|_/ / + / ____/ __ / /_/ / / / / /_/ / ____/ _, _// / v4_/ / / / / +/_/ /_/ /_/\____/ /_/ \____/_/ /_/ |_/___//____/_/ /_/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/pihole-v2.sh b/ct/pihole-v2.sh index 9a0abcdd..03c54b3f 100644 --- a/ct/pihole-v2.sh +++ b/ct/pihole-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` APP="Pihole" HN=$(echo ${APP,,} | tr -d ' ') while true; do @@ -18,11 +18,11 @@ done clear function header_info { echo -e "${RD} - _____ _____ _ _ ____ _ ______ + _____ _____ _ _ ____ _ ______ | __ \_ _| | | |/ __ \| | | ____| - | |__) || | | |__| | | | | | | |__ - | ___/ | | | __ | | | | | | __| - | | _| |_| | | | |__| | |____| |____ + | |__) || | | |__| | | | | | | |__ + | ___/ | | | __ | | | | | | __| + | | _| |_| | | | |__| | |____| |____ |_| |_____|_| |_|\____/|______|______| ${CL}" } @@ -195,7 +195,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/pihole-v3.sh b/ct/pihole-v3.sh index 03a5b577..e95411ab 100644 --- a/ct/pihole-v3.sh +++ b/ct/pihole-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,11 +43,11 @@ done clear function header_info { echo -e "${RD} - _____ _____ _ _ ____ _ ______ + _____ _____ _ _ ____ _ ______ | __ \_ _| | | |/ __ \| | | ____| - | |__) || | | |__| | | | | | | |__ - | ___/ | | | __ | | | | | | __| - | | v3 _| |_| | | | |__| | |____| |____ + | |__) || | | |__| | | | | | | |__ + | ___/ | | | __ | | | | | | __| + | | v3 _| |_| | | | |__| | |____| |____ |_| |_____|_| |_|\____/|______|______| ${CL}" } @@ -109,12 +109,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Unprivileged, or Press [ENTER] for Default: Privileged" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Privileged" CT_TYPE="0"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Privileged" CT_TYPE="0"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Unprivileged" CT_TYPE="1" - echo -en "${DGN}Set CT Type ${BL}Unprivileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Unprivileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -124,7 +124,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -249,7 +249,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -273,7 +273,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -307,15 +307,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/pihole-v4.sh b/ct/pihole-v4.sh index 3fced599..2f99d7a6 100644 --- a/ct/pihole-v4.sh +++ b/ct/pihole-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,9 +46,9 @@ function header_info { echo -e "${RD} ____ ____ __ ______ __ ______ / __ \/ _/ / / / / __ \/ / / ____/ - / /_/ // /___/ /_/ / / / / / / __/ - / ____// /___/ __ / /_/ / /v4_/ /___ -/_/ /___/ /_/ /_/\____/_____/_____/ + / /_/ // /___/ /_/ / / / / / / __/ + / ____// /___/ __ / /_/ / /v4_/ /___ +/_/ /___/ /_/ /_/\____/_____/_____/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/plex-v3.sh b/ct/plex-v3.sh index da77b58e..035b6404 100644 --- a/ct/plex-v3.sh +++ b/ct/plex-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,11 +44,11 @@ done clear function header_info { echo -e "${YW} - _____ _ - | __ \| | + _____ _ + | __ \| | | |__) | | _____ __ | ___/| |/ _ \ \/ / - | | | | __/> < + | | | | __/> < |_| v3 |_|\___/_/\_\ ${CL}" } @@ -110,12 +110,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type ${CROSS}${YW}Unprivileged, or Press [ENTER] for Default: Privileged" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Privileged" CT_TYPE="0"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Privileged" CT_TYPE="0"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Unprivileged" CT_TYPE="1" - echo -en "${DGN}Set CT Type ${BL}Unprivileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Unprivileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -125,7 +125,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -250,7 +250,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -274,7 +274,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -308,16 +308,16 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } PVE_CHECK start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/plex-v4.sh b/ct/plex-v4.sh index b4ca8385..9ee9fe70 100644 --- a/ct/plex-v4.sh +++ b/ct/plex-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,11 +44,11 @@ else fi function header_info { echo -e "${YW} - ____ __ + ____ __ / __ \/ /__ _ __ / /_/ / / _ \| |/_/ - / ____/ / __/> < -/_/v4 /_/\___/_/|_| + / ____/ / __/> < +/_/v4 /_/\___/_/|_| ${CL}" } function msg_info() { @@ -70,7 +70,7 @@ fi } function default_settings() { echo -e "${DGN}Using ${var_os} Version: ${BGN}${var_version}${CL}" - + echo -e "${DGN}Using Container Type: ${BGN}Privileged${CL}" CT_TYPE="0" echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}" @@ -194,7 +194,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -218,7 +218,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/podman-homeassistant-v1.sh b/ct/podman-homeassistant-v1.sh index 7bf3164a..5ea300cd 100644 --- a/ct/podman-homeassistant-v1.sh +++ b/ct/podman-homeassistant-v1.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will create a New Podman Home Assistant Container LXC. Proceed(y/n)?" yn case $yn in @@ -16,18 +16,18 @@ done clear function header_info { echo -e "${BL} - _____ _ - | __ \ | | - | |__) |__ __| |_ __ ___ __ _ _ __ - | ___/ _ \ / _ | _ _ \ / _ | _ \ - | | | (_) | (_| | | | | | | (_| | | | | - |_| \___/ \__,_|_| |_| |_|\__,_|_| |_| _ _ _ - | | (_) | | | | - | |__ ___ _ __ ___ ___ __ _ ___ ___ _ ___| |_ __ _ _ __ | |_ + _____ _ + | __ \ | | + | |__) |__ __| |_ __ ___ __ _ _ __ + | ___/ _ \ / _ | _ _ \ / _ | _ \ + | | | (_) | (_| | | | | | | (_| | | | | + |_| \___/ \__,_|_| |_| |_|\__,_|_| |_| _ _ _ + | | (_) | | | | + | |__ ___ _ __ ___ ___ __ _ ___ ___ _ ___| |_ __ _ _ __ | |_ | _ \ / _ \| _ _ \ / _ \/ _ / __/ __| / __| __/ _ | _ \| __| - | | | | (_) | | | | | | __/ (_| \__ \__ \ \__ \ || (_| | | | | |_ + | | | | (_) | | | | | | __/ (_| \__ \__ \ \__ \ || (_| | | | | |_ |_| |_|\___/|_| |_| |_|\___|\__,_|___/___/_|___/\__\__,_|_| |_|\__| - + ${CL}" } header_info diff --git a/ct/podman-homeassistant-v3.sh b/ct/podman-homeassistant-v3.sh index 30985849..f283502f 100644 --- a/ct/podman-homeassistant-v3.sh +++ b/ct/podman-homeassistant-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,18 +44,18 @@ done clear function header_info { echo -e "${BL} - _____ _ - | __ \ | | - | |__) |__ __| |_ __ ___ __ _ _ __ - | ___/ _ \ / _ | _ _ \ / _ | _ \ - | | | (_) | (_| | | | | | | (_| | | | | - |_| \___/ \__,_|_| |_| |_|\__,_|_| |_| _ _ _ - | | v3 (_) | | | | - | |__ ___ _ __ ___ ___ __ _ ___ ___ _ ___| |_ __ _ _ __ | |_ + _____ _ + | __ \ | | + | |__) |__ __| |_ __ ___ __ _ _ __ + | ___/ _ \ / _ | _ _ \ / _ | _ \ + | | | (_) | (_| | | | | | | (_| | | | | + |_| \___/ \__,_|_| |_| |_|\__,_|_| |_| _ _ _ + | | v3 (_) | | | | + | |__ ___ _ __ ___ ___ __ _ ___ ___ _ ___| |_ __ _ _ __ | |_ | _ \ / _ \| _ _ \ / _ \/ _ / __/ __| / __| __/ _ | _ \| __| - | | | | (_) | | | | | | __/ (_| \__ \__ \ \__ \ || (_| | | | | |_ + | | | | (_) | | | | | | __/ (_| \__ \__ \ \__ \ || (_| | | | | |_ |_| |_|\___/|_| |_| |_|\___|\__,_|___/___/_|___/\__\__,_|_| |_|\__| - + ${CL}" } @@ -116,12 +116,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type ${CROSS}${YW}Unprivileged, or Press [ENTER] for Default: Privileged" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Privileged" CT_TYPE="0"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Privileged" CT_TYPE="0"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Unprivileged" CT_TYPE="1" - echo -en "${DGN}Set CT Type ${BL}UnPrivileged${CL}" + echo -en "${DGN}Set CT Type ${BL}UnPrivileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -131,7 +131,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -256,7 +256,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -280,7 +280,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -314,15 +314,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } PVE_CHECK start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/podman-homeassistant-v4.sh b/ct/podman-homeassistant-v4.sh index 9bbac839..0d07ca6a 100644 --- a/ct/podman-homeassistant-v4.sh +++ b/ct/podman-homeassistant-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,15 +44,15 @@ else fi function header_info { echo -e "${BL} - ____ __ - / __ \____ ____/ /___ ___ ____ _____ - v4 / /_/ / __ \/ __ / __ __ \/ __ / __ \ - / ____/ /_/ / /_/ / / / / / / /_/ / / / / - __ __ /_/ \____/\__,_/_/ /_/ /_/\__,_/_/ /_/__ __ + ____ __ + / __ \____ ____/ /___ ___ ____ _____ + v4 / /_/ / __ \/ __ / __ __ \/ __ / __ \ + / ____/ /_/ / /_/ / / / / / / /_/ / / / / + __ __ /_/ \____/\__,_/_/ /_/ /_/\__,_/_/ /_/__ __ / / / /___ ____ ___ ___ / | __________(_)____/ /_____ _____ / /_ / /_/ / __ \/ __ __ \/ _ \ / /| | / ___/ ___/ / ___/ __/ __ / __ \/ __/ - / __ / /_/ / / / / / / __/ / ___ |(__ |__ ) (__ ) /_/ /_/ / / / / /_ -/_/ /_/\____/_/ /_/ /_/\___/ /_/ |_/____/____/_/____/\__/\__,_/_/ /_/\__/ + / __ / /_/ / / / / / / __/ / ___ |(__ |__ ) (__ ) /_/ /_/ / / / / /_ +/_/ /_/\____/_/ /_/ /_/\___/ /_/ |_/____/____/_/____/\__/\__,_/_/ /_/\__/ ${CL}" } function msg_info() { @@ -189,7 +189,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -213,7 +213,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/postgresql-v3.sh b/ct/postgresql-v3.sh index d68d8102..d44820f7 100644 --- a/ct/postgresql-v3.sh +++ b/ct/postgresql-v3.sh @@ -12,11 +12,11 @@ NSAPP=$(echo ${APP,,} | tr -d ' ') var_install="${NSAPP}-install" YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -59,14 +59,14 @@ done clear function header_info { echo -e "${BL} - _____ _ _____ ____ _ - | __ \ | | / ____|/ __ \| | - | |__) |__ ___| |_ __ _ _ __ ___| (___ | | | | | - | ___/ _ \/ __| __/ _ | __/ _ \\___ \| | | | | - | | | (_) \__ \ || (_| | | | __/____) | |__| | |____ + _____ _ _____ ____ _ + | __ \ | | / ____|/ __ \| | + | |__) |__ ___| |_ __ _ _ __ ___| (___ | | | | | + | ___/ _ \/ __| __/ _ | __/ _ \\___ \| | | | | + | | | (_) \__ \ || (_| | | | __/____) | |__| | |____ |_| \___/|___/\__\__, |_| \___|_____/ \___\_\______| - __/ | - v3|___/ + __/ | + v3|___/ ${CL}" } @@ -117,12 +117,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -132,7 +132,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -257,7 +257,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -281,7 +281,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -315,15 +315,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/postgresql-v4.sh b/ct/postgresql-v4.sh index 6f89483a..bc85a6bf 100644 --- a/ct/postgresql-v4.sh +++ b/ct/postgresql-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,12 +44,12 @@ else fi function header_info { echo -e "${BL} - ____ __ _____ ____ __ - / __ \____ _____/ /_____ _________ / ___// __ \ / / - / /_/ / __ \/ ___/ __/ __ / ___/ _ \\__ \/ / / / / / + ____ __ _____ ____ __ + / __ \____ _____/ /_____ _________ / ___// __ \ / / + / /_/ / __ \/ ___/ __/ __ / ___/ _ \\__ \/ / / / / / / ____/ /_/ (__ ) /_/ /_/ / / / __/__/ / /_/ / / /___ /_/ \____/____/\__/\__, /_/v4 \___/____/\___\_\/_____/ - /____/ + /____/ ${CL}" } function msg_info() { @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/prometheus-v3.sh b/ct/prometheus-v3.sh index a41f5125..54f9af8c 100644 --- a/ct/prometheus-v3.sh +++ b/ct/prometheus-v3.sh @@ -12,11 +12,11 @@ NSAPP=$(echo ${APP,,} | tr -d ' ') var_install="${NSAPP}-install" YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -59,12 +59,12 @@ done clear function header_info { echo -e "${RD} - _____ _____ ____ __ __ ______ _______ _ _ ______ _ _ _____ + _____ _____ ____ __ __ ______ _______ _ _ ______ _ _ _____ | __ \| __ \ / __ \| \/ | ____|__ __| | | | ____| | | |/ ____| - | |__) | |__) | | | | \ / | |__ | | | |__| | |__ | | | | (___ - | ___/| _ /| | | | |\/| | __| v3 | | | __ | __| | | | |\___ \ + | |__) | |__) | | | | \ / | |__ | | | |__| | |__ | | | | (___ + | ___/| _ /| | | | |\/| | __| v3 | | | __ | __| | | | |\___ \ | | | | \ \| |__| | | | | |____ | | | | | | |____| |__| |____) | - |_| |_| \_\\_____/|_| |_|______| |_| |_| |_|______|\____/|_____/ + |_| |_| \_\\_____/|_| |_|______| |_| |_| |_|______|\____/|_____/ ${CL}" } @@ -115,12 +115,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -130,7 +130,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -255,7 +255,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -279,7 +279,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -313,15 +313,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/prometheus-v4.sh b/ct/prometheus-v4.sh index db1ce80e..3e46a45e 100644 --- a/ct/prometheus-v4.sh +++ b/ct/prometheus-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,11 +44,11 @@ else fi function header_info { echo -e "${RD} - ____ __ __ + ____ __ __ / __ \_________ ____ ___ ___ / /_/ /_ ___ __ _______ / /_/ / ___/ __ \/ __ __ \/ _ \/ __/ __ \/ _ \/ / / / ___/ - / ____/ / / /_/ / / / / / / __/ /_/ / / / __/ /_/ (__ ) -/_/ v4/_/ \____/_/ /_/ /_/\___/\__/_/ /_/\___/\__,_/____/ + / ____/ / / /_/ / / / / / / __/ /_/ / / / __/ /_/ (__ ) +/_/ v4/_/ \____/_/ /_/ /_/\___/\__/_/ /_/\___/\__,_/____/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/syncthing-v4.sh b/ct/syncthing-v4.sh index 50ef405c..44bc0336 100644 --- a/ct/syncthing-v4.sh +++ b/ct/syncthing-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,13 +44,13 @@ else fi function header_info { cat << "EOF" - _____ __ __ _ + _____ __ __ _ / ___/__ ______v4_____/ /_/ /_ (_)___ ____ _ \__ \/ / / / __ \/ ___/ __/ __ \/ / __ \/ __ `/ - ___/ / /_/ / / / / /__/ /_/ / / / / / / / /_/ / -/____/\__, /_/ /_/\___/\__/_/ /_/_/_/ /_/\__, / - /____/ /____/ - + ___/ / /_/ / / / / /__/ /_/ / / / / / / / /_/ / +/____/\__, /_/ /_/\___/\__/_/ /_/_/_/ /_/\__, / + /____/ /____/ + EOF } function msg_info() { @@ -187,7 +187,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -211,7 +211,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/technitiumdns-v2.sh b/ct/technitiumdns-v2.sh index 2d960480..ed14e982 100644 --- a/ct/technitiumdns-v2.sh +++ b/ct/technitiumdns-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` APP="Technitium DNS" HN=$(echo ${APP,,} | tr -d ' ') while true; do @@ -19,10 +19,10 @@ clear function header_info { echo -e "${RD} - _______ _ _ _ _ - |__ __| | | (_) | (_) - | | ___ ___| |__ _ __ _| |_ _ _ _ _ __ ___ - | |/ _ \/ __| _ \| _ \| | __| | | | | _ _ \ + _______ _ _ _ _ + |__ __| | | (_) | (_) + | | ___ ___| |__ _ __ _| |_ _ _ _ _ __ ___ + | |/ _ \/ __| _ \| _ \| | __| | | | | _ _ \ | | __/ (__| | | | | | | | |_| | |_| | | | | | | |_|\___|\___|_| |_|_| |_|_|\__|_|\__,_|_| |_| |_| ${CL}" @@ -196,7 +196,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" @@ -254,6 +254,6 @@ lxc-cmd bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/m IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}') -echo -e "${GN}Successfully created ${APP} LXC to${CL} ${BL}$CTID${CL}. +echo -e "${GN}Successfully created ${APP} LXC to${CL} ${BL}$CTID${CL}. ${BL}${APP}${CL} should be reachable by going to the following URL. ${BL}http://${IP}:5380${CL} \n" diff --git a/ct/technitiumdns-v3.sh b/ct/technitiumdns-v3.sh index 201b6267..c9558a6a 100644 --- a/ct/technitiumdns-v3.sh +++ b/ct/technitiumdns-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,10 +43,10 @@ done clear function header_info { echo -e "${RD} - _______ _ _ _ _ - |__ __| | | (_) | (_) - | | ___v3___| |__ _ __ _| |_ _ _ _ _ __ ___ - | |/ _ \/ __| _ \| _ \| | __| | | | | _ _ \ + _______ _ _ _ _ + |__ __| | | (_) | (_) + | | ___v3___| |__ _ __ _| |_ _ _ _ _ __ ___ + | |/ _ \/ __| _ \| _ \| | __| | | | | _ _ \ | | __/ (__| | | | | | | | |_| | |_| | | | | | | |_|\___|\___|_| |_|_| |_|_|\__|_|\__,_|_| |_| |_| ${CL}" @@ -109,12 +109,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -124,7 +124,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -249,7 +249,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -273,7 +273,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -307,15 +307,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/technitiumdns-v4.sh b/ct/technitiumdns-v4.sh index 3c1fe3a9..b7b4b62b 100644 --- a/ct/technitiumdns-v4.sh +++ b/ct/technitiumdns-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,9 +46,9 @@ function header_info { echo -e "${RD} ______ __ _ __ _ ____ _ _______ /_ __/__ _____/ /_ ____ (_) /_(_)_ ______ ___ v4 / __ \/ | / / ___/ - / / / _ \/ ___/ __ \/ __ \/ / __/ / / / / __ __ \ / / / / |/ /\__ \ - / / / __/ /__/ / / / / / / / /_/ / /_/ / / / / / / / /_/ / /| /___/ / -/_/ \___/\___/_/ /_/_/ /_/_/\__/_/\__,_/_/ /_/ /_/ /_____/_/ |_//____/ + / / / _ \/ ___/ __ \/ __ \/ / __/ / / / / __ __ \ / / / / |/ /\__ \ + / / / __/ /__/ / / / / / / / /_/ / /_/ / / / / / / / /_/ / /| /___/ / +/_/ \___/\___/_/ /_/_/ /_/_/\__/_/\__,_/_/ /_/ /_/ /_____/_/ |_//____/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/trilium-v4.sh b/ct/trilium-v4.sh index bd121dd9..08cc3e12 100644 --- a/ct/trilium-v4.sh +++ b/ct/trilium-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,12 +44,12 @@ else fi function header_info { cat << "EOF" - ______ _ ___ - /_ __/_v4_(_) (_)_ ______ ___ + ______ _ ___ + /_ __/_v4_(_) (_)_ ______ ___ / / / ___/ / / / / / / __ `__ \ / / / / / / / / /_/ / / / / / / -/_/ /_/ /_/_/_/\__,_/_/ /_/ /_/ - +/_/ /_/ /_/_/_/\__,_/_/ /_/ /_/ + EOF } function msg_info() { @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/ubuntu-v2.sh b/ct/ubuntu-v2.sh index 4152e1d0..ec989d48 100644 --- a/ct/ubuntu-v2.sh +++ b/ct/ubuntu-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will create a New Ubuntu 21.10 LXC. Proceed(y/n)?" yn case $yn in @@ -16,13 +16,13 @@ done clear function header_info { echo -e "${YW} - _ _ _ _ - | | | | | | | - | | | | |__ _ _ _ __ | |_ _ _ + _ _ _ _ + | | | | | | | + | | | | |__ _ _ _ __ | |_ _ _ | | | | _ \| | | | _ \| __| | | | | |__| | |_) | |_| | | | | |_| |_| | \____/|_.__/ \__,_|_| |_|\__|\__,_| - + ${CL}" } @@ -194,7 +194,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/ubuntu-v3.sh b/ct/ubuntu-v3.sh index 5f5b38b1..fb1a48e0 100644 --- a/ct/ubuntu-v3.sh +++ b/ct/ubuntu-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,9 +43,9 @@ done clear function header_info { echo -e "${YW} - _ _ _ _ - | | | | | | | - | | | | |__ _ v3_ _ __ | |_ _ _ + _ _ _ _ + | | | | | | | + | | | | |__ _ v3_ _ __ | |_ _ _ | | | | _ \| | | | _ \| __| | | | | |__| | |_) | |_| | | | | |_| |_| | \____/|_.__/ \__,_|_| |_|\__|\__,_| @@ -121,12 +121,12 @@ header_info echo -e "${DGN}Using Version ${BGN}$VER${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -137,7 +137,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -270,7 +270,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -295,7 +295,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -330,15 +330,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/ubuntu-v4.sh b/ct/ubuntu-v4.sh index 40997d2b..eee17560 100644 --- a/ct/ubuntu-v4.sh +++ b/ct/ubuntu-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,11 +44,11 @@ else fi function header_info { echo -e "${YW} - __ ____ __ + __ ____ __ / / / / /_v4__ ______ / /___ __ / / / / __ \/ / / / __ \/ __/ / / / -/ /_/ / /_/ / /_/ / / / / /_/ /_/ / -\____/_.___/\__,_/_/ /_/\__/\__,_/ +/ /_/ / /_/ / /_/ / / / / /_/ /_/ / +\____/_.___/\__,_/_/ /_/\__/\__,_/ ${CL}" } function msg_info() { @@ -194,7 +194,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -218,7 +218,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/umbrel-v4.sh b/ct/umbrel-v4.sh index 1a7c38b1..613ea035 100644 --- a/ct/umbrel-v4.sh +++ b/ct/umbrel-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,10 +46,10 @@ function header_info { cat << "EOF" __ __ __ __ / / / /___ ___v4/ /_ ________ / / - / / / / __ `__ \/ __ \/ ___/ _ \/ / -/ /_/ / / / / / / /_/ / / / __/ / -\____/_/ /_/ /_/_.___/_/ \___/_/ - + / / / / __ `__ \/ __ \/ ___/ _ \/ / +/ /_/ / / / / / / /_/ / / / __/ / +\____/_/ /_/ /_/_.___/_/ \___/_/ + EOF } function msg_info() { @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/unifi-v2.sh b/ct/unifi-v2.sh index 077f3cc1..6165cbc4 100644 --- a/ct/unifi-v2.sh +++ b/ct/unifi-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` APP="UniFi" HN=$(echo ${APP,,} | tr -d ' ') while true; do @@ -18,9 +18,9 @@ done clear function header_info { echo -e "${BL} - _ _ _ ______ _ + _ _ _ ______ _ | | | | (_) ____(_) - | | | |_ __ _| |__ _ + | | | |_ __ _| |__ _ | | | | _ \| | __| | | | |__| | | | | | | | | \____/|_| |_|_|_| |_| @@ -195,7 +195,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" @@ -253,6 +253,6 @@ lxc-cmd bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/m IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}') -echo -e "${GN}Successfully created ${APP} LXC to${CL} ${BL}$CTID${CL}. +echo -e "${GN}Successfully created ${APP} LXC to${CL} ${BL}$CTID${CL}. ${BL}${APP}${CL} should be reachable by going to the following URL. ${BL}https://${IP}:8443${CL} \n" diff --git a/ct/unifi-v3.sh b/ct/unifi-v3.sh index 158758b1..60d17955 100644 --- a/ct/unifi-v3.sh +++ b/ct/unifi-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,9 +43,9 @@ done clear function header_info { echo -e "${BL} - _ _ _ ______ _ + _ _ _ ______ _ | | | | (_) ____(_) - | | | |_ __ _| |__ _ + | | | |_ __ _| |__ _ | | | | _ \| | __| | | | |__| | | | | | | | | \____/|_| |_|_|_| v3 |_| @@ -109,12 +109,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -124,7 +124,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -249,7 +249,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -273,7 +273,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -307,15 +307,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/unifi-v4.sh b/ct/unifi-v4.sh index cdbb1a9d..6e6be082 100644 --- a/ct/unifi-v4.sh +++ b/ct/unifi-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,11 +44,11 @@ else fi function header_info { echo -e "${BL} - __ __ _ _____ + __ __ _ _____ / / / /_v4 (_) __(_) - / / / / __ \/ / /_/ / -/ /_/ / / / / / __/ / -\____/_/ /_/_/_/ /_/ + / / / / __ \/ / /_/ / +/ /_/ / / / / / __/ / +\____/_/ /_/_/_/ /_/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/uptimekuma-v2.sh b/ct/uptimekuma-v2.sh index b40519ba..0348ad57 100644 --- a/ct/uptimekuma-v2.sh +++ b/ct/uptimekuma-v2.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` APP="Uptime Kuma" HN=$(echo ${APP,,} | tr -d ' ') while true; do @@ -19,14 +19,14 @@ done clear function header_info { echo -e "${DGN} - _ _ _ _ _ __ - | | | | | | (_) | |/ / - | | | |_ __ | |_ _ _ __ ___ ___ | ' /_ _ _ __ ___ __ _ + _ _ _ _ _ __ + | | | | | | (_) | |/ / + | | | |_ __ | |_ _ _ __ ___ ___ | ' /_ _ _ __ ___ __ _ | | | | _ \| __| | _ _ \ / _ \ | <| | | | _ _ \ / _ | | |__| | |_) | |_| | | | | | | __/ | . \ |_| | | | | | | (_| | \____/| .__/ \__|_|_| |_| |_|\___| |_|\_\__,_|_| |_| |_|\__,_| - | | - |_| + | | + |_| ${CL}" } @@ -198,7 +198,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" @@ -256,6 +256,6 @@ lxc-cmd bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/m IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}') -echo -e "${GN}Successfully created ${APP} LXC to${CL} ${BL}$CTID${CL}. +echo -e "${GN}Successfully created ${APP} LXC to${CL} ${BL}$CTID${CL}. ${BL}${APP}${CL} should be reachable by going to the following URL. ${BL}http://${IP}:3001${CL}\n" diff --git a/ct/uptimekuma-v3.sh b/ct/uptimekuma-v3.sh index d9cb376b..7c4c7108 100644 --- a/ct/uptimekuma-v3.sh +++ b/ct/uptimekuma-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,14 +43,14 @@ done clear function header_info { echo -e "${DGN} - _ _ _ _ _ __ - | | | | | | (_) | |/ / - | | | |_v3_ | |_ _ _ __ ___ ___ | ' /_ _ _ __ ___ __ _ + _ _ _ _ _ __ + | | | | | | (_) | |/ / + | | | |_v3_ | |_ _ _ __ ___ ___ | ' /_ _ _ __ ___ __ _ | | | | _ \| __| | _ _ \ / _ \ | <| | | | _ _ \ / _ | | |__| | |_) | |_| | | | | | | __/ | . \ |_| | | | | | | (_| | \____/| .__/ \__|_|_| |_| |_|\___| |_|\_\__,_|_| |_| |_|\__,_| - | | - |_| + | | + |_| ${CL}" } @@ -111,12 +111,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -126,7 +126,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -251,7 +251,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -275,7 +275,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -309,15 +309,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/uptimekuma-v4.sh b/ct/uptimekuma-v4.sh index fcd9fc30..35937c4e 100644 --- a/ct/uptimekuma-v4.sh +++ b/ct/uptimekuma-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,12 +44,12 @@ else fi function header_info { echo -e "${DGN} - __ __ __ _ __ __ + __ __ __ _ __ __ / / / /___ / /_(_)___ ___ ___ v4 / //_/_ ______ ___ ____ _ / / / / __ \/ __/ / __ __ \/ _ \ / ,< / / / / __ __ \/ __ / -/ /_/ / /_/ / /_/ / / / / / / __/ / /| / /_/ / / / / / / /_/ / -\____/ .___/\__/_/_/ /_/ /_/\___/ /_/ |_\__,_/_/ /_/ /_/\__,_/ - /_/ +/ /_/ / /_/ / /_/ / / / / / / __/ / /| / /_/ / / / / / / /_/ / +\____/ .___/\__/_/_/ /_/ /_/\___/ /_/ |_\__,_/_/ /_/ /_/\__,_/ + /_/ ${CL}" } function msg_info() { @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/vaultwarden-v1.sh b/ct/vaultwarden-v1.sh index 56b5ac3b..0075aaf0 100644 --- a/ct/vaultwarden-v1.sh +++ b/ct/vaultwarden-v1.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash CHECKMARK='\033[0;32m\xE2\x9C\x94\033[0m' -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will create a New Vaultwarden LXC Container. Proceed(y/n)?" yn case $yn in @@ -16,13 +16,13 @@ done clear function header_info { echo -e "${BL} - __ __ _ _ _ - \ \ / / | | | | | - \ \ / /_ _ _ _| | |___ ____ _ _ __ __| | ___ _ __ - \ \/ / _ | | | | | __\ \ /\ / / _ | __/ _ |/ _ \ _ \ + __ __ _ _ _ + \ \ / / | | | | | + \ \ / /_ _ _ _| | |___ ____ _ _ __ __| | ___ _ __ + \ \/ / _ | | | | | __\ \ /\ / / _ | __/ _ |/ _ \ _ \ \ / (_| | |_| | | |_ \ V V / (_| | | | (_| | __/ | | | \/ \__,_|\__,_|_|\__| \_/\_/ \__,_|_| \__,_|\___|_| |_| - + ${CL}" } diff --git a/ct/vaultwarden-v2.sh b/ct/vaultwarden-v2.sh index fe16570c..b923e643 100644 --- a/ct/vaultwarden-v2.sh +++ b/ct/vaultwarden-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` APP="Vaultwarden" HN=$(echo ${APP,,} | tr -d ' ') while true; do @@ -18,13 +18,13 @@ done clear function header_info { echo -e "${RD} - __ __ _ _ _ - \ \ / / | | | | | - \ \ / /_ _ _ _| | |___ ____ _ _ __ __| | ___ _ __ - \ \/ / _ | | | | | __\ \ /\ / / _ | __/ _ |/ _ \ _ \ + __ __ _ _ _ + \ \ / / | | | | | + \ \ / /_ _ _ _| | |___ ____ _ _ __ __| | ___ _ __ + \ \/ / _ | | | | | __\ \ /\ / / _ | __/ _ |/ _ \ _ \ \ / (_| | |_| | | |_ \ V V / (_| | | | (_| | __/ | | | \/ \__,_|\__,_|_|\__| \_/\_/ \__,_|_| \__,_|\___|_| |_| - + ${CL}" } @@ -196,7 +196,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/vaultwarden-v3.sh b/ct/vaultwarden-v3.sh index 735160ff..05a8f744 100644 --- a/ct/vaultwarden-v3.sh +++ b/ct/vaultwarden-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,10 +43,10 @@ done clear function header_info { echo -e "${RD} - __ __ _ _ _ - \ \ v3 / / | | | | | - \ \ / /_ _ _ _| | |___ ____ _ _ __ __| | ___ _ __ - \ \/ / _ | | | | | __\ \ /\ / / _ | __/ _ |/ _ \ _ \ + __ __ _ _ _ + \ \ v3 / / | | | | | + \ \ / /_ _ _ _| | |___ ____ _ _ __ __| | ___ _ __ + \ \/ / _ | | | | | __\ \ /\ / / _ | __/ _ |/ _ \ _ \ \ / (_| | |_| | | |_ \ V V / (_| | | | (_| | __/ | | | \/ \__,_|\__,_|_|\__| \_/\_/ \__,_|_| \__,_|\___|_| |_| ${CL}" @@ -109,12 +109,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -124,7 +124,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -249,7 +249,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -273,7 +273,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -307,15 +307,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/vaultwarden-v4.sh b/ct/vaultwarden-v4.sh index 8e08604e..bba24e22 100644 --- a/ct/vaultwarden-v4.sh +++ b/ct/vaultwarden-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,9 +46,9 @@ function header_info { echo -e "${CL} _ _____ __ ____ _______ _____ ____ ____ _______ __ | | / / | / / / / / /_ __/ | / / | / __ \/ __ \/ ____/ | / / -| | / / /| |/ / / / / / / | | /| / / /| | / /_/ / / / / __/ / |/ / -| |/ / ___ / /_/ / /___/ / | |/ |/ / ___ |/ _, _/ /_/ / /___/ /| / -|___/_/ |_\____/_____/_/ v4 |__/|__/_/ |_/_/ |_/_____/_____/_/ |_/ +| | / / /| |/ / / / / / / | | /| / / /| | / /_/ / / / / __/ / |/ / +| |/ / ___ / /_/ / /___/ / | |/ |/ / ___ |/ _, _/ /_/ / /___/ /| / +|___/_/ |_\____/_____/_/ v4 |__/|__/_/ |_/_/ |_/_____/_____/_/ |_/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/whoogle-v3.sh b/ct/whoogle-v3.sh index 59274f4e..67361351 100644 --- a/ct/whoogle-v3.sh +++ b/ct/whoogle-v3.sh @@ -13,11 +13,11 @@ var_install="${NSAPP}-install" PP=`echo "\e[1;35m"` YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -60,11 +60,11 @@ done clear function header_info { echo -e "${PP} - __ ___ _ ____ ____ _____ _ ______ + __ ___ _ ____ ____ _____ _ ______ \ \ v3 / / | | |/ __ \ / __ \ / ____| | | ____| - \ \ /\ / /| |__| | | | | | | | | __| | | |__ - \ \/ \/ / | __ | | | | | | | | |_ | | | __| - \ /\ / | | | | |__| | |__| | |__| | |____| |____ + \ \ /\ / /| |__| | | | | | | | | __| | | |__ + \ \/ \/ / | __ | | | | | | | | |_ | | | __| + \ /\ / | | | | |__| | |__| | |__| | |____| |____ \/ \/ |_| |_|\____/ \____/ \_____|______|______| ${CL}" } @@ -116,12 +116,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -131,7 +131,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -256,7 +256,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -280,7 +280,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -314,15 +314,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/whoogle-v4.sh b/ct/whoogle-v4.sh index 644b5a3f..e3a36475 100644 --- a/ct/whoogle-v4.sh +++ b/ct/whoogle-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,9 +46,9 @@ function header_info { echo -e "${GN} _ ____ ______ ____ ________ ______ | | v4 / / / / / __ \/ __ \/ ____/ / / ____/ -| | /| / / /_/ / / / / / / / / __/ / / __/ -| |/ |/ / __ / /_/ / /_/ / /_/ / /___/ /___ -|__/|__/_/ /_/\____/\____/\____/_____/_____/ +| | /| / / /_/ / / / / / / / / __/ / / __/ +| |/ |/ / __ / /_/ / /_/ / /_/ / /___/ /___ +|__/|__/_/ /_/\____/\____/\____/_____/_____/ ${CL}" } function msg_info() { @@ -185,7 +185,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -209,7 +209,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/wikijs-v4.sh b/ct/wikijs-v4.sh index 7f6965ee..9a4cee18 100644 --- a/ct/wikijs-v4.sh +++ b/ct/wikijs-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,12 +44,12 @@ else fi function header_info { echo -e "${BL} - _ ___ __ _ _ + _ ___ __ _ _ | | / (_) /__(_) (_)____ | | /| / / / //_/ / / / ___/ -| |/ |/ / / ,< / / / (__ ) -|__/|__/_/_/|_/_(_)_/ /____/ - /___/ v4 +| |/ |/ / / ,< / / / (__ ) +|__/|__/_/_/|_/_(_)_/ /____/ + /___/ v4 ${CL}" } function msg_info() { @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/wireguard-v2.sh b/ct/wireguard-v2.sh index 7137c4d3..fbcf8516 100644 --- a/ct/wireguard-v2.sh +++ b/ct/wireguard-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will create a New WireGuard LXC. Proceed(y/n)?" yn case $yn in @@ -16,7 +16,7 @@ done clear function header_info { echo -e "${RD} - __ ___ _____ _ + __ ___ _____ _ \ \ / (_) / ____| | | \ \ /\ / / _ _ __ ___| | __ _ _ __ _ _ __ __| | \ \/ \/ / | | __/ _ \ | |_ | | | |/ _ | __/ _ | @@ -194,7 +194,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/wireguard-v3.sh b/ct/wireguard-v3.sh index 284f665c..93444b0b 100644 --- a/ct/wireguard-v3.sh +++ b/ct/wireguard-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -43,7 +43,7 @@ done clear function header_info { echo -e "${RD} - __ ___ _____ _ + __ ___ _____ _ \ \ / (_) / ____| | | \ \ /\ / / _ _ __ ___| | __ _ _ __ _ _ __ __| | \ \/ \/ / | | __/ _ \ | |_ | | | |/ _ | __/ _ | @@ -110,12 +110,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -125,7 +125,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -250,7 +250,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -274,7 +274,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -308,15 +308,15 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/wireguard-v4.sh b/ct/wireguard-v4.sh index c594abc2..babeee29 100644 --- a/ct/wireguard-v4.sh +++ b/ct/wireguard-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,7 +44,7 @@ else fi function header_info { echo -e "${RD} - __ ___ _____ _ + __ ___ _____ _ \ \ / (_) / ____| | | \ \ /\ / / _ _ __ ___| | __ _ _ __ _ _ __ __| | \ \/ \/ / | | __/ _ \ | |_ | | | |/ _ | __/ _ | @@ -187,7 +187,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -211,7 +211,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/zigbee2mqtt-v2.sh b/ct/zigbee2mqtt-v2.sh index f4a0c0fd..67d6e61d 100644 --- a/ct/zigbee2mqtt-v2.sh +++ b/ct/zigbee2mqtt-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will create a New Zigbee2MQTT LXC. Proceed(y/n)?" yn case $yn in @@ -16,15 +16,15 @@ done clear function header_info { echo -e "${YW} - _______ _ ___ __ __ ____ _______ _______ + _______ _ ___ __ __ ____ _______ _______ |___ (_) | | |__ \| \/ |/ __ \__ __|__ __| - / / _ __ _| |__ ___ ___ ) | \ / | | | | | | | | - / / | |/ _ | _ \ / _ \/ _ \ / /| |\/| | | | | | | | | - / /__| | (_| | |_) | __/ __// /_| | | | |__| | | | | | - /_____|_|\__, |____/ \___|\___|____|_| |_|\___\_\ |_| |_| - __/ | - |___/ - + / / _ __ _| |__ ___ ___ ) | \ / | | | | | | | | + / / | |/ _ | _ \ / _ \/ _ \ / /| |\/| | | | | | | | | + / /__| | (_| | |_) | __/ __// /_| | | | |__| | | | | | + /_____|_|\__, |____/ \___|\___|____|_| |_|\___\_\ |_| |_| + __/ | + |___/ + ${CL}" } @@ -196,7 +196,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" @@ -229,7 +229,7 @@ fi LXC_CONFIG=/etc/pve/lxc/${CTID}.conf cat <> $LXC_CONFIG lxc.cgroup2.devices.allow: a -lxc.cap.drop: +lxc.cap.drop: lxc.cgroup2.devices.allow: c 188:* rwm lxc.cgroup2.devices.allow: c 189:* rwm lxc.mount.entry: /dev/serial/by-id dev/serial/by-id none bind,optional,create=dir diff --git a/ct/zigbee2mqtt-v3.sh b/ct/zigbee2mqtt-v3.sh index 46a61c82..c3bb5201 100644 --- a/ct/zigbee2mqtt-v3.sh +++ b/ct/zigbee2mqtt-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,14 +44,14 @@ done clear function header_info { echo -e "${YW} - _______ _ ___ __ __ ____ _______ _______ + _______ _ ___ __ __ ____ _______ _______ |___ (_) | | |__ \| \/ |/ __ \__ __|__ __| - / / _ __ _| |__ ___ ___ ) | \ / | | | | | | | | - / / | |/ _ | _ \ / _ \/ _ \ / /| |\/| | | | | | | | | - / /__| | (_| | |_) | __/ __// /_| | | | |__| | | | | | - /_____|_|\__, |____/ \___|\___|____|_| |_|\___\_\ |_| |_| - v3 __/ | - |___/ + / / _ __ _| |__ ___ ___ ) | \ / | | | | | | | | + / / | |/ _ | _ \ / _ \/ _ \ / /| |\/| | | | | | | | | + / /__| | (_| | |_) | __/ __// /_| | | | |__| | | | | | + /_____|_|\__, |____/ \___|\___|____|_| |_|\___\_\ |_| |_| + v3 __/ | + |___/ ${CL}" } @@ -112,12 +112,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type ${CROSS}${YW}Unprivileged, or Press [ENTER] for Default: Privileged" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Privileged" CT_TYPE="0"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Privileged" CT_TYPE="0"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -127,7 +127,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -252,7 +252,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -276,7 +276,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -310,16 +310,16 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } PVE_CHECK start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" @@ -347,7 +347,7 @@ bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/c LXC_CONFIG=/etc/pve/lxc/${CTID}.conf cat <> $LXC_CONFIG lxc.cgroup2.devices.allow: a -lxc.cap.drop: +lxc.cap.drop: lxc.cgroup2.devices.allow: c 188:* rwm lxc.cgroup2.devices.allow: c 189:* rwm lxc.mount.entry: /dev/serial/by-id dev/serial/by-id none bind,optional,create=dir diff --git a/ct/zigbee2mqtt-v4.sh b/ct/zigbee2mqtt-v4.sh index 703b7fde..5b9ac1b9 100644 --- a/ct/zigbee2mqtt-v4.sh +++ b/ct/zigbee2mqtt-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,9 +46,9 @@ function header_info { echo -e "${YW} _____ _ __ ___ __ _______ ____________ /__ / (_)___ _/ /_ ___ ___ |__ \ / |/ / __ \/_ __/_ __/ - / / / / __ / __ \/ _ \/ _ \__/ // /|_/ / / / / / / / / - / /__/ / /_/ / /_/ / __/ __/ __// / / / /_/ / / / / / -/____/_/\__, /_.___/\___/\___/____/_/ /_/\___\_\/_/ /_/ + / / / / __ / __ \/ _ \/ _ \__/ // /|_/ / / / / / / / / + / /__/ / /_/ / /_/ / __/ __/ __// / / / /_/ / / / / / +/____/_/\__, /_.___/\___/\___/____/_/ /_/\___\_\/_/ /_/ v4 /____/ 🐝 ${CL}" } @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" @@ -235,7 +235,7 @@ bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/c LXC_CONFIG=/etc/pve/lxc/${CTID}.conf cat <> $LXC_CONFIG lxc.cgroup2.devices.allow: a -lxc.cap.drop: +lxc.cap.drop: lxc.cgroup2.devices.allow: c 188:* rwm lxc.cgroup2.devices.allow: c 189:* rwm lxc.mount.entry: /dev/serial/by-id dev/serial/by-id none bind,optional,create=dir diff --git a/ct/zwave-js-ui-v4.sh b/ct/zwave-js-ui-v4.sh index 646773a0..7e1e410a 100644 --- a/ct/zwave-js-ui-v4.sh +++ b/ct/zwave-js-ui-v4.sh @@ -12,11 +12,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -46,10 +46,10 @@ function header_info { cat << "EOF" _____ _______ __ ______ /__ /_ ______ __v4 _____ / / ___/ / / / / _/ - / /| | /| / / __ `/ | / / _ \ __ / /\__ \ / / / // / - / /_| |/ |/ / /_/ /| |/ / __/ / /_/ /___/ / / /_/ // / -/____/__/|__/\__,_/ |___/\___/ \____//____/ \____/___/ - + / /| | /| / / __ `/ | / / _ \ __ / /\__ \ / / / // / + / /_| |/ |/ / /_/ /| |/ / __/ / /_/ /___/ / / /_/ // / +/____/__/|__/\__,_/ |___/\___/ \____//____/ \____/___/ + EOF } function msg_info() { @@ -186,7 +186,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}" @@ -210,7 +210,7 @@ fi } clear start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/zwavejs2mqtt-v1.sh b/ct/zwavejs2mqtt-v1.sh index fb21a900..2b2e8938 100644 --- a/ct/zwavejs2mqtt-v1.sh +++ b/ct/zwavejs2mqtt-v1.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will create a New Zwavejs2MQTT LXC Container. Proceed(y/n)?" yn @@ -17,23 +17,23 @@ done clear function header_info { echo -e "${RD} - ______ _ ___ __ __ ____ _______ _______ + ______ _ ___ __ __ ____ _______ _______ |___ / (_) |__ \| \/ |/ __ \__ __|__ __| - / /_ ____ ___ _____ _ ___ ) | \ / | | | | | | | | - / /\ \ /\ / / _ \ \ / / _ \ / __| / /| |\/| | | | | | | | | - / /__\ V V / (_| |\ V / __/ \__ \/ /_| | | | |__| | | | | | - /_____|\_/\_/ \__,_| \_/ \___| |___/____|_| |_|\___\_\ |_| |_| - _/ | - |__/ + / /_ ____ ___ _____ _ ___ ) | \ / | | | | | | | | + / /\ \ /\ / / _ \ \ / / _ \ / __| / /| |\/| | | | | | | | | + / /__\ V V / (_| |\ V / __/ \__ \/ /_| | | | |__| | | | | | + /_____|\_/\_/ \__,_| \_/ \___| |___/____|_| |_|\___\_\ |_| |_| + _/ | + |__/ ${CL}" } header_info -set -o errexit -set -o errtrace -set -o nounset -set -o pipefail +set -o errexit +set -o errtrace +set -o nounset +set -o pipefail shopt -s expand_aliases alias die='EXIT=$? LINE=$LINENO error_exit' CHECKMARK='\033[0;32m\xE2\x9C\x94\033[0m' diff --git a/ct/zwavejs2mqtt-v2.sh b/ct/zwavejs2mqtt-v2.sh index 72669df9..ca325c83 100644 --- a/ct/zwavejs2mqtt-v2.sh +++ b/ct/zwavejs2mqtt-v2.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` APP="Zwavejs2MQTT" HN=$(echo ${APP,,} | tr -d ' ') while true; do @@ -18,14 +18,14 @@ done clear function header_info { echo -e "${BL} - ______ _ ___ __ __ ____ _______ _______ + ______ _ ___ __ __ ____ _______ _______ |___ / (_) |__ \| \/ |/ __ \__ __|__ __| - / /_ ____ ___ _____ _ ___ ) | \ / | | | | | | | | - / /\ \ /\ / / _ \ \ / / _ \ / __| / /| |\/| | | | | | | | | - / /__\ V V / (_| |\ V / __/ \__ \/ /_| | | | |__| | | | | | - /_____|\_/\_/ \__,_| \_/ \___| |___/____|_| |_|\___\_\ |_| |_| - _/ | - |__/ + / /_ ____ ___ _____ _ ___ ) | \ / | | | | | | | | + / /\ \ /\ / / _ \ \ / / _ \ / __| / /| |\/| | | | | | | | | + / /__\ V V / (_| |\ V / __/ \__ \/ /_| | | | |__| | | | | | + /_____|\_/\_/ \__,_| \_/ \___| |___/____|_| |_|\___\_\ |_| |_| + _/ | + |__/ ${CL}" } @@ -197,7 +197,7 @@ function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } - if [ "$IM" == "1" ]; then + if [ "$IM" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/ct/zwavejs2mqtt-v3.sh b/ct/zwavejs2mqtt-v3.sh index 88b9c87c..6a098d21 100644 --- a/ct/zwavejs2mqtt-v3.sh +++ b/ct/zwavejs2mqtt-v3.sh @@ -4,11 +4,11 @@ NEXTID=$(pvesh get /cluster/nextid) INTEGER='^[0-9]+$' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -44,14 +44,14 @@ done clear function header_info { echo -e "${BL} - ______ _ ___ __ __ ____ _______ _______ + ______ _ ___ __ __ ____ _______ _______ |___ / (_) |__ \| \/ |/ __ \__ __|__ __| - / /_ ____ ___ _____ _ ___ ) | \ / | | | | | | | | - / /\ \ /\ / / _ \ \ / / _ \ / __| / /| |\/| | | | | | | | | - / /__\ V V / (_| |\ V / __/ \__ \/ /_| | | | |__| | | | | | - /_____|\_/\_/ \__,_| \_/ \___| |___/____|_| |_|\___\_\ |_| v3 |_| - _/ | - |__/ + / /_ ____ ___ _____ _ ___ ) | \ / | | | | | | | | + / /\ \ /\ / / _ \ \ / / _ \ / __| / /| |\/| | | | | | | | | + / /__\ V V / (_| |\ V / __/ \__ \/ /_| | | | |__| | | | | | + /_____|\_/\_/ \__,_| \_/ \___| |___/____|_| |_|\___\_\ |_| v3 |_| + _/ | + |__/ ${CL}" } header_info @@ -111,12 +111,12 @@ function advanced_settings() { echo -e "${RD}Using Advanced Settings${CL}" echo -e "${YW}Type ${CROSS}${YW}Unprivileged, or Press [ENTER] for Default: Privileged" read CT_TYPE1 - if [ -z $CT_TYPE1 ]; then CT_TYPE1="Privileged" CT_TYPE="0"; + if [ -z $CT_TYPE1 ]; then CT_TYPE1="Privileged" CT_TYPE="0"; echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}" else CT_TYPE1="Privileged" CT_TYPE="0" - echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" + echo -en "${DGN}Set CT Type ${BL}Privileged${CL}" fi; echo -e " ${CM}${CL} \r" sleep 1 @@ -126,7 +126,7 @@ header_info echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login " read PW1 - if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; + if [ -z $PW1 ]; then PW1="Automatic Login" PW=" "; echo -en "${DGN}Set CT ${BL}$PW1${CL}" else PW="-password $PW1" @@ -251,7 +251,7 @@ header_info echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP (mandatory if static IP is used), or Press [ENTER] for Default: NONE " read GATE1 - if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; + if [ -z $GATE1 ]; then GATE1="NONE" GATE=""; echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}" else GATE=",gw=$GATE1" @@ -275,7 +275,7 @@ header_info echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 - if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; + if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=""; echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" else VLAN=",tag=$VLAN1" @@ -309,16 +309,16 @@ fi function start_script() { echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings " read SETTINGS - if [ -z $SETTINGS ]; then default_settings; + if [ -z $SETTINGS ]; then default_settings; else - advanced_settings + advanced_settings fi; } PVE_CHECK start_script -if [ "$CT_TYPE" == "1" ]; then +if [ "$CT_TYPE" == "1" ]; then FEATURES="nesting=1,keyctl=1" else FEATURES="nesting=1" diff --git a/misc/code-server.sh b/misc/code-server.sh index 2fcade90..ace7ce70 100644 --- a/misc/code-server.sh +++ b/misc/code-server.sh @@ -2,11 +2,11 @@ IP=$(hostname -I | awk '{print $1}') YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -40,11 +40,11 @@ done clear function header_info { echo -e "${BL} - ______ __ _____ + ______ __ _____ / ____/___ ____/ /__ / ___/___ ______ _____ _____ / / / __ \/ __ / _ \ \__ \/ _ \/ ___/ | / / _ \/ ___/ -/ /___/ /_/ / /_/ / __/ ___/ / __/ / | |/ / __/ / -\____/\____/\__,_/\___/ /____/\___/_/ |___/\___/_/ +/ /___/ /_/ / /_/ / __/ ___/ / __/ / | |/ / __/ / +\____/\____/\__,_/\___/ /____/\___/_/ |___/\___/_/ ${CL}" } @@ -79,7 +79,7 @@ sudo systemctl enable --now code-server@$USER &>/dev/null cat < ~/.config/code-server/config.yaml bind-addr: 0.0.0.0:8680 auth: none -password: +password: cert: false EOF sudo systemctl restart code-server@$USER diff --git a/misc/crowdsec.sh b/misc/crowdsec.sh index c4cf3d2d..7c545ed0 100644 --- a/misc/crowdsec.sh +++ b/misc/crowdsec.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -39,11 +39,11 @@ done clear function header_info { echo -e "${BL} - _____ _ _____ - / ____| | |/ ____| - | | _ __ _____ ____| | (___ ___ ___ + _____ _ _____ + / ____| | |/ ____| + | | _ __ _____ ____| | (___ ___ ___ | | | __/ _ \ \ /\ / / _ |\___ \ / _ \/ __| - | |____| | | (_) \ V V / (_| |____) | __/ (__ + | |____| | | (_) \ V V / (_| |____) | __/ (__ \_____|_| \___/ \_/\_/ \__ _|_____/ \___|\___| ${CL}" } diff --git a/misc/dashy-update.sh b/misc/dashy-update.sh index 6e7151de..e6403fc5 100644 --- a/misc/dashy-update.sh +++ b/misc/dashy-update.sh @@ -3,10 +3,10 @@ set -e clear YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will Update Dashy LXC. Proceed(y/n)?" yn case $yn in @@ -18,14 +18,14 @@ done clear function header_info { echo -e "${RD} - _____ _ - | __ \ | | - | | | | __ _ ___| |__ _ _ + _____ _ + | __ \ | | + | | | | __ _ ___| |__ _ _ | | | |/ _ / __| _ \| | | | | |__| | (_| \__ \ | | | |_| | |_____/ \__,_|___/_| |_|\__, | UPDATE __/ | - |___/ + |___/ ${CL}" } diff --git a/misc/edge-kernel.sh b/misc/edge-kernel.sh index 69d58d40..3f60dbe4 100644 --- a/misc/edge-kernel.sh +++ b/misc/edge-kernel.sh @@ -35,7 +35,7 @@ show_menu(){ read opt } option_picked(){ - msgcolor=`echo "\033[01;31m"` + msgcolor=`echo "\033[1;31m"` normal=`echo "\033[00;00m"` message=${@:-"${normal}Error: No message passed"} printf "${msgcolor}${message}${normal}\n" diff --git a/misc/filebrowser.sh b/misc/filebrowser.sh index 6a11c514..4f3aaaec 100644 --- a/misc/filebrowser.sh +++ b/misc/filebrowser.sh @@ -2,11 +2,11 @@ IP=$(hostname -I | awk '{print $1}') YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -41,12 +41,12 @@ clear function header_info { echo -e "${DGN} - ______ _ _ ____ - | ____(_) | | _ \ - | |__ _| | ___| |_) |_ __ _____ _____ ___ _ __ + ______ _ _ ____ + | ____(_) | | _ \ + | |__ _| | ___| |_) |_ __ _____ _____ ___ _ __ | __| | | |/ _ \ _ <| __/ _ \ \ /\ / / __|/ _ \ __| - | | | | | __/ |_) | | | (_) \ V V /\__ \ __/ | - |_| |_|_|\___|____/|_| \___/ \_/\_/ |___/\___|_| + | | | | | __/ |_) | | | (_) \ V V /\__ \ __/ | + |_| |_|_|\___|____/|_| \___/ \_/\_/ |___/\___|_| ${CL}" } diff --git a/misc/heimdalldashboard-all-update.sh b/misc/heimdalldashboard-all-update.sh index 66539ed6..1a5845ad 100644 --- a/misc/heimdalldashboard-all-update.sh +++ b/misc/heimdalldashboard-all-update.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash set -e PP=`echo "\e[1;35m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will Update Heimdall Dashboard. Proceed(y/n)?" yn case $yn in @@ -17,7 +17,7 @@ done clear function header_info { echo -e "${PP} - _ _ _ _ _ _ _____ _ _ _ + _ _ _ _ _ _ _____ _ _ _ | | | | (_) | | | | | | __ \ | | | | | | | |__| | ___ _ _ __ ___ __| | __ _| | | | | | | __ _ ___| |__ | |__ ___ __ _ _ __ __| | | __ |/ _ \ | _ _ \ / _ |/ _ | | | | | | |/ _ / __| _ \| _ \ / _ \ / _ | __/ _ | @@ -61,7 +61,7 @@ VER=$(curl -s https://api.github.com/repos/linuxserver/Heimdall/releases/latest | awk '{print substr($2, 3, length($2)-4) }') if [ ! -d "/opt/Heimdall" ]; then - mv Heimdall-${VER} /opt/Heimdall + mv Heimdall-${VER} /opt/Heimdall else cp -R Heimdall-${VER}/* /opt/Heimdall fi @@ -116,4 +116,3 @@ sleep 2 echo -e "${CM}${CL} \r" echo -en "${GN} Finished! ${CL}\n" - diff --git a/misc/homepage-update.sh b/misc/homepage-update.sh index 7b8ac4c6..5d1a0f5f 100644 --- a/misc/homepage-update.sh +++ b/misc/homepage-update.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -38,12 +38,12 @@ done clear function header_info { cat << "EOF" - __ __ - / / / /___ ____ ___ ___ ____ ____ _____ ____ + __ __ + / / / /___ ____ ___ ___ ____ ____ _____ ____ / /_/ / __ \/ __ `__ \/ _ \/ __ \/ __ `/ __ `/ _ \ / __ / /_/ / / / / / / __/ /_/ / /_/ / /_/ / __/ -/_/ /_/\____/_/ /_/ /_/\___/ .___/\__,_/\__, /\___/ - /_/ UPDATE /____/ +/_/ /_/\____/_/ /_/ /_/\___/ .___/\__,_/\__, /\___/ + /_/ UPDATE /____/ EOF } @@ -63,8 +63,8 @@ msg_info "Updating ${APP}" if ! command -v pnpm >/dev/null 2>&1; then npm install -g pnpm &>/dev/null fi -cd /opt/homepage -systemctl stop homepage +cd /opt/homepage +systemctl stop homepage git pull --force &>/dev/null pnpm install &>/dev/null pnpm build &>/dev/null diff --git a/misc/kernel-clean.sh b/misc/kernel-clean.sh index 8a337672..768708dc 100644 --- a/misc/kernel-clean.sh +++ b/misc/kernel-clean.sh @@ -3,11 +3,11 @@ set -euo pipefail shopt -s inherit_errexit nullglob YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -27,10 +27,10 @@ clear function header_info { echo -e "${RD} - _ __ _ _____ _ - | |/ / | | / ____| | - | / ___ _ __ _ __ ___| | | | | | ___ __ _ _ __ - | < / _ \ __| _ \ / _ \ | | | | |/ _ \/ _ | _ \ + _ __ _ _____ _ + | |/ / | | / ____| | + | / ___ _ __ _ __ ___| | | | | | ___ __ _ _ __ + | < / _ \ __| _ \ / _ \ | | | | |/ _ \/ _ | _ \ | \ __/ | | | | | __/ | | |____| | __/ (_| | | | | |_|\_\___|_| |_| |_|\___|_| \_____|_|\___|\__,_|_| |_| @@ -49,7 +49,7 @@ function msg_ok() { function check_root() { if [[ $EUID -ne 0 ]]; then - echo -e "${CROSS}${RD}Error: This script must be ran as the root user.\n${CL}" + echo -e "${CROSS}${RD}Error: This script must be ran as the root user.\n${CL}" exit 1 else header_info @@ -69,7 +69,7 @@ function edge_kernel() { function kernel_info() { if [[ "$MODE" != "PBS" ]]; then - echo -e "${YW}PVE Version: ${BL}$(pveversion)\n${CL}" + echo -e "${YW}PVE Version: ${BL}$(pveversion)\n${CL}" fi if [[ "$current_kernel" == *"pve"* ]]; then echo -e "${YW}Current Kernel: ${BL}$current_kernel\n${CL}" diff --git a/misc/latest-update-menu.sh b/misc/latest-update-menu.sh index 2d23b5f7..9f5460f7 100644 --- a/misc/latest-update-menu.sh +++ b/misc/latest-update-menu.sh @@ -19,7 +19,7 @@ apt-get update &>/dev/null echo -e "\e[1;92m Installing pip3... \e[0m" apt-get install -y python3-pip &>/dev/null echo -e "\e[1;92m Installing runlike... \e[0m" -pip3 install runlike &>/dev/null +pip3 install runlike &>/dev/null fi echo -e "\e[1;92m Creating Update Script... \e[0m" if [ -d /root/hass_config ]; then @@ -57,7 +57,7 @@ show_menu(){ read opt } option_picked(){ - msgcolor=`echo "\033[01;31m"` + msgcolor=`echo "\033[1;31m"` normal=`echo "\033[00;00m"` message=${@:-"${normal}Error: No message passed"} printf "${msgcolor}${message}${normal}\n" @@ -202,7 +202,7 @@ for container in ${CONTAINER_LIST}; do DOCKER_COMMAND="$(runlike "${container}")" docker rm --force "${container}" eval ${DOCKER_COMMAND} - fi + fi done EOF sudo chmod +x /root/update-containers.sh diff --git a/misc/navidrome-update.sh b/misc/navidrome-update.sh index c3ecded7..b6bf91c7 100644 --- a/misc/navidrome-update.sh +++ b/misc/navidrome-update.sh @@ -3,20 +3,20 @@ RELEASE=$(curl -s https://api.github.com/repos/navidrome/navidrome/releases/late | grep "tag_name" \ | awk '{print substr($2, 3, length($2)-4) }') -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` function update_info { cat << "EOF" - _ __ _ __ - / | / /___ __ __(_)___/ /________ ____ ___ ___ + _ __ _ __ + / | / /___ __ __(_)___/ /________ ____ ___ ___ / |/ / __ / | / / / __ / ___/ __ \/ __ __ \/ _ \ / /| / /_/ /| |/ / / /_/ / / / /_/ / / / / / / __/ -/_/ |_/\__,_/ |___/_/\__,_/_/ \____/_/ /_/ /_/\___/ +/_/ |_/\__,_/ |___/_/\__,_/_/ \____/_/ /_/ /_/\___/ UPDATE - + EOF } update_info diff --git a/misc/nocodb-update.sh b/misc/nocodb-update.sh index 9a4e0399..3e9c2ac7 100644 --- a/misc/nocodb-update.sh +++ b/misc/nocodb-update.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -38,12 +38,12 @@ done clear function header_info { echo -e "${YW} - _ _ _____ ____ - | \ | | | __ \| _ \ + _ _ _____ ____ + | \ | | | __ \| _ \ | \| | ___ v3___ ___ | | | | |_) | - | |/ _ \ / __/ _ \| | | | _ < + | |/ _ \ / __/ _ \| | | | _ < | |\ | (_) | (_| (_) | |__| | |_) | - |_| \_|\___/ \___\___/|_____/|____/ + |_| \_|\___/ \___\___/|_____/|____/ UPDATE ${CL}" } @@ -75,11 +75,11 @@ else reboot=no fi -if [ "$reboot" == "yes" ]; then +if [ "$reboot" == "yes" ]; then msg_info "Rebooting ${APP} LXC" reboot fi -if [ "$reboot" == "no" ]; then +if [ "$reboot" == "no" ]; then msg_ok "Finished Updating ${APP}. Reboot to apply the update." fi diff --git a/misc/node-red-themes.sh b/misc/node-red-themes.sh index 5f8738b1..6c4ab8ec 100644 --- a/misc/node-red-themes.sh +++ b/misc/node-red-themes.sh @@ -3,11 +3,11 @@ set -o errexit show_menu(){ YW=`echo "\033[33m"` - RD=`echo "\033[01;31m"` + RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` - CL=`echo "\033[m"` + CL=`echo "\033[0m"` echo -e "${RD} Backup your Node-Red flows before running this script!!${CL} \n " while true; do read -p "This will Install Node-Red Themes. Proceed(y/n)?" yn @@ -33,7 +33,7 @@ echo -e "${RD} Backup your Node-Red flows before installing any theme!!${CL} \n } option_picked(){ - msgcolor=`echo "\033[01;31m"` + msgcolor=`echo "\033[1;31m"` normal=`echo "\033[00;00m"` message=${@:-"${CL}Error: No message passed"} printf "${RD}${message}${CL}\n" diff --git a/misc/npm_update.sh b/misc/npm_update.sh index 4289e892..535a83a9 100644 --- a/misc/npm_update.sh +++ b/misc/npm_update.sh @@ -3,21 +3,21 @@ RELEASE=$(curl -s https://api.github.com/repos/NginxProxyManager/nginx-proxy-man | grep "tag_name" \ | awk '{print substr($2, 3, length($2)-4) }') \ -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` function update_info { echo -e "${RD} - _ _ _____ __ __ + _ _ _____ __ __ | \ | | | __ \ | \/ | | \| | | |__) | | \ / | | | | ___/ | |\/| | | |\ | | | | | | | |_| \_| |_| |_| |_| - UPDATE v${RELEASE} + UPDATE v${RELEASE} ${CL}" } @@ -33,10 +33,10 @@ while true; do done clear update_info -set -o errexit -set -o errtrace -set -o nounset -set -o pipefail +set -o errexit +set -o errtrace +set -o nounset +set -o pipefail shopt -s expand_aliases alias die='EXIT=$? LINE=$LINENO error_exit' trap die ERR @@ -63,8 +63,8 @@ echo -e "${CM}${CL} \r" echo -en "${GN} Stopping Services... " systemctl stop openresty systemctl stop npm -echo -e "${CM}${CL} \r" - +echo -e "${CM}${CL} \r" + echo -en "${GN} Cleaning Old Files... " rm -rf /app \ /var/www/html \ @@ -173,5 +173,5 @@ TS="$(($(date +%M)-T))" IP=$(hostname -I | cut -f1 -d ' ') echo -e "${GN}Successfully Updated Nginx Proxy Manager to ${RD}${RELEASE}${CL} and it took ${RD}${TS} minutes.${CL} NPM should be reachable at ${BL}http://${IP}:81 ${CL} - + " diff --git a/misc/paperless-ngx-update.sh b/misc/paperless-ngx-update.sh index fc737ee0..d8382c21 100644 --- a/misc/paperless-ngx-update.sh +++ b/misc/paperless-ngx-update.sh @@ -2,10 +2,10 @@ clear RELEASE=$(curl -s https://api.github.com/repos/paperless-ngx/paperless-ngx/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -31,12 +31,12 @@ function msg_error() { } cat << "EOF" - ____ __ + ____ __ / __ \____ _____ ___ _____/ /__ __________ ____ ____ __ __ / /_/ / __ `/ __ \/ _ \/ ___/ / _ \/ ___/ ___/___/ __ \/ __ `/ |/_/ - / ____/ /_/ / /_/ / __/ / / / __(__ |__ )___/ / / / /_/ /> < -/_/ \__,_/ .___/\___/_/ /_/\___/____/____/ /_/ /_/\__, /_/|_| - /_/ UPDATE /____/ + / ____/ /_/ / /_/ / __/ / / / __(__ |__ )___/ / / / /_/ /> < +/_/ \__,_/ .___/\___/_/ /_/\___/____/____/ /_/ /_/\__, /_/|_| + /_/ UPDATE /____/ EOF while true; do diff --git a/misc/photoprism-update.sh b/misc/photoprism-update.sh index 7ab7f8f6..e3db4005 100644 --- a/misc/photoprism-update.sh +++ b/misc/photoprism-update.sh @@ -6,10 +6,10 @@ RELEASE=$(curl -s https://api.github.com/repos/photoprism/photoprism/releases/la YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` PP=`echo "\e[1;35m"` while true; do @@ -23,10 +23,10 @@ done clear function header_info { echo -e "${PP} - _____ _ _ _____ _ - | __ \| | | | | __ \ (_) - | |__) | |__ ___ | |_ ___ | |__) | __ _ ___ _ __ ___ - | ___/| _ \ / _ \| __/ _ \| ___/ __| / __| _ _ \ + _____ _ _ _____ _ + | __ \| | | | | __ \ (_) + | |__) | |__ ___ | |_ ___ | |__) | __ _ ___ _ __ ___ + | ___/| _ \ / _ \| __/ _ \| ___/ __| / __| _ _ \ | | | | | | (_) | || (_) | | | | | \__ \ | | | | | |_| |_| |_|\___/ \__\___/|_| |_| |_|___/_| |_| |_| ${RD} UPDATE @@ -100,5 +100,3 @@ sudo systemctl start photoprism echo -e "${CM}${CL} \n" echo -e "${GN} Finished ${CL} \n " - - diff --git a/misc/post-pbs-install.sh b/misc/post-pbs-install.sh index c73c1cfb..ac3b4cac 100644 --- a/misc/post-pbs-install.sh +++ b/misc/post-pbs-install.sh @@ -3,11 +3,11 @@ set -euo pipefail shopt -s inherit_errexit nullglob YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -32,10 +32,10 @@ function header_info { cat << "EOF" ____ ____ _____ ____ __ ____ __ ____ / __ \/ __ ) ___/ / __ \____ _____/ /_ / _/___ _____/ /_____ _/ / / - / /_/ / __ \__ \ / /_/ / __ \/ ___/ __/ / // __ \/ ___/ __/ __ `/ / / - / ____/ /_/ /__/ / / ____/ /_/ (__ ) /_ _/ // / / (__ ) /_/ /_/ / / / -/_/ /_____/____/ /_/ \____/____/\__/ /___/_/ /_/____/\__/\__,_/_/_/ - + / /_/ / __ \__ \ / /_/ / __ \/ ___/ __/ / // __ \/ ___/ __/ __ `/ / / + / ____/ /_/ /__/ / / ____/ /_/ (__ ) /_ _/ // / / (__ ) /_/ /_/ / / / +/_/ /_____/____/ /_/ \____/____/\__/ /___/_/ /_/____/\__/\__,_/_/_/ + EOF } diff --git a/misc/post-pve-install.sh b/misc/post-pve-install.sh index efd4945d..58d25f0c 100644 --- a/misc/post-pve-install.sh +++ b/misc/post-pve-install.sh @@ -3,11 +3,11 @@ set -euo pipefail shopt -s inherit_errexit nullglob YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -39,9 +39,9 @@ function header_info { echo -e "${RD} ____ _ _____________ ____ __ ____ __ ____ / __ \ | / / ____/__ / / __ \____ _____/ /_ / _/___ _____/ /_____ _/ / / - / /_/ / | / / __/ / / / /_/ / __ \/ ___/ __/ / // __ \/ ___/ __/ __ / / / - / ____/| |/ / /___ / / / ____/ /_/ (__ ) /_ _/ // / / (__ ) /_/ /_/ / / / -/_/ |___/_____/ /_/ /_/ \____/____/\__/ /___/_/ /_/____/\__/\__,_/_/_/ + / /_/ / | / / __/ / / / /_/ / __ \/ ___/ __/ / // __ \/ ___/ __/ __ / / / + / ____/| |/ / /___ / / / ____/ /_/ (__ ) /_ _/ // / / (__ ) /_/ /_/ / / / +/_/ |___/_____/ /_/ /_/ \____/____/\__/ /___/_/ /_/____/\__/\__,_/_/_/ ${CL}" } diff --git a/misc/scaling-governor.sh b/misc/scaling-governor.sh index 8eace5bd..48e16014 100644 --- a/misc/scaling-governor.sh +++ b/misc/scaling-governor.sh @@ -12,17 +12,17 @@ done clear function header_info { echo -e " - _____ _____ _ _ + _____ _____ _ _ / ____| __ \| | | | | | | |__) | | | | | | | ___/| | | | | |____| | | |__| | - \_____|_| \____/ + \_____|_| \____/ Scaling Governors " } show_menu(){ - CL=`echo "\033[m"` + CL=`echo "\033[0m"` GN=`echo "\033[32m"` BL=`echo "\033[36m"` YW=`echo "\033[33m"` @@ -41,7 +41,7 @@ header_info echo -e "\n${YW}Available CPU Scaling Governors ${BL}${ACSG}${CL}" - + echo -e "\n${YW}Current CPU Scaling Governor ${BL}${CCSG}${CL}" printf "\n ${fgred}Only Select Available CPU Scaling Governors From Above${CL}\n \n" diff --git a/misc/trilium-update.sh b/misc/trilium-update.sh index eb9a1d88..f78d098e 100644 --- a/misc/trilium-update.sh +++ b/misc/trilium-update.sh @@ -3,20 +3,20 @@ RELEASE=$(curl -s https://api.github.com/repos/zadam/trilium/releases/latest \ | grep "tag_name" \ | awk '{print substr($2, 3, length($2)-4) }') -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` function update_info { cat << "EOF" - ______ _ ___ - /_ __/____(_) (_)_ ______ ___ + ______ _ ___ + /_ __/____(_) (_)_ ______ ___ / / / ___/ / / / / / / __ `__ \ / / / / / / / / /_/ / / / / / / -/_/ /_/ /_/_/_/\__,_/_/ /_/ /_/ +/_/ /_/ /_/_/_/\__,_/_/ /_/ /_/ UPDATE - + EOF } update_info diff --git a/misc/unifi-update.sh b/misc/unifi-update.sh index a7a19aae..6f4fa6b8 100644 --- a/misc/unifi-update.sh +++ b/misc/unifi-update.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` APP="UniFi Update" while true; do read -p "This will run ${APP}. Proceed(y/n)?" yn @@ -17,9 +17,9 @@ done clear function header_info { echo -e "${RD} - _ _ _ ______ _ + _ _ _ ______ _ | | | | (_) ____(_) - | | | |_ __ _| |__ _ + | | | |_ __ _| |__ _ | | | | _ \| | __| | | | |__| | | | | | | | | \____/|_| |_|_|_| |_| @@ -30,4 +30,3 @@ ${CL}" header_info sleep 3 wget -qL https://get.glennr.nl/unifi/update/unifi-update.sh && bash unifi-update.sh - diff --git a/misc/update-lxcs.sh b/misc/update-lxcs.sh index 369631f4..01aeadd3 100644 --- a/misc/update-lxcs.sh +++ b/misc/update-lxcs.sh @@ -2,10 +2,10 @@ set -e YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This Will Update All LXC Containers. Proceed(y/n)?" yn case $yn in @@ -17,11 +17,11 @@ done clear function header_info { echo -e "${BL} - _ _ _____ _____ _______ ______ + _ _ _____ _____ _______ ______ | | | | __ \| __ \ /\|__ __| ____| - | | | | |__) | | | | / \ | | | |__ - | | | | ___/| | | |/ /\ \ | | | __| - | |__| | | | |__| / ____ \| | | |____ + | | | | |__) | | | | / \ | | | |__ + | | | | ___/| | | |/ /\ \ | | | __| + | |__| | | | |__| / ____ \| | | |____ \____/|_| |_____/_/ \_\_| |______| ${CL}" @@ -49,7 +49,7 @@ fi for container in $containers do status=`pct status $container` - if [ "$skip" == "no" ]; then + if [ "$skip" == "no" ]; then if [ "$status" == "status: stopped" ]; then echo -e "${BL}[Info]${GN} Starting${BL} $container ${CL} \n" pct start $container @@ -61,12 +61,12 @@ do elif [ "$status" == "status: running" ]; then update_container $container fi - fi + fi if [ "$skip" == "yes" ]; then if [ "$status" == "status: running" ]; then update_container $container fi - fi + fi done; wait echo -e "${GN} Finished, All Containers Updated. ${CL} \n" diff --git a/misc/uptimekuma-update.sh b/misc/uptimekuma-update.sh index bee3f2de..d6df2aea 100644 --- a/misc/uptimekuma-update.sh +++ b/misc/uptimekuma-update.sh @@ -2,11 +2,11 @@ LATEST=$(curl -sL https://api.github.com/repos/louislam/uptime-kuma/releases/latest | grep '"tag_name":' | cut -d'"' -f4) YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -22,14 +22,14 @@ done clear function header_info { echo -e "${DGN} - _ _ _ _ _ __ - | | | | | | (_) | |/ / - | | | |_v3_ | |_ _ _ __ ___ ___ | ' /_ _ _ __ ___ __ _ + _ _ _ _ _ __ + | | | | | | (_) | |/ / + | | | |_v3_ | |_ _ _ __ ___ ___ | ' /_ _ _ __ ___ __ _ | | | | _ \| __| | _ _ \ / _ \ | <| | | | _ _ \ / _ | | |__| | |_) | |_| | | | | | | __/ | . \ |_| | | | | | | (_| | \____/| .__/ \__|_|_| |_| |_|\___| |_|\_\__,_|_| |_| |_|\__,_| - | | - |_| UPDATE + | | + |_| UPDATE ${CL}" } diff --git a/misc/vaultwarden-update.sh b/misc/vaultwarden-update.sh index 91159e1b..f8bd2349 100644 --- a/misc/vaultwarden-update.sh +++ b/misc/vaultwarden-update.sh @@ -3,20 +3,20 @@ VAULT=$(curl -s https://api.github.com/repos/dani-garcia/vaultwarden/releases/la | grep "tag_name" \ | awk '{print substr($2, 2, length($2)-3) }') -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` function update_info { echo -e "${BL} - __ __ _ _ _ - \ \ / / | | | | | - \ \ / /_ _ _ _| | |___ ____ _ _ __ __| | ___ _ __ - \ \/ / _ | | | | | __\ \ /\ / / _ | __/ _ |/ _ \ _ \ + __ __ _ _ _ + \ \ / / | | | | | + \ \ / /_ _ _ _| | |___ ____ _ _ __ __| | ___ _ __ + \ \/ / _ | | | | | __\ \ /\ / / _ | __/ _ |/ _ \ _ \ \ / (_| | |_| | | |_ \ V V / (_| | | | (_| | __/ | | | \/ \__,_|\__,_|_|\__| \_/\_/ \__,_|_| \__,_|\___|_| |_| - ${VAULT} UPDATE + ${VAULT} UPDATE ${CL}" } diff --git a/misc/web-vault-update.sh b/misc/web-vault-update.sh index a6b5eaf8..5f6f52b1 100644 --- a/misc/web-vault-update.sh +++ b/misc/web-vault-update.sh @@ -3,20 +3,20 @@ VWRELEASE=$(curl -s https://api.github.com/repos/dani-garcia/bw_web_builds/relea | grep "tag_name" \ | awk '{print substr($2, 2, length($2)-3) }') -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` function update_info { echo -e "${BL} - __ __ _ _ _ - \ \ / / | | | | | - \ \ /\ / /__| |__ ________ ____ _ _ _| | |_ + __ __ _ _ _ + \ \ / / | | | | | + \ \ /\ / /__| |__ ________ ____ _ _ _| | |_ \ \/ \/ / _ \ _ \______\ \ / / _ | | | | | __| - \ /\ / __/ |_) | \ V / (_| | |_| | | |_ + \ /\ / __/ |_) | \ V / (_| | |_| | | |_ \/ \/ \___|_.__/ \_/ \__,_|\__,_|_|\__| - ${VWRELEASE} UPDATE + ${VWRELEASE} UPDATE ${CL}" } update_info @@ -37,7 +37,7 @@ echo -e "${GN} Updating to ${VWRELEASE}... ${CL}" curl -fsSLO https://github.com/dani-garcia/bw_web_builds/releases/download/$VWRELEASE/bw_web_$VWRELEASE.tar.gz &>/dev/null if [ -d "/var/lib/vaultwarden" ]; then tar -xzf bw_web_$VWRELEASE.tar.gz -C /var/lib/vaultwarden/ &>/dev/null -else +else tar -zxf bw_web_$VWRELEASE.tar.gz -C /opt/vaultwarden/ &>/dev/null fi diff --git a/misc/webmin.sh b/misc/webmin.sh index d5dca0de..333f6be9 100644 --- a/misc/webmin.sh +++ b/misc/webmin.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` while true; do read -p "This will Install Webmin, Proceed(y/n)?" yn case $yn in diff --git a/misc/zwave-js-ui-update.sh b/misc/zwave-js-ui-update.sh index 1d669dcf..30673874 100644 --- a/misc/zwave-js-ui-update.sh +++ b/misc/zwave-js-ui-update.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash -RELEASE=$(curl -s https://api.github.com/repos/zwave-js/zwave-js-ui/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') +RELEASE=$(curl -s https://api.github.com/repos/zwave-js/zwave-js-ui/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') set -e YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` CM="${GN}✓${CL}" CROSS="${RD}✗${CL}" BFR="\\r\\033[K" @@ -28,11 +28,11 @@ clear cat << "EOF" _____ _______ __ ______ /__ /_ ______ __ _____ / / ___/ / / / / _/ - / /| | /| / / __ `/ | / / _ \ __ / /\__ \ / / / // / - / /_| |/ |/ / /_/ /| |/ / __/ / /_/ /___/ / / /_/ // / -/____/__/|__/\__,_/ |___/\___/ \____//____/ \____/___/ + / /| | /| / / __ `/ | / / _ \ __ / /\__ \ / / / // / + / /_| |/ |/ / /_/ /| |/ / __/ / /_/ /___/ / / /_/ // / +/____/__/|__/\__,_/ |___/\___/ \____//____/ \____/___/ UPDATE - + EOF while true; do diff --git a/setup/adguard-install.sh b/setup/adguard-install.sh index 080e2cff..8d77392a 100644 --- a/setup/adguard-install.sh +++ b/setup/adguard-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -94,7 +94,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/blocky-install.sh b/setup/blocky-install.sh index f632bc54..b9efb1f0 100644 --- a/setup/blocky-install.sh +++ b/setup/blocky-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -51,7 +51,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -313,7 +313,7 @@ hostsFile: #logPrivacy: false # optional: add EDE error codes to dns response -#ede: +#ede: # enabled if true, Default: false #enable: true EOF @@ -350,7 +350,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/casaos-install.sh b/setup/casaos-install.sh index 8ee90a70..dfc9e791 100644 --- a/setup/casaos-install.sh +++ b/setup/casaos-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -103,7 +103,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/daemonsync-install.sh b/setup/daemonsync-install.sh index e3bd458d..31a4ce2f 100644 --- a/setup/daemonsync-install.sh +++ b/setup/daemonsync-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -96,7 +96,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/dashy-install.sh b/setup/dashy-install.sh index 7485178e..09184cbb 100644 --- a/setup/dashy-install.sh +++ b/setup/dashy-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -81,7 +81,7 @@ msg_ok "Set up Node.js Repository" msg_info "Installing Node.js" sudo apt-get install -y nodejs git make g++ gcc &>/dev/null msg_ok "Installed Node.js" - + msg_info "Installing Yarn" npm install --global yarn &>/dev/null msg_ok "Installed Yarn" @@ -127,7 +127,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/debian-install.sh b/setup/debian-install.sh index bc9f39cb..2c0162bf 100644 --- a/setup/debian-install.sh +++ b/setup/debian-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -51,7 +51,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -88,7 +88,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/deconz-install.sh b/setup/deconz-install.sh index bc6f0c0c..fd2f5ae1 100644 --- a/setup/deconz-install.sh +++ b/setup/deconz-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -120,7 +120,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/docker-install.sh b/setup/docker-install.sh index c4234aed..1cb029c1 100644 --- a/setup/docker-install.sh +++ b/setup/docker-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -126,7 +126,7 @@ if [[ $DOCKER_COMPOSE == "Y" ]]; then msg_info "Installing Docker Compose $DOCKER_COMPOSE_LATEST_VERSION" DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker} mkdir -p $DOCKER_CONFIG/cli-plugins - curl -sSL https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_LATEST_VERSION/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose + curl -sSL https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_LATEST_VERSION/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose msg_ok "Installed Docker Compose $DOCKER_COMPOSE_LATEST_VERSION" fi @@ -148,7 +148,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/emby-install.sh b/setup/emby-install.sh index 28c762ab..75333495 100644 --- a/setup/emby-install.sh +++ b/setup/emby-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -73,16 +73,16 @@ apt-get install -y curl &>/dev/null apt-get install -y sudo &>/dev/null msg_ok "Installed Dependencies" -msg_info "Setting Up Hardware Acceleration" +msg_info "Setting Up Hardware Acceleration" apt-get -y install \ va-driver-all \ ocl-icd-libopencl1 \ beignet-opencl-icd &>/dev/null - + /bin/chgrp video /dev/dri /bin/chmod 755 /dev/dri /bin/chmod 660 /dev/dri/* -msg_ok "Set Up Hardware Acceleration" +msg_ok "Set Up Hardware Acceleration" LATEST=$(curl -sL https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest | grep '"tag_name":' | cut -d'"' -f4) @@ -107,7 +107,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/emqx-install.sh b/setup/emqx-install.sh index dc3e224b..5d0d86ff 100644 --- a/setup/emqx-install.sh +++ b/setup/emqx-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -51,7 +51,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -94,7 +94,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/esphome-install.sh b/setup/esphome-install.sh index 8d0aab4e..aa03b37f 100644 --- a/setup/esphome-install.sh +++ b/setup/esphome-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done diff --git a/setup/esphome_setup.sh b/setup/esphome_setup.sh index 001730f0..6201650b 100644 --- a/setup/esphome_setup.sh +++ b/setup/esphome_setup.sh @@ -9,10 +9,10 @@ alias die='EXIT=$? LINE=$LINENO error_exit' CROSS='\033[1;31m\xE2\x9D\x8C\033[0m' YW=`echo "\033[33m"` BL=`echo "\033[36m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=5 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -41,7 +41,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done diff --git a/setup/grafana-install.sh b/setup/grafana-install.sh index 6503d3f1..b0c6edcc 100644 --- a/setup/grafana-install.sh +++ b/setup/grafana-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -85,7 +85,7 @@ msg_info "Installing Grafana" apt-get update &>/dev/null apt-get install -y grafana &>/dev/null msg_ok "Installed Grafana" - + PASS=$(grep -w "root" /etc/shadow | cut -b6); if [[ $PASS != $ ]]; then msg_info "Customizing Container" diff --git a/setup/grocy-install.sh b/setup/grocy-install.sh index 32ca846b..f9588193 100644 --- a/setup/grocy-install.sh +++ b/setup/grocy-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -88,7 +88,7 @@ chown -R www-data:www-data /var/www/html cp /var/www/html/config-dist.php /var/www/html/data/config.php chmod +x /var/www/html/update.sh -cat < /etc/apache2/sites-available/grocy.conf +cat < /etc/apache2/sites-available/grocy.conf ServerAdmin webmaster@localhost DocumentRoot /var/www/html/public @@ -124,7 +124,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/ha_setup.sh b/setup/ha_setup.sh index a97b62e8..68453f13 100644 --- a/setup/ha_setup.sh +++ b/setup/ha_setup.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash -set -o errexit -set -o errtrace -set -o nounset -set -o pipefail +set -o errexit +set -o errtrace +set -o nounset +set -o pipefail shopt -s expand_aliases alias die='EXIT=$? LINE=$LINENO error_exit' CROSS='\033[1;31m\xE2\x9D\x8C\033[0m' @@ -128,7 +128,7 @@ show_menu(){ read opt } option_picked(){ - msgcolor=`echo "\033[01;31m"` + msgcolor=`echo "\033[1;31m"` normal=`echo "\033[00;00m"` message=${@:-"${normal}Error: No message passed"} printf "${msgcolor}${message}${normal}\n" @@ -273,15 +273,15 @@ for container in ${CONTAINER_LIST}; do DOCKER_COMMAND="$(runlike "${container}")" docker rm --force "${container}" eval ${DOCKER_COMMAND} - fi + fi done EOF sudo chmod +x /root/update-containers.sh echo -e "${CHECKMARK} \e[1;92m Customizing LXC... \e[0m" -rm /etc/motd -rm /etc/update-motd.d/10-uname -touch ~/.hushlogin +rm /etc/motd +rm /etc/update-motd.d/10-uname +touch ~/.hushlogin GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf" mkdir -p $(dirname $GETTY_OVERRIDE) cat << EOF > $GETTY_OVERRIDE diff --git a/setup/heimdalldashboard-install.sh b/setup/heimdalldashboard-install.sh index d4b509f7..57435bbd 100644 --- a/setup/heimdalldashboard-install.sh +++ b/setup/heimdalldashboard-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -127,7 +127,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/homeassistant-core-install.sh b/setup/homeassistant-core-install.sh index 783ac845..44ad86fd 100644 --- a/setup/homeassistant-core-install.sh +++ b/setup/homeassistant-core-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -51,7 +51,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -90,10 +90,10 @@ apt-get install -y \ msg_ok "Installed Dependencies" msg_info "Installing Home Assistant-Core" -mkdir /srv/homeassistant +mkdir /srv/homeassistant cd /srv/homeassistant python3 -m venv . -source bin/activate +source bin/activate python3 -m pip install wheel &>/dev/null pip3 install homeassistant &>/dev/null pip3 install Cython &>/dev/null @@ -134,7 +134,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/homeassistant-install.sh b/setup/homeassistant-install.sh index 35617ab0..88acc2ad 100644 --- a/setup/homeassistant-install.sh +++ b/setup/homeassistant-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -162,7 +162,7 @@ show_menu(){ read opt } option_picked(){ - msgcolor=`echo "\033[01;31m"` + msgcolor=`echo "\033[1;31m"` normal=`echo "\033[00;00m"` message=${@:-"${normal}Error: No message passed"} printf "${msgcolor}${message}${normal}\n" @@ -307,7 +307,7 @@ for container in ${CONTAINER_LIST}; do DOCKER_COMMAND="$(runlike "${container}")" docker rm --force "${container}" eval ${DOCKER_COMMAND} - fi + fi done EOF sudo chmod +x /root/update-containers.sh diff --git a/setup/homebridge-install.sh b/setup/homebridge-install.sh index 033a52b5..32de5f8c 100644 --- a/setup/homebridge-install.sh +++ b/setup/homebridge-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -106,7 +106,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/homepage-install.sh b/setup/homepage-install.sh index 8adb85c9..74d92192 100644 --- a/setup/homepage-install.sh +++ b/setup/homepage-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -51,7 +51,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -124,7 +124,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/influxdb-install.sh b/setup/influxdb-install.sh index ec96f9d1..f6c4e679 100644 --- a/setup/influxdb-install.sh +++ b/setup/influxdb-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -129,7 +129,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/iobroker-install.sh b/setup/iobroker-install.sh index ab65830e..f6fe795f 100644 --- a/setup/iobroker-install.sh +++ b/setup/iobroker-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -94,7 +94,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/jellyfin-install.sh b/setup/jellyfin-install.sh index f7f3576e..60b9977d 100644 --- a/setup/jellyfin-install.sh +++ b/setup/jellyfin-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -75,16 +75,16 @@ apt-get install -y apt-transport-https &>/dev/null apt-get install -y software-properties-common &>/dev/null msg_ok "Installed Dependencies" -msg_info "Setting Up Hardware Acceleration" +msg_info "Setting Up Hardware Acceleration" apt-get -y install \ va-driver-all \ ocl-icd-libopencl1 \ beignet-opencl-icd &>/dev/null - + /bin/chgrp video /dev/dri /bin/chmod 755 /dev/dri /bin/chmod 660 /dev/dri/* -msg_ok "Set Up Hardware Acceleration" +msg_ok "Set Up Hardware Acceleration" msg_info "Setting Up Jellyfin Repository" sudo add-apt-repository universe -y &>/dev/null @@ -132,7 +132,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/keycloak-install.sh b/setup/keycloak-install.sh index 0c86f4fa..c96d7fc5 100644 --- a/setup/keycloak-install.sh +++ b/setup/keycloak-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -115,7 +115,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/magicmirror-install.sh b/setup/magicmirror-install.sh index 64dce914..bf10543f 100644 --- a/setup/magicmirror-install.sh +++ b/setup/magicmirror-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -92,16 +92,16 @@ npm install --only=prod --omit=dev &>/dev/null cat < /opt/magicmirror/config/config.js let config = { - address: "0.0.0.0", + address: "0.0.0.0", port: 8080, - basePath: "/", - ipWhitelist: [], - useHttps: false, - httpsPrivateKey: "", - httpsCertificate: "", + basePath: "/", + ipWhitelist: [], + useHttps: false, + httpsPrivateKey: "", + httpsCertificate: "", language: "en", locale: "en-US", - logLevel: ["INFO", "LOG", "WARN", "ERROR"], + logLevel: ["INFO", "LOG", "WARN", "ERROR"], timeFormat: 24, units: "metric", serverOnly: true, @@ -217,7 +217,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/mariadb-install.sh b/setup/mariadb-install.sh index 15acb821..aacb0597 100644 --- a/setup/mariadb-install.sh +++ b/setup/mariadb-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done diff --git a/setup/mariadb_setup.sh b/setup/mariadb_setup.sh index b3d8b445..0376328d 100644 --- a/setup/mariadb_setup.sh +++ b/setup/mariadb_setup.sh @@ -7,11 +7,11 @@ set -o pipefail shopt -s expand_aliases alias die='EXIT=$? LINE=$LINENO error_exit' CROSS='\033[1;31m\xE2\x9D\x8C\033[0m' -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=5 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -40,7 +40,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done diff --git a/setup/meshcentral-install.sh b/setup/meshcentral-install.sh index eb2e219f..4f5e98fa 100644 --- a/setup/meshcentral-install.sh +++ b/setup/meshcentral-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -105,7 +105,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/motioneye-install.sh b/setup/motioneye-install.sh index ff8afa47..b5a7733b 100644 --- a/setup/motioneye-install.sh +++ b/setup/motioneye-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -92,7 +92,7 @@ msg_info "Installing Python" apt-get install libffi-dev libzbar-dev libzbar0 -y &>/dev/null apt-get install python2-dev libssl-dev libcurl4-openssl-dev libjpeg-dev -y &>/dev/null msg_ok "Installed Python" - + msg_info "Installing MotionEye" apt-get update &>/dev/null sudo pip install motioneye &>/dev/null @@ -101,11 +101,11 @@ msg_info "Installing MotionEye" mkdir -p /var/lib/motioneye msg_ok "Installed MotionEye" -msg_info "Creating Service" +msg_info "Creating Service" cp /usr/local/share/motioneye/extra/motioneye.systemd-unit-local /etc/systemd/system/motioneye.service &>/dev/null systemctl enable motioneye &>/dev/null - systemctl start motioneye -msg_ok "Created Service" + systemctl start motioneye +msg_ok "Created Service" PASS=$(grep -w "root" /etc/shadow | cut -b6); if [[ $PASS != $ ]]; then @@ -124,7 +124,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/mqtt-install.sh b/setup/mqtt-install.sh index db9331d9..9fc1495a 100644 --- a/setup/mqtt-install.sh +++ b/setup/mqtt-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -101,7 +101,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/n8n-install.sh b/setup/n8n-install.sh index 322064c0..f0b9b65a 100644 --- a/setup/n8n-install.sh +++ b/setup/n8n-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done diff --git a/setup/navidrome-install.sh b/setup/navidrome-install.sh index 6a50e363..37311d1a 100644 --- a/setup/navidrome-install.sh +++ b/setup/navidrome-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -51,7 +51,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -82,7 +82,7 @@ sudo install -d -o root -g root /opt/navidrome sudo install -d -o root -g root /var/lib/navidrome wget https://github.com/navidrome/navidrome/releases/download/v${RELEASE}/navidrome_${RELEASE}_Linux_x86_64.tar.gz -O Navidrome.tar.gz &>/dev/null sudo tar -xvzf Navidrome.tar.gz -C /opt/navidrome/ &>/dev/null -sudo chown -R root:root /opt/navidrome +sudo chown -R root:root /opt/navidrome mkdir -p /music cat < /var/lib/navidrome/navidrome.toml MusicFolder = '/music' @@ -143,7 +143,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/nextcloudpi-install.sh b/setup/nextcloudpi-install.sh index 5d8d1555..7ff15800 100644 --- a/setup/nextcloudpi-install.sh +++ b/setup/nextcloudpi-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -51,7 +51,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -92,7 +92,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/nginx-proxy-manager-install.sh b/setup/nginx-proxy-manager-install.sh index 4861405e..df6371d8 100644 --- a/setup/nginx-proxy-manager-install.sh +++ b/setup/nginx-proxy-manager-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -112,7 +112,7 @@ msg_ok "Set up Node.js Repository" msg_info "Installing Node.js" apt-get install -y nodejs &>/dev/null msg_ok "Installed Node.js" - + msg_info "Installing Yarn" npm install --global yarn &>/dev/null msg_ok "Installed Yarn" diff --git a/setup/nocodb-install.sh b/setup/nocodb-install.sh index 57083bb8..0472f122 100644 --- a/setup/nocodb-install.sh +++ b/setup/nocodb-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -123,7 +123,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/node-red-install.sh b/setup/node-red-install.sh index f9d90389..9a752ac9 100644 --- a/setup/node-red-install.sh +++ b/setup/node-red-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -96,7 +96,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/omada-install.sh b/setup/omada-install.sh index 6c2dde53..338c0f8c 100644 --- a/setup/omada-install.sh +++ b/setup/omada-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -99,7 +99,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/omv-install.sh b/setup/omv-install.sh index 0f553a62..c6756ab7 100644 --- a/setup/omv-install.sh +++ b/setup/omv-install.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash export DEBIAN_FRONTEND=noninteractive YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -111,7 +111,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/openhab-install.sh b/setup/openhab-install.sh index 1dec802f..68fc8c9c 100644 --- a/setup/openhab-install.sh +++ b/setup/openhab-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -84,9 +84,9 @@ apt-get -y install zulu11-jdk &>/dev/null msg_ok "Installed Azul Zulu" msg_info "Installing openHAB" -curl -fsSL "https://openhab.jfrog.io/artifactory/api/gpg/key/public" | gpg --dearmor > openhab.gpg -mv openhab.gpg /usr/share/keyrings -chmod u=rw,g=r,o=r /usr/share/keyrings/openhab.gpg +curl -fsSL "https://openhab.jfrog.io/artifactory/api/gpg/key/public" | gpg --dearmor > openhab.gpg +mv openhab.gpg /usr/share/keyrings +chmod u=rw,g=r,o=r /usr/share/keyrings/openhab.gpg echo 'deb [signed-by=/usr/share/keyrings/openhab.gpg] https://openhab.jfrog.io/artifactory/openhab-linuxpkg stable main' | tee /etc/apt/sources.list.d/openhab.list &>/dev/null apt update &>/dev/null apt-get -y install openhab &>/dev/null @@ -111,7 +111,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/paperless-ngx-install.sh b/setup/paperless-ngx-install.sh index c1c2640b..7f6a0582 100644 --- a/setup/paperless-ngx-install.sh +++ b/setup/paperless-ngx-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -125,7 +125,7 @@ cd /opt/jbig2enc /bin/bash -c "./autogen.sh" &>/dev/null && \ /bin/bash -c "./configure && make" &>/dev/null && \ /bin/bash -c "make install" &>/dev/null -rm -rf /opt/jbig2enc +rm -rf /opt/jbig2enc msg_ok "Installed JBIG2" msg_info "Downloading Paperless-ngx" diff --git a/setup/photoprism-install.sh b/setup/photoprism-install.sh index e75d91b0..92f7df7b 100644 --- a/setup/photoprism-install.sh +++ b/setup/photoprism-install.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash AVX=$(grep -o -m1 'avx[^ ]*' /proc/cpuinfo) YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -53,7 +53,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -137,7 +137,7 @@ cp -a assets/ /opt/photoprism/assets/ &>/dev/null msg_ok "Built PhotoPrism" env_path="/var/lib/photoprism/.env" -echo " +echo " PHOTOPRISM_AUTH_MODE='password' PHOTOPRISM_ADMIN_PASSWORD='changeme' PHOTOPRISM_HTTP_HOST='0.0.0.0' @@ -184,7 +184,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/pihole-install.sh b/setup/pihole-install.sh index 3d6a0e4d..021972ef 100644 --- a/setup/pihole-install.sh +++ b/setup/pihole-install.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash export DEBIAN_FRONTEND=noninteractive YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -53,7 +53,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -114,7 +114,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/plex-install.sh b/setup/plex-install.sh index 90e21271..11aafb26 100644 --- a/setup/plex-install.sh +++ b/setup/plex-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -74,16 +74,16 @@ apt-get install -y sudo &>/dev/null apt-get install -y gnupg &>/dev/null msg_ok "Installed Dependencies" -msg_info "Setting Up Hardware Acceleration" +msg_info "Setting Up Hardware Acceleration" apt-get -y install \ va-driver-all \ ocl-icd-libopencl1 \ beignet-opencl-icd &>/dev/null - + /bin/chgrp video /dev/dri /bin/chmod 755 /dev/dri /bin/chmod 660 /dev/dri/* -msg_ok "Set Up Hardware Acceleration" +msg_ok "Set Up Hardware Acceleration" msg_info "Setting Up Plex Media Server Repository" wget -q https://downloads.plex.tv/plex-keys/PlexSign.key -O - | sudo apt-key add - &>/dev/null @@ -111,9 +111,8 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null msg_ok "Cleaned" - diff --git a/setup/podman-homeassistant-install.sh b/setup/podman-homeassistant-install.sh index 9a885507..ba64c280 100644 --- a/setup/podman-homeassistant-install.sh +++ b/setup/podman-homeassistant-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -105,7 +105,7 @@ podman run -d \ selfhostedpro/yacht:latest &>/dev/null podman generate systemd \ --new --name yacht \ - > /etc/systemd/system/yacht.service + > /etc/systemd/system/yacht.service systemctl enable yacht &>/dev/null msg_ok "Installed Yacht" fi @@ -127,7 +127,7 @@ podman run -d \ homeassistant/home-assistant:stable &>/dev/null podman generate systemd \ --new --name homeassistant \ - > /etc/systemd/system/homeassistant.service + > /etc/systemd/system/homeassistant.service systemctl enable homeassistant &>/dev/null msg_ok "Installed Home Assistant" @@ -148,7 +148,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/podman_ha_setup.sh b/setup/podman_ha_setup.sh index 8cc8d414..05e4b36f 100644 --- a/setup/podman_ha_setup.sh +++ b/setup/podman_ha_setup.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash -set -o errexit -set -o errtrace -set -o nounset -set -o pipefail +set -o errexit +set -o errtrace +set -o nounset +set -o pipefail shopt -s expand_aliases alias die='EXIT=$? LINE=$LINENO error_exit' trap die ERR @@ -23,11 +23,11 @@ function msg() { } CROSS='\033[1;31m\xE2\x9D\x8C\033[0m' -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -41,7 +41,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -143,12 +143,12 @@ systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') podman generate systemd \ --new --name homeassistant \ - > /etc/systemd/system/homeassistant.service + > /etc/systemd/system/homeassistant.service systemctl enable homeassistant &>/dev/null podman generate systemd \ --new --name yacht \ - > /etc/systemd/system/yacht.service + > /etc/systemd/system/yacht.service systemctl enable yacht &>/dev/null echo -e "${CM}${CL} \r" diff --git a/setup/postgresql-install.sh b/setup/postgresql-install.sh index d97f9e0e..10efd300 100644 --- a/setup/postgresql-install.sh +++ b/setup/postgresql-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -1003,7 +1003,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/prometheus-install.sh b/setup/prometheus-install.sh index 378a8ab5..3d74e07f 100644 --- a/setup/prometheus-install.sh +++ b/setup/prometheus-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -123,7 +123,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/syncthing-install.sh b/setup/syncthing-install.sh index a9d942bc..a2769db8 100644 --- a/setup/syncthing-install.sh +++ b/setup/syncthing-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -51,7 +51,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -97,7 +97,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/technitiumdns-install.sh b/setup/technitiumdns-install.sh index 907c7e2f..21699160 100644 --- a/setup/technitiumdns-install.sh +++ b/setup/technitiumdns-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -94,7 +94,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/trilium-install.sh b/setup/trilium-install.sh index 8b259725..6482af24 100644 --- a/setup/trilium-install.sh +++ b/setup/trilium-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -51,7 +51,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -118,7 +118,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/ubuntu-install.sh b/setup/ubuntu-install.sh index 4abacf6d..31991810 100644 --- a/setup/ubuntu-install.sh +++ b/setup/ubuntu-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -89,7 +89,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/umbrel-install.sh b/setup/umbrel-install.sh index bd6c5a7b..0ae566f2 100644 --- a/setup/umbrel-install.sh +++ b/setup/umbrel-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -102,7 +102,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/unifi-install.sh b/setup/unifi-install.sh index 49ebf87d..5a2c8de8 100644 --- a/setup/unifi-install.sh +++ b/setup/unifi-install.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash #https://community.ui.com/questions/UniFi-Installation-Scripts-or-UniFi-Easy-Update-Script-or-UniFi-Lets-Encrypt-or-UniFi-Easy-Encrypt-/ccbc7530-dd61-40a7-82ec-22b17f027776 YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -53,7 +53,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -103,7 +103,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/uptimekuma-install.sh b/setup/uptimekuma-install.sh index f8663bfc..848739b1 100644 --- a/setup/uptimekuma-install.sh +++ b/setup/uptimekuma-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -123,7 +123,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/vault_setup.sh b/setup/vault_setup.sh index 57f2117c..69aa63f9 100644 --- a/setup/vault_setup.sh +++ b/setup/vault_setup.sh @@ -8,11 +8,11 @@ shopt -s expand_aliases alias die='EXIT=$? LINE=$LINENO error_exit' CROSS='\033[1;31m\xE2\x9D\x8C\033[0m' CHECKMARK='\033[0;32m\xE2\x9C\x94\033[0m' -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` CM='\xE2\x9C\x94\033' GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -84,7 +84,7 @@ npm i npm@latest -g &>/dev/null echo -e "${CHECKMARK} \e[1;92m Building Vaultwarden (Patience)... \e[0m" git clone https://github.com/dani-garcia/vaultwarden &>/dev/null pushd vaultwarden &>/dev/null -cargo clean &>/dev/null +cargo clean &>/dev/null cargo build --features sqlite --release &>/dev/null file target/release/vaultwarden &>/dev/null @@ -101,7 +101,7 @@ npm audit fix --silent --legacy-peer-deps || true &>/dev/null npm run --silent dist:oss:selfhost &>/dev/null cp -a build ../web-vault &>/dev/null cd .. -mkdir data +mkdir data echo -e "${CHECKMARK} \e[1;92m Create Systemd Service... \e[0m" cp ../../.env.template /etc/vaultwarden.env &>/dev/null diff --git a/setup/vaultwarden-install.sh b/setup/vaultwarden-install.sh index 2f9e90c7..47522526 100644 --- a/setup/vaultwarden-install.sh +++ b/setup/vaultwarden-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -179,7 +179,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/whoogle-install.sh b/setup/whoogle-install.sh index 0a653770..97974c65 100644 --- a/setup/whoogle-install.sh +++ b/setup/whoogle-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -110,7 +110,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/wikijs-install.sh b/setup/wikijs-install.sh index db684221..71a559a4 100644 --- a/setup/wikijs-install.sh +++ b/setup/wikijs-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -139,7 +139,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/wireguard-install.sh b/setup/wireguard-install.sh index f9af0201..045bfdff 100644 --- a/setup/wireguard-install.sh +++ b/setup/wireguard-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -92,7 +92,7 @@ apt-get install -y gunicorn &>/dev/null msg_ok "Installed Dependencies" msg_info "Installing WireGuard (using pivpn.io)" -curl -s -L https://install.pivpn.io > install.sh +curl -s -L https://install.pivpn.io > install.sh chmod +x install.sh ./install.sh --unattended options.conf &>/dev/null msg_ok "Installed WireGuard" @@ -153,7 +153,7 @@ systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - + msg_info "Cleaning up" apt-get autoremove >/dev/null apt-get autoclean >/dev/null diff --git a/setup/zigbee2mqtt-install.sh b/setup/zigbee2mqtt-install.sh index a7fe1668..f8350ff4 100644 --- a/setup/zigbee2mqtt-install.sh +++ b/setup/zigbee2mqtt-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -84,7 +84,7 @@ msg_ok "Set up Node.js Repository" msg_info "Installing Node.js" apt-get install -y nodejs &>/dev/null msg_ok "Installed Node.js" - + msg_info "Setting up Zigbee2MQTT Repository" git clone https://github.com/Koenkk/zigbee2mqtt.git /opt/zigbee2mqtt &>/dev/null msg_ok "Set up Zigbee2MQTT Repository" diff --git a/setup/zwave-js-ui-install.sh b/setup/zwave-js-ui-install.sh index 15da4574..6f0a2a4f 100644 --- a/setup/zwave-js-ui-install.sh +++ b/setup/zwave-js-ui-install.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash YW=`echo "\033[33m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BL=`echo "\033[36m"` GN=`echo "\033[1;92m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` RETRY_NUM=10 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -52,7 +52,7 @@ while [ "$(hostname -I)" = "" ]; do ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done @@ -120,4 +120,4 @@ msg_info "Cleaning up" rm zwave-js-ui-${RELEASE}-linux.zip apt-get autoremove >/dev/null apt-get autoclean >/dev/null -msg_ok "Cleaned" +msg_ok "Cleaned" diff --git a/vm/haos-vm-v4.sh b/vm/haos-vm-v4.sh index 36ee3afa..315d4db9 100644 --- a/vm/haos-vm-v4.sh +++ b/vm/haos-vm-v4.sh @@ -9,11 +9,11 @@ LATEST=$(curl -s https://api.github.com/repos/home-assistant/operating-system/re YW=`echo "\033[33m"` BL=`echo "\033[36m"` HA=`echo "\033[1;34m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -67,10 +67,10 @@ function header_info { echo -e "${HA} __ __ ___ ____ _____ / / / // |v4/ __ \/ ___/ - / /_/ // /| | / / / /\__ \ - / __ // ___ |/ /_/ /___/ / -/_/ /_//_/ |_|\____//____/ - Home Assistant OS + / /_/ // /| | / / / /\__ \ + / __ // ___ |/ /_/ /___/ / +/_/ /_//_/ |_|\____//____/ + Home Assistant OS ${CL}" } function msg_info() { @@ -160,7 +160,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "START VIRTUAL MACHINE" --yesno "Start VM when completed?" 10 58); then echo -e "${DGN}Start VM when completed: ${BGN}yes${CL}" @@ -221,7 +221,7 @@ fi msg_ok "Using ${CL}${BL}$STORAGE${CL} ${GN}for Storage Location." msg_ok "Virtual Machine ID is ${CL}${BL}$VMID${CL}." msg_info "Getting URL for Home Assistant ${BRANCH} Disk Image" -if [ "$BRANCH" == "$DEV" ]; then +if [ "$BRANCH" == "$DEV" ]; then URL=https://os-builds.home-assistant.io/${BRANCH}/haos_ova-${BRANCH}.qcow2.xz else URL=https://github.com/home-assistant/operating-system/releases/download/${BRANCH}/haos_ova-${BRANCH}.qcow2.xz diff --git a/vm/haos_vm.sh b/vm/haos_vm.sh index 5f204f69..cb1088a2 100644 --- a/vm/haos_vm.sh +++ b/vm/haos_vm.sh @@ -8,11 +8,11 @@ DEV=$(curl -s https://raw.githubusercontent.com/home-assistant/version/master/de YW=`echo "\033[33m"` BL=`echo "\033[36m"` HA=`echo "\033[1;34m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -64,9 +64,9 @@ function header_info { echo -e "${HA} __ _____ ____ _____ / / / / | / __ \/ ___/ - / /_/ / /| |/ / / /\__ \ - / __ / ___ / /_/ /___/ / -/_/ /_/_/v4|_\____//____/ + / /_/ / /| |/ / / /\__ \ + / __ / ___ / /_/ /___/ / +/_/ /_/_/v4|_\____//____/ Home Assistant OS ${CL}" } @@ -163,7 +163,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "START VIRTUAL MACHINE" --yesno "Start VM when completed?" 10 58); then echo -e "${DGN}Start VM when completed: ${BGN}yes${CL}" @@ -225,7 +225,7 @@ fi msg_ok "Using ${CL}${BL}$STORAGE${CL} ${GN}for Storage Location." msg_ok "Virtual Machine ID is ${CL}${BL}$VMID${CL}." msg_info "Getting URL for Home Assistant ${BRANCH} Disk Image" -if [ "$BRANCH" == "$DEV" ]; then +if [ "$BRANCH" == "$DEV" ]; then URL=https://os-builds.home-assistant.io/${BRANCH}/haos_ova-${BRANCH}.qcow2.xz else URL=https://github.com/home-assistant/operating-system/releases/download/${BRANCH}/haos_ova-${BRANCH}.qcow2.xz diff --git a/vm/mikrotik-routeros-v4.sh b/vm/mikrotik-routeros-v4.sh index 848a505c..5c07729b 100644 --- a/vm/mikrotik-routeros-v4.sh +++ b/vm/mikrotik-routeros-v4.sh @@ -5,11 +5,11 @@ NEXTID=$(pvesh get /cluster/nextid) YW=`echo "\033[33m"` BL=`echo "\033[36m"` HA=`echo "\033[1;34m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -62,9 +62,9 @@ function header_info { echo -e "${RD} __ ____ __ __ _ __ ____ __ ____ _____ / |/ (_) /___________ / /_(_) /__ / __ \____ __ __/ /____ _____/ __ \/ ___/ - / /|_/ / / //_/ ___/ __ \/ __/ / //_/ / /_/ / __ \/ / / / __/ _ \/ ___/ / / /\__ \ - / / / / / < / / / /_/ / /_/ / < v4 / _ _/ /_/ / /_/ / /_/ __/ / / /_/ /___/ / -/_/ /_/_/_/|_/_/ \____/\__/_/_/|_| /_/ |_|\____/\__,_/\__/\___/_/ \____//____/ + / /|_/ / / //_/ ___/ __ \/ __/ / //_/ / /_/ / __ \/ / / / __/ _ \/ ___/ / / /\__ \ + / / / / / < / / / /_/ / /_/ / < v4 / _ _/ /_/ / /_/ / /_/ __/ / / /_/ /___/ / +/_/ /_/_/_/|_/_/ \____/\__/_/_/|_| /_/ |_|\____/\__,_/\__/\___/_/ \____//____/ ${CL}" } function msg_info() { @@ -147,7 +147,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "START VIRTUAL MACHINE" --yesno "Start Mikrotik RouterOS VM when completed?" 10 58); then echo -e "${DGN}Start Mikrotik RouterOS VM when completed: ${BGN}yes${CL}" diff --git a/vm/pimox-haos-vm-v4.sh b/vm/pimox-haos-vm-v4.sh index 97dc8369..0d7ac581 100644 --- a/vm/pimox-haos-vm-v4.sh +++ b/vm/pimox-haos-vm-v4.sh @@ -8,11 +8,11 @@ DEV=$(curl -s https://raw.githubusercontent.com/home-assistant/version/master/de YW=`echo "\033[33m"` BL=`echo "\033[36m"` HA=`echo "\033[1;34m"` -RD=`echo "\033[01;31m"` +RD=`echo "\033[1;31m"` BGN=`echo "\033[4;92m"` GN=`echo "\033[1;92m"` DGN=`echo "\033[32m"` -CL=`echo "\033[m"` +CL=`echo "\033[0m"` BFR="\\r\\033[K" HOLD="-" CM="${GN}✓${CL}" @@ -59,9 +59,9 @@ function header_info { echo -e "${RD} ____ _ __ ___ __ _____ ____ _____ / __ \(_) / |/ /___ _ __ / / / / | / __ \/ ___/ - / /_/ / /v4_/ /|_/ / __ \| |/_/ / /_/ / /| |/ / / /\__ \ - / ____/ /___/ / / / /_/ /> < / __ / ___ / /_/ /___/ / -/_/ /_/ /_/ /_/\____/_/|_| /_/ /_/_/ |_\____//____/ + / /_/ / /v4_/ /|_/ / __ \| |/_/ / /_/ / /| |/ / / /\__ \ + / ____/ /___/ / / / /_/ /> < / __ / ___ / /_/ /___/ / +/_/ /_/ /_/ /_/\____/_/|_| /_/ /_/_/ |_\____//____/ ${CL}" } function msg_info() { @@ -150,7 +150,7 @@ if [ $exitstatus = 0 ]; then else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" - fi + fi fi if (whiptail --title "START VIRTUAL MACHINE" --yesno "Start VM when completed?" 10 58); then echo -e "${DGN}Start VM when completed: ${BGN}yes${CL}"