Skip to content
This repository has been archived by the owner on Apr 11, 2023. It is now read-only.

Commit

Permalink
Remove duplicated script "fetch-k-charted-pf4.sh"
Browse files Browse the repository at this point in the history
Keep only fetch-k-charted.sh and make it work for pf4
  • Loading branch information
jotak committed Aug 14, 2019
1 parent 3fde492 commit cdde3ff
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 79 deletions.
71 changes: 0 additions & 71 deletions fetch-k-charted-pf4.sh

This file was deleted.

16 changes: 8 additions & 8 deletions fetch-k-charted.sh
Expand Up @@ -8,7 +8,7 @@ if [[ "$#" -lt 1 || "$1" = "--help" ]]; then
echo " $0 https://github.com/kiali/k-charted/pull/44"
echo " $0 https://github.com/kiali/k-charted/pull/44#issuecomment-513183133"
echo ""
echo "This script removes the existing files in node_modules/@kiali/k-charted-pf3, replacing them with a custom build."
echo "This script removes the existing files in node_modules/@kiali/k-charted-pf4, replacing them with a custom build."
echo ""
echo "To restore the K-Charted version defined in package.json, run:"
echo ""
Expand All @@ -18,8 +18,8 @@ if [[ "$#" -lt 1 || "$1" = "--help" ]]; then
fi

if [[ "$1" = "--restore" ]]; then
echo "Restoring @kiali/k-charted-pf3"
yarn upgrade @kiali/k-charted-pf3
echo "Restoring @kiali/k-charted-pf4"
yarn upgrade @kiali/k-charted-pf4
exit
fi

Expand All @@ -42,8 +42,8 @@ fi
echo "Pull request ID: $ID"

# Remove existing module & prepare
rm -rf node_modules/@kiali/k-charted-pf3
mkdir -p node_modules/@kiali/k-charted-pf3 && cd node_modules/@kiali
rm -rf node_modules/@kiali/k-charted-pf4
mkdir -p node_modules/@kiali/k-charted-pf4 && cd node_modules/@kiali

# Clone
git clone https://github.com/kiali/k-charted.git tmp
Expand All @@ -55,9 +55,9 @@ git fetch origin pull/$ID/head:$BRANCHNAME
git checkout $BRANCHNAME

# Build & put eveything in place
make pf3build
mv web/pf3/dist ../k-charted-pf3
mv web/pf3/package.json ../k-charted-pf3
make pf4build
mv web/pf4/dist ../k-charted-pf4
mv web/pf4/package.json ../k-charted-pf4

# Clean
cd ../../..
Expand Down

0 comments on commit cdde3ff

Please sign in to comment.