Skip to content

Modified the way sed version is set #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ckadner merged 11 commits into from
Mar 30, 2022
Merged

Modified the way sed version is set #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7baae3f
Fix incompatible Python packages in mlx-api build (#302)
ckadner Feb 19, 2022
9ef5415
Reject asset upload with invalid `id` (#273)
JAulet Feb 24, 2022
bab47ab
Self-Referential Links Fix for Markdown View (#306)
RRM123 Feb 25, 2022
753c000
Update prerequisites in with-kubeflow deployment doc (#307)
rafvasq Feb 25, 2022
4aa7a51
Bump follow-redirects in /dashboard/origin-mlx/server (#296)
dependabot[bot] Feb 25, 2022
140d05f
Add dev doc links to CONTRIBUTING.md (#312)
rafvasq Mar 11, 2022
aba3a61
Changes to the way sed is checked
krishnakumar27 Mar 2, 2022
64a225a
Fixes the references to latest kfctl release (#311)
rafvasq Mar 16, 2022
b05742a
Do not verify links in project dependencies (#320)
ckadner Mar 18, 2022
ae0d0de
Add navigation and description table of docs (#314)
rafvasq Mar 18, 2022
dce67d5
Merge branch 'test_merge_of_merges' into main
ckadner Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions api/codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,13 @@ swagger-codegen generate -i swagger/swagger.yaml -l python-flask -o server 2>&1
# set interactive mode to enable defining a gsed alias
shopt -s expand_aliases

# we use sed to make in-file text replacements, but sed works differently on macOS and Linux
if [[ "$OSTYPE" == "linux-gnu"* ]]; then # Linux
alias gsed="sed -i"
elif [[ "$OSTYPE" == "darwin"* ]]; then # macOS
alias gsed="sed -i ''"
elif [[ "$OSTYPE" == "cygwin" ]]; then # POSIX compatible emulation for Windows
alias gsed="sed -i"
elif [[ "$OSTYPE" == "msys"* ]]; then # Git Bash (Windows)
alias gsed="sed -i"
# we use sed to make in-file text replacements, but sed works differently depending on the version
if ! sed -i '1s/^/test/' $(mktemp) 2> /dev/null; then
# macOS (BSD) version of sed
alias gsed="sed -i ''"
else
echo "FAILED. OS not compatible with script '${BASH_SOURCE[0]}'"
exit 1
# POSIX compliant version of sed
alias gsed="sed -i"
fi
export gsed

Expand Down
17 changes: 7 additions & 10 deletions tools/bash/add_license_headers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,15 @@
# set interactive mode to enable defining a gsed alias
shopt -s expand_aliases

if [[ "$OSTYPE" == "linux-gnu"* ]]; then # Linux
alias gsed="sed -i"
elif [[ "$OSTYPE" == "darwin"* ]]; then # macOS
alias gsed="sed -i ''"
elif [[ "$OSTYPE" == "cygwin" ]]; then # POSIX compatible emulation for Windows
alias gsed="sed -i"
elif [[ "$OSTYPE" == "msys"* ]]; then # Git Bash (Windows)
alias gsed="sed -i"
# we use sed to make in-file text replacements, but sed works differently depending on the version
if ! sed -i '1s/^/test/' $(mktemp) 2> /dev/null; then
# macOS (BSD) version of sed
alias gsed="sed -i ''"
else
echo "FAILED. OS not compatible with script '${BASH_SOURCE[0]}'"
exit 1
# POSIX compliant version of sed
alias gsed="sed -i"
fi

export gsed

hash_comment () {
Expand Down