Forráskód Böngészése

move and make more bins exe

Kevin Bradley 3 éve
szülő
commit
e0ffde11b4
1 módosított fájl, 18 hozzáadás és 3 törlés
  1. 18 3
      the_memo2.sh

+ 18 - 3
the_memo2.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 BUILD_ROOT="$(pwd)"
 ROOT_LOG_FOLDER="$BUILD_ROOT/Logs"
@@ -316,7 +316,8 @@ patchBash() {
 
 patchDpkg() {
     if [[ "$PLATFORM" == "AppleTVOS" ]]; then
-        sed -i -- "s|#define ARCHITECTURE \"darwin-arm\"|#define ARCHITECTURE \"$PLATFORM_LOWER-$ARCH\"|" config.h
+        sed -i -- "s|#define ARCHITECTURE \"darwin-arm64\"|#define ARCHITECTURE \"$PLATFORM_LOWER-$ARCH\"|" config.h
+            sed -i -- "s|#define ARCHITECTURE_OS \"darwin\"|#define ARCHITECTURE_OS \"$PLATFORM_LOWER\"|" config.h
             sed -i -- 's|gtar|tar|' config.h
     fi
 }
@@ -554,8 +555,22 @@ buildNcurses() {
         export HOST="arm"
         buildProduct $PKG_NAME
         export HOST="aarch64"
+        mv "$SKEL_PREFIX/$ROOT_PREFIX/bin/arm-apple-darwin-captoinfo" "$SKEL_PREFIX/$ROOT_PREFIX/bin/captoinfo"
+        mv "$SKEL_PREFIX/$ROOT_PREFIX/bin/arm-apple-darwin-clear" "$SKEL_PREFIX/$ROOT_PREFIX/bin/clear"
+        mv "$SKEL_PREFIX/$ROOT_PREFIX/bin/arm-apple-darwin-infocmp" "$SKEL_PREFIX/$ROOT_PREFIX/bin/infocmp"
+        mv "$SKEL_PREFIX/$ROOT_PREFIX/bin/arm-apple-darwin-infotocap" "$SKEL_PREFIX/$ROOT_PREFIX/bin/infotocap"
+        mv "$SKEL_PREFIX/$ROOT_PREFIX/bin/arm-apple-darwin-reset" "$SKEL_PREFIX/$ROOT_PREFIX/bin/reset"
+        mv "$SKEL_PREFIX/$ROOT_PREFIX/bin/arm-apple-darwin-tabs" "$SKEL_PREFIX/$ROOT_PREFIX/bin/tabs"
+        mv "$SKEL_PREFIX/$ROOT_PREFIX/bin/arm-apple-darwin-tic" "$SKEL_PREFIX/$ROOT_PREFIX/bin/tic"
+        mv "$SKEL_PREFIX/$ROOT_PREFIX/bin/arm-apple-darwin-toe" "$SKEL_PREFIX/$ROOT_PREFIX/bin/toe"
+        mv "$SKEL_PREFIX/$ROOT_PREFIX/bin/arm-apple-darwin-tput" "$SKEL_PREFIX/$ROOT_PREFIX/bin/tput"
+        mv "$SKEL_PREFIX/$ROOT_PREFIX/bin/arm-apple-darwin-tset" "$SKEL_PREFIX/$ROOT_PREFIX/bin/tset"
+
+        codesign "$SKEL_PREFIX/$ROOT_PREFIX/bin/captoinfo"
         codesign "$SKEL_PREFIX/$ROOT_PREFIX/bin/clear"
         codesign "$SKEL_PREFIX/$ROOT_PREFIX/bin/infocmp"
+        codesign "$SKEL_PREFIX/$ROOT_PREFIX/bin/infotocap"
+        codesign "$SKEL_PREFIX/$ROOT_PREFIX/bin/reset"
         codesign "$SKEL_PREFIX/$ROOT_PREFIX/bin/tabs"
         codesign "$SKEL_PREFIX/$ROOT_PREFIX/bin/tic"
         codesign "$SKEL_PREFIX/$ROOT_PREFIX/bin/toe"
@@ -1250,7 +1265,7 @@ downloadDpkg() {
 
 #dpkg
 buildDpkg() {
-    PKG_NAME="dpkg-1.18.23"
+    PKG_NAME="dpkg"
     LOG_FILE="$ROOT_LOG_FOLDER/$PKG_NAME.log"
     touch $LOG_FILE
     checkBuilt $PKG_NAME