浏览代码

Get domain name

Bob Mottram 8 年前
父节点
当前提交
0ae213a7ea
共有 3 个文件被更改,包括 14 次插入3 次删除
  1. 2
    0
      src/freedombone-app-gnusocial
  2. 7
    3
      src/freedombone-app-postactiv
  3. 5
    0
      src/freedombone-utils-gnusocialtools

+ 2
- 0
src/freedombone-app-gnusocial 查看文件

244
 }
244
 }
245
 
245
 
246
 function gnusocial_set_background_image {
246
 function gnusocial_set_background_image {
247
+    GNUSOCIAL_DOMAIN_NAME=$(get_completion_param "gnusocial domain")
248
+
247
     data=$(tempfile 2>/dev/null)
249
     data=$(tempfile 2>/dev/null)
248
     trap "rm -f $data" 0 1 2 5 15
250
     trap "rm -f $data" 0 1 2 5 15
249
     dialog --title $"GNU Social" \
251
     dialog --title $"GNU Social" \

+ 7
- 3
src/freedombone-app-postactiv 查看文件

228
 }
228
 }
229
 
229
 
230
 function postactiv_set_background_image {
230
 function postactiv_set_background_image {
231
+    POSTACTIV_DOMAIN_NAME=$(get_completion_param "postactiv domain")
232
+
231
     data=$(tempfile 2>/dev/null)
233
     data=$(tempfile 2>/dev/null)
232
     trap "rm -f $data" 0 1 2 5 15
234
     trap "rm -f $data" 0 1 2 5 15
233
     dialog --title $"PostActiv" \
235
     dialog --title $"PostActiv" \
240
             if [ ${#temp_background} -gt 0 ]; then
242
             if [ ${#temp_background} -gt 0 ]; then
241
                 POSTACTIV_BACKGROUND_IMAGE_URL="$temp_background"
243
                 POSTACTIV_BACKGROUND_IMAGE_URL="$temp_background"
242
                 write_config_param "POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_BACKGROUND_IMAGE_URL"
244
                 write_config_param "POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_BACKGROUND_IMAGE_URL"
243
-                pleroma_set_background_image_from_url "$POSTACTIV_DOMAIN_NAME" "$POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_TITLE"
244
-                dialog --title $"Set PostActiv background" \
245
-                       --msgbox $"The background image has been set" 6 60
245
+
246
+                if [[ $(pleroma_set_background_image_from_url "$POSTACTIV_DOMAIN_NAME" "$POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_TITLE" | tail -n 1) == "0" ]]; then
247
+                    dialog --title $"Set PostActiv background" \
248
+                           --msgbox $"The background image has been set" 6 60
249
+                fi
246
             fi
250
             fi
247
            ;;
251
            ;;
248
     esac
252
     esac

+ 5
- 0
src/freedombone-utils-gnusocialtools 查看文件

39
     url="$2"
39
     url="$2"
40
     title="$3"
40
     title="$3"
41
 
41
 
42
+    if [ ${#domain_name} -eq 0 ]; then
43
+        echo "1"
44
+        return
45
+    fi
46
+
42
     ext=
47
     ext=
43
     if [ ${#url} -gt 0 ]; then
48
     if [ ${#url} -gt 0 ]; then
44
         if [[ "$url" == *".jpeg" || "$url" == *".jpg" ]]; then
49
         if [[ "$url" == *".jpeg" || "$url" == *".jpg" ]]; then