Skip to content

Commit 1521b94

Browse files
authored
Merge pull request #219 from krystofair/main
Poprawka dla wyciągania pola "mikrus_pro" i refaktor linii.
2 parents 79bd089 + cd9275b commit 1521b94

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

default-tools/start

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,13 @@ while true; do
4141
esac
4242
done
4343

44-
czy_mikrus_pro=$(curl -d "key=$(cat /klucz_api)&srv=$(hostname | tr -d .mikr.us)" -s https://api.mikr.us/info | python3 -c "import json;print(json.loads(input())['mikrus_pro'])")
44+
czy_mikrus_pro=$(curl -d "key=$(cat /klucz_api)&srv=$(hostname | tr -d .mikr.us)" \
45+
-s https://api.mikr.us/info \
46+
| python3 -c "import json;print(json.loads(input()).get('mikrus_pro', 'nie'))")
4547
server_type=`cat /etc/hostname | cut -c -1 `
4648
# serwery klasy 1.0 nie obsługują dockera chyba że MikrusPRO jest aktywne
47-
if ! [[ ( "$server_type" = "x" || "$server_type" = "y" ) && "$czy_mikrus_pro" = "nie" ]]; then
49+
if ! [[ ( "$server_type" = "x" || "$server_type" = "y" ) && "$czy_mikrus_pro" = "nie" ]];
50+
then
4851
echo -e "\n\033[1mDocker\033[0m"
4952
echo "Chcesz zainstalować Dockera?"
5053
while true; do

0 commit comments

Comments
 (0)