Fixing issues:

MiczFlor#1106: Skip WINS configuration in install script when installing Samba MiczFlor#1104: Media directory is not adjusted in Mopidy, when changed in install script MiczFlor#1096: gpio_settings.ini moved without notice or doc update
Huseriato · Oct 21, 2020 · 1d97ff6 · 1d97ff6
1 parent b3c0938
commit 1d97ff6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/components/gpio_control/gpio_control.py b/components/gpio_control/gpio_control.py
@@ -98,7 +98,7 @@ def get_all_devices(config):
     logger.setLevel('INFO')
 
     config = configparser.ConfigParser(inline_comment_prefixes=";")
-    config_path = os.path.expanduser('~/.config/phoniebox/gpio_settings.ini')
+    config_path = os.path.expanduser('../../settings/gpio_settings.ini')
     config.read(config_path)
 
     devices = get_all_devices(config)

diff --git a/misc/sampleconfigs/mopidy-etc.sample b/misc/sampleconfigs/mopidy-etc.sample
@@ -9,7 +9,7 @@ debug_file = /var/log/mopidy/mopidy-debug.log
 
 [local]
 enabled = true
-media_dir = /home/pi/RPi-Jukebox-RFID/shared/audiofolders
+media_dir = %media_dir%
 excluded_file_extensions =
   .conf
   .jpg

diff --git a/misc/sampleconfigs/mopidy.sample b/misc/sampleconfigs/mopidy.sample
@@ -124,7 +124,7 @@ metadata_timeout = 1
 [local]
 enabled = true
 #library = json
-media_dir = /home/pi/RPi-Jukebox-RFID/shared/audiofolders
+media_dir = %media_dir%
 #scan_timeout = 1000
 #scan_flush_threshold = 100
 #scan_follow_symlinks = false

diff --git a/scripts/installscripts/buster-install-default.sh b/scripts/installscripts/buster-install-default.sh
@@ -926,10 +926,12 @@ install_main() {
         sudo sed -i 's/%spotify_password%/'"$SPOTIpass"'/' "${etc_mopidy_conf}"
         sudo sed -i 's/%spotify_client_id%/'"$SPOTIclientid"'/' "${etc_mopidy_conf}"
         sudo sed -i 's/%spotify_client_secret%/'"$SPOTIclientsecret"'/' "${etc_mopidy_conf}"
+        sudo sed -i 's=%media_dir%='"$DIRaudioFolders"'=' "${etc_mopidy_conf}"
         sed -i 's/%spotify_username%/'"$SPOTIuser"'/' "${mopidy_conf}"
         sed -i 's/%spotify_password%/'"$SPOTIpass"'/' "${mopidy_conf}"
         sed -i 's/%spotify_client_id%/'"$SPOTIclientid"'/' "${mopidy_conf}"
         sed -i 's/%spotify_client_secret%/'"$SPOTIclientsecret"'/' "${mopidy_conf}"
+        sed -i 's=%media_dir%='"$DIRaudioFolders"'=' "${mopidy_conf}"
     fi
 
     # GPIO-Control
@@ -1214,6 +1216,9 @@ finish_installation() {
 # Main #
 ########
 main() {
+    # Skip interactive Samba WINS config dialog
+    echo "samba-common samba-common/dhcp boolean false" | sudo debconf-set-selections
+
     if [[ ${INTERACTIVE} == "true" ]]; then
         welcome
         #reset_install_config_file
@@ -1227,8 +1232,6 @@ main() {
     else
         echo "Non-interactive installation!"
         check_config_file
-        # Skip interactive Samba WINS config dialog
-        echo "samba-common samba-common/dhcp boolean false" | sudo debconf-set-selections
     fi
     install_main "${JUKEBOX_HOME_DIR}"
     wifi_settings "${JUKEBOX_HOME_DIR}/misc/sampleconfigs" "/etc/dhcpcd.conf" "/etc/wpa_supplicant/wpa_supplicant.conf"