Make curl u param more dynamic

main.sh

@@ -6,7 +6,6 @@ Priority=${PLUGIN_PRIORITY:-}
 Title=${PLUGIN_TITLE:-}
 Tags=${PLUGIN_TAGS:-}
 Click=${PLUGIN_CLICK:-}
-
 Attach=${PLUGIN_ATTACH:-}
 Icon=${PLUGIN_ICON:-}
 
@@ -17,6 +16,10 @@ Message=${PLUGIN_MESSAGE:-Pipeline finished!}
 Username=${PLUGIN_USERNAME:-}
 Password=${PLUGIN_PASSWORD:-}
 
+if [[ ! -z $Username ]] || [[ ! -z $Password ]]; then
+    UParam="-u $Username:$Password"
+fi
+
 if [[ ! -z $Priority ]]; then
     Priority="-H Priority:$Priority"
 fi
@@ -33,5 +36,13 @@ if [[ ! -z $Click ]]; then
     Click="-H Click:$Click"
 fi
 
-curl $Priority $Title $Tags $Click -u $Username:$Password -d "$Message" $URL/$Topic
-#echo curl $Priority $Title $Tags $Click -u $Username:$Password -d "$Message" $URL/$Topic
+if [[ ! -z $Attach ]]; then
+    Attach="-H Attach:$Attach"
+fi
+
+if [[ ! -z $Icon ]]; then
+    Icon="-H Icon:$Icon"
+fi
+
+curl $Priority $Title $Tags $Click $Attach $Icon $UParam -d "$Message" $URL/$Topic
+#curl $Priority $Title $Tags $Click $Attach $Icon $UParam -d "$Message" $URL/$Topic