h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

feat: KIAUH v4.0.0 #191

Merged
dw-0 merged 453 commits from v4-rc into master 2022-05-29 20:11:16 +02:00
Conversation 8 Commits 453 Files Changed 64 +20 -2
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 453fc06a7b - Show all commits

1
kiauh.sh
View File

@@ -49,6 +49,7 @@ function kiauh_update_avail(){
} }
check_euid check_euid
init_logfile
set_globals set_globals
init_ini init_ini
kiauh_update_avail kiauh_update_avail

10
scripts/ui/main_menu.sh
View File

@@ -25,14 +25,20 @@ function main_ui(){
echo -e "| | KlipperScreen: $(klipperscreen_status)|" echo -e "| | KlipperScreen: $(klipperscreen_status)|"
echo -e "| 6) [Settings] | Telegram Bot: $(get_telegram_bot_status)|" echo -e "| 6) [Settings] | Telegram Bot: $(get_telegram_bot_status)|"
echo -e "| | |" echo -e "| | |"
echo -e "| $(get_kiauh_version)| Octoprint: $(octoprint_status)|" echo -e "| $(print_kiauh_version)| Octoprint: $(octoprint_status)|"
quit_footer quit_footer
} }
function get_kiauh_version(){ function get_kiauh_version(){
local version local version
cd "${SRCDIR}/kiauh" cd "${SRCDIR}/kiauh"
version="$(printf "%-20s" "$(git describe HEAD --always --tags | cut -d "-" -f 1,2)")" version="$(git describe HEAD --always --tags | cut -d "-" -f 1,2)"
echo "${version}"
}
function print_kiauh_version(){
local version
version="$(printf "%-20s" "$(get_kiauh_version)")"
echo "${cyan}${version}${white}" echo "${cyan}${version}${white}"
} }

11
scripts/utilities.sh
View File

@@ -79,6 +79,17 @@ function timestamp() {
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
date +"[%F %T]" date +"[%F %T]"
} }
function init_logfile() {
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
local log="/tmp/kiauh.log"
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
{
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
echo -e "#================================================================#"
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
echo -e "# New KIAUH session started on: $(date) #"
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
echo -e "#================================================================#"
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
echo -e "KIAUH $(get_kiauh_version)"
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
echo -e "#================================================================#"
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
} >> "${log}"
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
}
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
function log_info() { function log_info() {
local message="${1}" log="${LOGFILE}" local message="${1}" log="${LOGFILE}"
echo -e "$(timestamp) <INFO> ${message}" | tr -s " " >> "${log}" echo -e "$(timestamp) <INFO> ${message}" | tr -s " " >> "${log}"
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.