Reduction of deps from config template for Qobuz

GioF71 · May 18, 2024 · a17b3ff · a17b3ff
1 parent 62b412e
commit a17b3ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/app/bin/run-upmpdcli.sh b/app/bin/run-upmpdcli.sh
@@ -620,17 +620,15 @@ if [ "${QOBUZ_ENABLE^^}" == "YES" ]; then
     if [[ -n "${QOBUZ_TITLE}" ]]; then
         echo "qobuztitle = ${QOBUZ_TITLE}" >> $CONFIG_FILE
     fi
-    sed -i 's/\#qobuzuser/qobuzuser/g' $CONFIG_FILE;
-    sed -i 's/\#qobuzpass/qobuzpass/g' $CONFIG_FILE;
-    sed -i 's/\#qobuzformatid/qobuzformatid/g' $CONFIG_FILE;
-    sed -i 's/QOBUZ_USERNAME/'"$QOBUZ_USERNAME"'/g' $CONFIG_FILE;
-    sed -i 's/QOBUZ_PASSWORD/'"$QOBUZ_PASSWORD"'/g' $CONFIG_FILE;
-    sed -i 's/QOBUZ_FORMAT_ID/'"$QOBUZ_FORMAT_ID"'/g' $CONFIG_FILE;
+    echo "qobuzuser = $QOBUZ_USERNAME" >> $CONFIG_FILE
+    echo "qobuzpass = $QOBUZ_PASSWORD" >> $CONFIG_FILE
+    if [[ -n "${QOBUZ_FORMAT_ID}" ]]; then
+        echo "qobuzformatid = $QOBUZ_FORMAT_ID" >> $CONFIG_FILE
+    fi
     if [[ -n "${QOBUZ_RENUM_TRACKS}" ]]; then
         qobuz_v=${QOBUZ_RENUM_TRACKS}
         if [[ "${qobuz_v}" == "0" || "${qobuz_v}" == "1" ]]; then
-            sed -i 's/\#qobuzrenumtracks/qobuzrenumtracks/g' $CONFIG_FILE;
-            sed -i 's/QOBUZ_RENUM_TRACKS/'"$QOBUZ_RENUM_TRACKS"'/g' $CONFIG_FILE;
+            echo "qobuzrenumtracks = $QOBUZ_RENUM_TRACKS" >> $CONFIG_FILE
         else
             echo "Invalid QOBUZ_RENUM_TRACKS=[${QOBUZ_RENUM_TRACKS}]"
             exit 3
@@ -639,8 +637,7 @@ if [ "${QOBUZ_ENABLE^^}" == "YES" ]; then
     if [[ -n "${QOBUZ_EXPLICIT_ITEM_NUMBERS}" ]]; then
         qobuz_v=${QOBUZ_EXPLICIT_ITEM_NUMBERS}
         if [[ "${qobuz_v}" == "0" || "${qobuz_v}" == "1" ]]; then
-            sed -i 's/\#qobuzexplicititemnumbers/qobuzexplicititemnumbers/g' $CONFIG_FILE;
-            sed -i 's/QOBUZ_EXPLICIT_ITEM_NUMBERS/'"$QOBUZ_EXPLICIT_ITEM_NUMBERS"'/g' $CONFIG_FILE;
+            echo "qobuzexplicititemnumbers = $QOBUZ_EXPLICIT_ITEM_NUMBERS" >> $CONFIG_FILE
         else
             echo "Invalid QOBUZ_EXPLICIT_ITEM_NUMBERS=[${QOBUZ_EXPLICIT_ITEM_NUMBERS}]"
             exit 3
@@ -649,8 +646,7 @@ if [ "${QOBUZ_ENABLE^^}" == "YES" ]; then
     if [[ -n "${QOBUZ_PREPEND_ARTIST_TO_ALBUM}" ]]; then
         qobuz_v=${QOBUZ_PREPEND_ARTIST_TO_ALBUM}
         if [[ "${qobuz_v}" == "0" || "${qobuz_v}" == "1" ]]; then
-            sed -i 's/\#qobuzprependartisttoalbum/qobuzprependartisttoalbum/g' $CONFIG_FILE;
-            sed -i 's/QOBUZ_PREPEND_ARTIST_TO_ALBUM/'"$QOBUZ_PREPEND_ARTIST_TO_ALBUM"'/g' $CONFIG_FILE;
+            echo "qobuzprependartisttoalbum = $QOBUZ_PREPEND_ARTIST_TO_ALBUM" >> $CONFIG_FILE
         else
             echo "Invalid QOBUZ_PREPEND_ARTIST_TO_ALBUM=[${QOBUZ_PREPEND_ARTIST_TO_ALBUM}]"
             exit 3

diff --git a/app/conf/upmpdcli.conf b/app/conf/upmpdcli.conf
@@ -60,12 +60,6 @@
 #hrauser = HRA_USERNAME
 #hrapass = HRA_PASSWORD
 #hralang = HRA_LANG
-#qobuzuser = QOBUZ_USERNAME
-#qobuzpass = QOBUZ_PASSWORD
-#qobuzformatid = QOBUZ_FORMAT_ID
-#qobuzrenumtracks = QOBUZ_RENUM_TRACKS
-#qobuzexplicititemnumbers = QOBUZ_EXPLICIT_ITEM_NUMBERS
-#qobuzprependartisttoalbum = QOBUZ_PREPEND_ARTIST_TO_ALBUM
 #uprcluser = UPRCL_USER
 #uprcltitle = UPRCL_TITLE
 #uprclhostport = UPRCL_HOSTPORT