optimized

leleliu008 · Sep 7, 2024 · 111d921 · 111d921
1 parent 1eb338b
commit 111d921
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ppkg b/ppkg
@@ -6594,10 +6594,10 @@ $PACKAGE_DOTWEAK
         [ -n "$PACKAGE_EXECUTABLES_NEED_SET_RPATH" ] && {
             step "set rpath for executables"
 
-            echo "PACKAGE_EXECUTABLES_NEED_SET_RPATH=$PACKAGE_EXECUTABLES_NEED_SET_RPATH"
-
             PACKAGE_EXECUTABLES_NEED_SET_RPATH="$(printf '%s\n' $PACKAGE_EXECUTABLES_NEED_SET_RPATH | sort | uniq)"
 
+            echo "PACKAGE_EXECUTABLES_NEED_SET_RPATH=$PACKAGE_EXECUTABLES_NEED_SET_RPATH"
+
             for item in $PACKAGE_EXECUTABLES_NEED_SET_RPATH
             do
                 f="$(printf '%s\n' "$item" | cut -d '|' -f1)"
@@ -6611,7 +6611,7 @@ $PACKAGE_DOTWEAK
 
                 RELATIVE_PATH="$(realpath -m --relative-to="${f%/*}" "$X")"
 
-                run install_name_tool -add_rpath "@executable_path/$RELATIVE_PATH" "$f"
+                run install_name_tool -add_rpath "@executable_path/$RELATIVE_PATH" "$f" || true
             done
         }
     else

diff --git a/uppm-shim-apk b/uppm-shim-apk
@@ -8,6 +8,7 @@ package_name_transform_from_uppm_to_apk() {
         gtar)     printf '%s\n' 'tar'       ;;
         gsed)     printf '%s\n' 'sed'       ;;
         gmake)    printf '%s\n' 'make'      ;;
+        gindent)  printf '%s\n' 'indent'    ;;
         golang)   printf '%s\n' 'go'        ;;
         xsltproc) printf '%s\n' 'libxslt'   ;;
         bsdtar)   printf '%s\n' 'libarchive-tools' ;;