Skip to content

Commit e316f66

Browse files
author
Karim Alweheshy
committed
improve naming
1 parent 0d18f40 commit e316f66

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

xcodeproj/internal/templates/custom_toolchain_symlink.sh

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ XCODE_RAW_VERSION=$(xcodebuild -version | head -n 1)
1212

1313
# Define toolchain names
1414
TOOLCHAIN_NAME="${TOOLCHAIN_NAME_BASE}"
15-
HOME_TOOLCHAIN_NAME="BazelRulesXcodeProj ${XCODE_VERSION}"
15+
HOME_TOOLCHAIN_NAME="BazelRulesXcodeProj${XCODE_VERSION}"
1616
USER_TOOLCHAIN_PATH="/Users/$(id -un)/Library/Developer/Toolchains/${HOME_TOOLCHAIN_NAME}.xctoolchain"
1717
BUILT_TOOLCHAIN_PATH="$PWD/$TOOLCHAIN_DIR"
1818

19-
mkdir -p "$TOOLCHAIN_DIR"
19+
mkdir -p "$USER_TOOLCHAIN_PATH"
20+
mkdir -p "$BUILT_TOOLCHAIN_PATH"
2021

2122
while IFS='=' read -r key value; do
2223
value="$PWD/$value"
@@ -63,29 +64,24 @@ cat > "$TOOLCHAIN_DIR/ToolchainInfo.plist" << EOF
6364
<dict>
6465
<key>Aliases</key>
6566
<array>
66-
<string>BazelRulesXcodeProj</string>
67+
<string>${HOME_TOOLCHAIN_NAME}</string>
6768
</array>
6869
<key>CFBundleIdentifier</key>
69-
<string>com.rules_xcodeproj.BazelRulesXcodeProj</string>
70+
<string>com.rules_xcodeproj.BazelRulesXcodeProj.{$XCODE_VERSION}</string>
7071
<key>CompatibilityVersion</key>
7172
<integer>2</integer>
7273
<key>CompatibilityVersionDisplayString</key>
7374
<string>${XCODE_RAW_VERSION}</string>
7475
<key>DisplayName</key>
75-
<string>BazelRulesXcodeProj (${XCODE_RAW_VERSION})</string>
76+
<string>${HOME_TOOLCHAIN_NAME}</string>
7677
<key>ReportProblemURL</key>
7778
<string>https://github.com/MobileNativeFoundation/rules_xcodeproj</string>
7879
<key>ShortDisplayName</key>
79-
<string>BazelRulesXcodeProj</string>
80+
<string>${HOME_TOOLCHAIN_NAME}</string>
8081
<key>Version</key>
8182
<string>0.1.0</string>
8283
</dict>
8384
</plist>
8485
EOF
8586

86-
# Remove existing symlink if present and create a new one in the user directory
87-
if [ -e "$USER_TOOLCHAIN_PATH" ]; then
88-
rm -f "$USER_TOOLCHAIN_PATH"
89-
fi
9087
ln -s "$BUILT_TOOLCHAIN_PATH" "$USER_TOOLCHAIN_PATH"
91-

0 commit comments

Comments
 (0)