update charles

charles/package.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-origin_app_name="charles-proxy"
+origin_app_name="charles-proxy5"
 app_name="charles"
 tmp_dir="/tmp/${app_name}_tmp"
-version="4.6.7"
+version="5.0.1"
 release="v${version}"
 replace_name="charles-nj"
 patch="Architecture: amd64"
@@ -49,8 +49,8 @@ source_dir="${tmp_dir}/${app_name}"
 
 
 echo "下载官方原包..."
-wget $deb_url -O "${tmp_dir}/${app_name}.deb"
-# cp ~/Downloads/${origin_app_name}_4.6.5_${_type}.deb "${tmp_dir}/${app_name}.deb"
+# wget $deb_url -O "${tmp_dir}/${app_name}.deb"
+cp ~/Downloads/${origin_app_name}_${version}_${_type}.deb "${tmp_dir}/${app_name}.deb"
 
 echo "下载完成, 解包中..."
 dpkg-deb -R "${tmp_dir}/${app_name}.deb" "${tmp_dir}/${app_name}"
@@ -70,7 +70,7 @@ echo """
 #
 
 # Find Charles lib directory
-CHARLES_LIB="/usr/lib/charles-proxy"
+CHARLES_LIB="/usr/lib/${origin_app_name}"
 GDK_SCALE=1
 
 java_bin=java
@@ -82,50 +82,30 @@ fi
 
 # HiDPI
 
-if [[ \$DESKTOP_SESSION ]]; then
-  
-  case \$DESKTOP_SESSION in
-    xfce)
-      GDK_SCALE=\$(xfconf-query -c xsettings -p /Gdk/WindowScalingFactor)
-      ;;
-    cinnamon)
-      GDK_SCALE=\$(/usr/bin/gsettings get org.cinnamon.desktop.interface scaling-factor | awk '{print \$2}')
-      ;;
-    gnome)
+if [ -x /usr/bin/gsettings ]; then
   GDK_SCALE=\$(/usr/bin/gsettings get org.gnome.desktop.interface scaling-factor | awk '{print \$2}')
-    ;;
-  esac
-
-elif [[ \$GNOME_DESKTOP_SESSION_ID ]]; then
-
-  GDK_SCALE=\$(/usr/bin/gsettings get org.gnome.desktop.interface scaling-factor | awk '{print \$2}')
-
-else
-
-  if [ -x /usr/bin/xfconf-query ]; then
-    GDK_SCALE=\$(xfconf-query -c xsettings -p /Gdk/WindowScalingFactor)
-  elif [ -x /usr/bin/gsettings ]; then
-    GDK_SCALE=\$(/usr/bin/gsettings get org.gnome.desktop.interface scaling-factor | awk '{print \$2}')
-  fi
+  export GDK_SCALE
 fi
 
-export GDK_SCALE
-
 # Launch Charles
 \$java_bin \\
+  -XX:+UseZGC \\
   -Xmx1024M \\
   -Dcharles.config="~/.charles.config" \\
-  -Djava.library.path="\$CHARLES_LIB" \\
-  -Djdk.gtk.verbose=true \\
-  -Djdk.gtk.version=3 \\
-  -jar \$CHARLES_LIB/charles.jar \\
+  -Djava.library.path=\"\$CHARLES_LIB\" \\
+  --add-opens java.base/sun.security.ssl=com.charlesproxy \\
+  --add-opens java.desktop/java.awt.event=com.charlesproxy \\
+  --add-opens java.base/java.io=com.charlesproxy \\
+  --add-modules com.jthemedetector,com.formdev.flatlaf \\
+  --module-path \"\$CHARLES_LIB\" \\
+  -m com.charlesproxy \\
   \$*
 """ > ./unpack/usr/bin/charles
 
 chmod +x ./unpack/usr/bin/charles
-rm ./unpack/usr/bin/charles4
+rm ./unpack/usr/bin/charles5
 
-sed -i -e 's/charles4/charles/; s/com-xk72-charles-gui-MainWithClassLoader/Charles/' ./unpack/usr/share/applications/charles-proxy.desktop
+sed -i -e 's/charles5/charles/; s/com-charlesproxy-main-MainWithClassLoader/Charles/' ./unpack/usr/share/applications/${origin_app_name}.desktop
 
 echo "文件复制完成..."
 

dbgate/package.sh

@@ -2,7 +2,7 @@
 
 app_name="dbgate"
 
-version="6.4.2"
+version="6.6.0"
 release="v${version}"