fix #1693

vernesong · Oct 10, 2021 · 0cfcdbe · 0cfcdbe
1 parent ba168bb
commit 0cfcdbe
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/luci-app-openclash/root/etc/init.d/openclash b/luci-app-openclash/root/etc/init.d/openclash
@@ -895,15 +895,18 @@ ruby -ryaml -E UTF-8 -e "
          Value['proxies'] = Value['Proxy']
          Value.delete('Proxy')
          puts '${LOGTIME} Warning: Proxy is no longer used. Auto replaced by proxies'
-      elsif Value.key?('Proxy Group') then
+      end
+      if Value.key?('Proxy Group') then
          Value['proxy-groups'] = Value['Proxy Group']
          Value.delete('Proxy Group')
          puts '${LOGTIME} Warning: Proxy Group is no longer used. Auto replaced by proxy-groups'
-      elsif Value.key?('Rule') then
+      end
+      if Value.key?('Rule') then
          Value['rules'] = Value['Rule']
          Value.delete('Rule')
          puts '${LOGTIME} Warning: Rule is no longer used. Auto replaced by rules'
-      elsif Value.key?('rule-provider') then
+      end
+      if Value.key?('rule-provider') then
          Value['rule-providers'] = Value['rule-provider']
          Value.delete('rule-provider')
          puts '${LOGTIME} Warning: rule-provider is no longer used. Auto replaced by rule-providers'

diff --git a/luci-app-openclash/root/usr/share/openclash/openclash.sh b/luci-app-openclash/root/usr/share/openclash/openclash.sh
@@ -248,15 +248,18 @@ field_name_check()
             Value['proxies'] = Value['Proxy']
             Value.delete('Proxy')
             puts '${LOGTIME} Warning: Proxy is no longer used. Auto replaced by proxies'
-         elsif Value.key?('Proxy Group') then
+         end
+         if Value.key?('Proxy Group') then
             Value['proxy-groups'] = Value['Proxy Group']
             Value.delete('Proxy Group')
             puts '${LOGTIME} Warning: Proxy Group is no longer used. Auto replaced by proxy-groups'
-         elsif Value.key?('Rule') then
+         end
+         if Value.key?('Rule') then
             Value['rules'] = Value['Rule']
             Value.delete('Rule')
             puts '${LOGTIME} Warning: Rule is no longer used. Auto replaced by rules'
-         elsif Value.key?('rule-provider') then
+         end
+         if Value.key?('rule-provider') then
             Value['rule-providers'] = Value['rule-provider']
             Value.delete('rule-provider')
              puts '${LOGTIME} Warning: rule-provider is no longer used. Auto replaced by rule-providers'