Skip to content

Commit fc75073

Browse files
Merge pull request #1388 from cypherstack/fix/script-cross-platform-compat
Fix/script cross platform compat
2 parents 9ab5ff6 + 5111cec commit fc75073

4 files changed

Lines changed: 30 additions & 30 deletions

File tree

scripts/app_config/configure_stack_duo.sh

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,11 @@ NEW_PUBSPEC_NAME="stackduo"
1414
PUBSPEC_FILE="${APP_PROJECT_ROOT_DIR}/pubspec.yaml"
1515

1616
# String replacements.
17-
if [[ "$(uname)" == 'Darwin' ]]; then
18-
# macos specific sed
19-
sed -i '' "s/name: PLACEHOLDER/name: ${NEW_PUBSPEC_NAME}/g" "${PUBSPEC_FILE}"
20-
sed -i '' "s/description: PLACEHOLDER/description: ${NEW_NAME}/g" "${PUBSPEC_FILE}"
21-
else
22-
sed -i "s/name: PLACEHOLDER/name: ${NEW_PUBSPEC_NAME}/g" "${PUBSPEC_FILE}"
23-
sed -i "s/description: PLACEHOLDER/description: ${NEW_NAME}/g" "${PUBSPEC_FILE}"
24-
fi
17+
sed -i.bak \
18+
-e "s/name: PLACEHOLDER/name: ${NEW_PUBSPEC_NAME}/g" \
19+
-e "s/description: PLACEHOLDER/description: ${NEW_NAME}/g" \
20+
"${PUBSPEC_FILE}"
21+
rm -f "${PUBSPEC_FILE}.bak"
2522

2623
dart "${APP_PROJECT_ROOT_DIR}/tool/process_pubspec_deps.dart" \
2724
"${PUBSPEC_FILE}" \

scripts/app_config/configure_stack_wallet.sh

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,11 @@ NEW_PUBSPEC_NAME="stackwallet"
1414
PUBSPEC_FILE="${APP_PROJECT_ROOT_DIR}/pubspec.yaml"
1515

1616
# String replacements.
17-
if [[ "$(uname)" == 'Darwin' ]]; then
18-
# macos specific sed
19-
sed -i '' "s/name: PLACEHOLDER/name: ${NEW_PUBSPEC_NAME}/g" "${PUBSPEC_FILE}"
20-
sed -i '' "s/description: PLACEHOLDER/description: ${NEW_NAME}/g" "${PUBSPEC_FILE}"
21-
else
22-
sed -i "s/name: PLACEHOLDER/name: ${NEW_PUBSPEC_NAME}/g" "${PUBSPEC_FILE}"
23-
sed -i "s/description: PLACEHOLDER/description: ${NEW_NAME}/g" "${PUBSPEC_FILE}"
24-
fi
17+
sed -i.bak \
18+
-e "s/name: PLACEHOLDER/name: ${NEW_PUBSPEC_NAME}/g" \
19+
-e "s/description: PLACEHOLDER/description: ${NEW_NAME}/g" \
20+
"${PUBSPEC_FILE}"
21+
rm -f "${PUBSPEC_FILE}.bak"
2522

2623
dart "${APP_PROJECT_ROOT_DIR}/tool/process_pubspec_deps.dart" \
2724
"${PUBSPEC_FILE}" \

scripts/app_config/platforms/macos/platform_config.sh

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,17 @@ for (( i=0; i<=2; i++ )); do
1313
done
1414

1515
# Configure macOS for Duo.
16-
sed -i '' "s/${APP_ID_PLACEHOLDER_CAMEL}/${NEW_APP_ID_CAMEL}/g" "${APP_PROJECT_ROOT_DIR}/${MAC_TF_0}"
17-
sed -i '' "s/${APP_NAME_PLACEHOLDER}/${NEW_NAME}/g" "${APP_PROJECT_ROOT_DIR}/${MAC_TF_0}"
18-
sed -i '' "s/${APP_NAME_PLACEHOLDER}/${NEW_NAME}/g" "${APP_PROJECT_ROOT_DIR}/${MAC_TF_1}"
19-
sed -i '' "s/${APP_NAME_PLACEHOLDER}/${NEW_NAME}/g" "${APP_PROJECT_ROOT_DIR}/${MAC_TF_2}"
20-
sed -i '' "s/${APP_ID_PLACEHOLDER_SNAKE}/${NEW_APP_ID_SNAKE}/g" "${APP_PROJECT_ROOT_DIR}/${MAC_TF_2}"
16+
sed -i.bak \
17+
-e "s/${APP_ID_PLACEHOLDER_CAMEL}/${NEW_APP_ID_CAMEL}/g" \
18+
-e "s/${APP_NAME_PLACEHOLDER}/${NEW_NAME}/g" \
19+
"${APP_PROJECT_ROOT_DIR}/${MAC_TF_0}"
20+
rm -f "${APP_PROJECT_ROOT_DIR}/${MAC_TF_0}.bak"
21+
22+
sed -i.bak "s/${APP_NAME_PLACEHOLDER}/${NEW_NAME}/g" "${APP_PROJECT_ROOT_DIR}/${MAC_TF_1}"
23+
rm -f "${APP_PROJECT_ROOT_DIR}/${MAC_TF_1}.bak"
24+
25+
sed -i.bak \
26+
-e "s/${APP_NAME_PLACEHOLDER}/${NEW_NAME}/g" \
27+
-e "s/${APP_ID_PLACEHOLDER_SNAKE}/${NEW_APP_ID_SNAKE}/g" \
28+
"${APP_PROJECT_ROOT_DIR}/${MAC_TF_2}"
29+
rm -f "${APP_PROJECT_ROOT_DIR}/${MAC_TF_2}.bak"

scripts/app_config/shared/update_version.sh

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
set -x -e
44

@@ -34,13 +34,10 @@ if [ ! -f "$PUBSPEC_FILE" ]; then
3434
exit 1
3535
fi
3636

37-
if [[ "$(uname)" == 'Darwin' ]]; then
38-
# macos specific sed
39-
sed -i '' "s/PLACEHOLDER_V/$VERSION/g" "${PUBSPEC_FILE}"
40-
sed -i '' "s/PLACEHOLDER_B/$BUILD_NUMBER/g" "${PUBSPEC_FILE}"
41-
else
42-
sed -i "s/PLACEHOLDER_V/$VERSION/g" "${PUBSPEC_FILE}"
43-
sed -i "s/PLACEHOLDER_B/$BUILD_NUMBER/g" "${PUBSPEC_FILE}"
44-
fi
37+
sed -i.bak \
38+
-e "s/PLACEHOLDER_V/$VERSION/g" \
39+
-e "s/PLACEHOLDER_B/$BUILD_NUMBER/g" \
40+
"${PUBSPEC_FILE}"
41+
rm -f "${PUBSPEC_FILE}.bak"
4542

4643
echo "Updated $PUBSPEC_FILE with version: $VERSION and build number: $BUILD_NUMBER"

0 commit comments

Comments
 (0)