From b520da128efa81fdcffb0f964add652ded8a51bc Mon Sep 17 00:00:00 2001 From: asandikci Date: Mon, 23 Oct 2023 17:16:04 +0300 Subject: [PATCH] workaround for sudo issue --- README.md | 2 ++ install.sh | 15 +++++++++++---- src/root-config.sh | 4 ++++ src/{config.sh => user-config.sh} | 9 +++------ 4 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 src/root-config.sh rename src/{config.sh => user-config.sh} (75%) diff --git a/README.md b/README.md index 333040d..f1f4ee0 100644 --- a/README.md +++ b/README.md @@ -30,4 +30,6 @@ wget -qO- https://raw.githubusercontent.com/asandikci/iflbot-setup/main/install. - [ ] Auto login bot user - [ ] Disable annoying bell sound (in each restart) +- [ ] ISSUE: mix 2 config file and resolve sudo issue + - [ ] End-of-life after [LabManage](https://git.aliberksandikci.com.tr/asandikci/labmanage) application ready-to-use (WIP/private for now) diff --git a/install.sh b/install.sh index ff3d3d7..97d05bf 100755 --- a/install.sh +++ b/install.sh @@ -195,12 +195,19 @@ _install() { _log "Uygulamalar Yüklendi" info fi fi - if [ -f "$src_dir/config.sh" ]; then + if [ -f "$src_dir/user-config.sh" ]; then _log "Sistemi ayarlamak için ilgili yapılandırmaları yapmak istiyor musunuz?" if _checkanswer -eq 1; then - _log "Yapılandırmalar Uygulanıyor..." verbose - _sudo bash "$src_dir/config.sh" - _log "Yapılandırmalar Uygulandı" info + _log "Kullanıcı Yapılandırmaları (sudo gerektirmeyen) Uygulanıyor..." verbose + _sudo bash "$src_dir/user-config.sh" + _log "Kullanıcı Yapılandırmaları (sudo gerektirmeyen) Uygulandı..." info + + sleep 1 + + _log "Root Yapılandırmaları Uygulanıyor..." verbose + _sudo bash "$src_dir/root-config.sh" + _log "Root Yapılandırmaları Uygulandı..." verbose + fi fi if [ -f "$src_dir/system-refresh.sh" ]; then diff --git a/src/root-config.sh b/src/root-config.sh new file mode 100644 index 0000000..74367bc --- /dev/null +++ b/src/root-config.sh @@ -0,0 +1,4 @@ +#!/bin/bash +# root configs + +# NOT IPLEMENTED YET, see ./../README.md \ No newline at end of file diff --git a/src/config.sh b/src/user-config.sh similarity index 75% rename from src/config.sh rename to src/user-config.sh index e65589e..7ca358c 100644 --- a/src/config.sh +++ b/src/user-config.sh @@ -1,12 +1,9 @@ #!/bin/bash # general configs -# NOT IPLEMENTED YET, see ./../README.md - -### SUBLIME BUILDS - - ### XFCE SETTINGS xfconf-query -c "xsettings" -p "/Net/ThemeName" -s "pardus-xfce-dark" --type "string" --create xfconf-query -c "xfwm4" -p "/general/theme" -s "pardus-xfce-dark" --type "string" --create -xfconf-query -c "xsettings" -p "/Net/IconThemeName" -s "pardus-xfce-dark" --type "string" --create \ No newline at end of file +xfconf-query -c "xsettings" -p "/Net/IconThemeName" -s "pardus-xfce-dark" --type "string" --create + +### SUBLIME BUILDS \ No newline at end of file