From 01de2d230ce8de8e8a00b017cb1d20d59dd26599 Mon Sep 17 00:00:00 2001 From: Mihai Blaga Date: Mon, 31 Jul 2023 18:12:52 +0300 Subject: [PATCH 1/2] fix shell script on ubuntu --- packages/create/package.json | 2 +- packages/create/tools/overrideRNScrollView.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/create/package.json b/packages/create/package.json index 75e48085..271161e2 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -9,7 +9,7 @@ "clean": "rm -rf ./lib && rm -rf tsconfig.tsbuildinfo", "compile": "tsc -b tsconfig.json", "watch": "tsc --watch --preserveWatchOutput", - "postinstall": "sh tools/overrideRNScrollView.sh" + "postinstall": "bash tools/overrideRNScrollView.sh" }, "files": [ "lib", diff --git a/packages/create/tools/overrideRNScrollView.sh b/packages/create/tools/overrideRNScrollView.sh index 36fc84d3..2a032893 100644 --- a/packages/create/tools/overrideRNScrollView.sh +++ b/packages/create/tools/overrideRNScrollView.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail @@ -10,13 +10,13 @@ MIN_RN_VERSION="68" echo "${RN_DIR}/package.json" if [ -e "${RN_DIR}/package.json" ] ; then - PACKAGE_VERSION=$(cat ${RN_DIR}/package.json \ + PACKAGE_VERSION=$(cat "${RN_DIR}"/package.json \ | grep version \ | head -1 \ | awk -F: '{print $2 }' \ | sed 's/[",]//g') - if [ -e $RN_SCROLLVIEW_DIR ] && [ "${PACKAGE_VERSION:3:2}" -ge "${MIN_RN_VERSION}" ] ; then + if [ -e "$RN_SCROLLVIEW_DIR" ] && [ "${PACKAGE_VERSION:3:2}" -ge "${MIN_RN_VERSION}" ] ; then sed -i '' "s|'RCTScrollView'|Platform.isTV \&\& Platform.OS === 'android' ? 'RCTScrollViewTV' : 'RCTScrollView'|" "${RN_SCROLLVIEW_DIR}/ScrollViewNativeComponent.js" echo "Overriding done." else From d71bd63e242702960c346e121d0af1533d373106 Mon Sep 17 00:00:00 2001 From: Mihai Blaga Date: Mon, 31 Jul 2023 18:16:02 +0300 Subject: [PATCH 2/2] removed debugging log --- packages/create/tools/overrideRNScrollView.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/create/tools/overrideRNScrollView.sh b/packages/create/tools/overrideRNScrollView.sh index 2a032893..9e1f1283 100644 --- a/packages/create/tools/overrideRNScrollView.sh +++ b/packages/create/tools/overrideRNScrollView.sh @@ -7,8 +7,6 @@ RN_DIR="${CREATE_DIR}/../../../react-native" RN_SCROLLVIEW_DIR="${RN_DIR}/Libraries/Components/ScrollView" MIN_RN_VERSION="68" -echo "${RN_DIR}/package.json" - if [ -e "${RN_DIR}/package.json" ] ; then PACKAGE_VERSION=$(cat "${RN_DIR}"/package.json \ | grep version \