optimized

Signed-off-by: leleliu008 <leleliu008@gmail.com>
leleliu008 · Oct 16, 2023 · e9062a0 · e9062a0
1 parent 2bdeb92
commit e9062a0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/wsl.yml b/.github/workflows/wsl.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distribution: [Ubuntu-22.04, Debian, openSUSE-Leap-15.2]
+        distribution: [Ubuntu-22.04, Debian]
 
     defaults:
       run:

diff --git a/README.md b/README.md
@@ -64,7 +64,6 @@ docker start ndk-pkg
 
 ```bash
 docker exec -it ndk-pkg ndk-pkg setup
-docker exec -it ndk-pkg ndk-pkg upgrade-self
 docker exec -it ndk-pkg ndk-pkg update
 ```
 

diff --git a/ndk-pkg b/ndk-pkg
@@ -2530,7 +2530,7 @@ __fetch_resources_of_the_given_package() {
   __create_google_prefab_for_the_given_installed_package() {
     __load_receipt_of_the_given_package "$1"
 
-    PACKAGE_NAME="$PACKAGE_RECEIPT_PKGNAME"
+    PACKAGE_NAME="${PACKAGE_RECEIPT_PKGNAME%@*}"
 
     TARGET_ANDROID_API="$PACKAGE_RECEIPT_BUILT_FOR_ANDROID_API"
     TARGET_ANDROID_ABI="$PACKAGE_RECEIPT_BUILT_FOR_ANDROID_ABI"
@@ -2809,6 +2809,8 @@ EOF
 
     #########################################################################################
 
+    PACKAGE_NAME="${PACKAGE_NAME%@*}"
+
     unset JAVA_PACKAGE_NAME
 
     # java package name characters [a-z0-9_.]
@@ -4635,7 +4637,7 @@ __install_the_given_packages() {
         ruby)
             NATIVE_PACKAGE_SRC_URL='https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.2.tar.gz'
             NATIVE_PACKAGE_SRC_SHA='96c57558871a6748de5bc9f274e93f4b5aad06cd8f37befa0e8d94e7b8a423bc'
-            NATIVE_PACKAGE_DEPENDENCIES='zlib libyaml libffi'
+            NATIVE_PACKAGE_DEPENDENCIES='zlib libyaml libffi openssl'
             NATIVE_PACKAGE_BUILD_SYSTEM_NAME='configure'
             NATIVE_PACKAGE_BUILD_CONFIG_ARGS='--disable-dependency-tracking --enable-static --enable-shared --disable-docs'
             ;;
@@ -8954,7 +8956,7 @@ main() {
 
     NDKPKG="$CURRENT_SCRIPT_FILEPATH"
 
-    NDKPKG_VERSION=0.6.23
+    NDKPKG_VERSION=0.6.24
 
     NDKPKG_ZSH_COMPLETION_SCRIPT_URL='https://raw.githubusercontent.com/leleliu008/ndk-pkg/master/ndk-pkg-zsh-completion'
     NDKPKG_OFFICAL_FORMULA_REPO_URL='https://github.com/leleliu008/ndk-pkg-formula-repository-offical-core.git'
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,6 @@ docker start ndk-pkg @@
     ```bash
     docker exec -it ndk-pkg ndk-pkg setup
-    docker exec -it ndk-pkg ndk-pkg upgrade-self
     docker exec -it ndk-pkg ndk-pkg update
     ```
@@ Expand Down @@