Skip to content
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

*: polish the trust key notice #2475

Merged
merged 2 commits into from
Nov 15, 2024
Merged

*: polish the trust key notice #2475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62f8ca9
*: polish the trust key notice
breezewish Nov 12, 2024
3856938
Polish install script
breezewish Nov 12, 2024
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
12 changes: 8 additions & 4 deletions cmd/mirror.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,9 @@ func newMirrorShowCmd() *cobra.Command {
// the `mirror set` sub command
func newMirrorSetCmd() *cobra.Command {
var (
root string
reset bool
root string
reset bool
silent bool
)
cmd := &cobra.Command{
Use: "set <mirror-addr>",
Expand Down Expand Up @@ -198,12 +199,15 @@ The root manifest in $TIUP_HOME will be replaced with the one in given repositor
log.Errorf("Failed to set mirror: %s\n", err.Error())
return err
}
fmt.Printf("Successfully set mirror to %s\n", addr)
if !silent {
fmt.Printf("Successfully set mirror to %s\n", addr)
}
return nil
},
}
cmd.Flags().StringVarP(&root, "root", "r", root, "Specify the path of `root.json`")
cmd.Flags().BoolVar(&reset, "reset", false, "Reset mirror to use the default address.")
cmd.Flags().BoolVar(&silent, "silent", false, "Skip non-warning messages.")

return cmd
}
Expand Down Expand Up @@ -955,7 +959,7 @@ func newMirrorCloneCmd() *cobra.Command {
cmd := &cobra.Command{
Use: "clone <target-dir> [global version]",
Example: ` tiup mirror clone /path/to/local --arch amd64,arm64 --os linux,darwin # Specify the architectures and OSs
tiup mirror clone /path/to/local --os linux v6.1.0 v5.4.0 # Specify multiple versions
tiup mirror clone /path/to/local --os linux v6.1.0 v5.4.0 # Specify multiple versions
tiup mirror clone /path/to/local --full # Build a full local mirror
tiup mirror clone /path/to/local --tikv v4 --prefix # Specify the version via prefix
tiup mirror clone /path/to/local --tidb all --pd all # Download all version for specific component`,
Expand Down
29 changes: 19 additions & 10 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,15 @@ fi

chmod 755 "$bin_dir/tiup"

"$bin_dir/tiup" mirror set $repo
"$bin_dir/tiup" mirror set $repo --silent

bold=$(tput bold 2>/dev/null)
green=$(tput setaf 2 2>/dev/null)
cyan=$(tput setaf 6 2>/dev/null)
sgr0=$(tput sgr0 2>/dev/null)

echo

# Refrence: https://stackoverflow.com/questions/14637979/how-to-permanently-set-path-on-linux-unix
shell=$(echo $SHELL | awk 'BEGIN {FS="/";} { print $NF }')
echo "Detected shell: ${bold}$shell${sgr0}"
Expand All @@ -82,16 +86,21 @@ else
PROFILE=${HOME}/.profile
fi
echo "Shell profile: ${bold}$PROFILE${sgr0}"

echo
echo "${bold}${green}✔ ${sgr0}Installed in ${bold}$bin_dir/tiup${sgr0}"
case :$PATH: in
*:$bin_dir:*) echo "PATH already contains $bin_dir" ;;
*:$bin_dir:*) echo "${bold}${green}✔ ${sgr0}tiup PATH is already set, skip" ;;
*) printf '\nexport PATH=%s:$PATH\n' "$bin_dir" >> "$PROFILE"
echo "$PROFILE has been modified to add tiup to PATH"
echo "open a new terminal or ${bold}source ${PROFILE}${sgr0} to use it"
echo "${bold}${green}✔ ${sgr0}Added tiup PATH into ${bold}${shell}${sgr0} profile"
;;
esac

echo "Installed path: ${bold}$bin_dir/tiup${sgr0}"
echo "==============================================="
echo "Have a try: ${bold}tiup playground${sgr0}"
echo "==============================================="
echo
echo "${bold}tiup is installed now${sgr0} 🎉"
echo
echo Next step:
echo
echo " 1: To make PATH change effective, restart your shell or execute:"
echo " ${bold}${cyan}source ${PROFILE}${sgr0}"
echo
echo " 2: Start a local TiDB for development:"
echo " ${bold}${cyan}tiup playground${sgr0}"
36 changes: 21 additions & 15 deletions pkg/cluster/template/install/local_install.sh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,17 @@ fi

chmod 755 "$bin_dir/tiup"

# telemetry is not needed for offline installations
"$bin_dir/tiup" telemetry disable
breezewish marked this conversation as resolved.
Show resolved Hide resolved

# set mirror to the local path
"$bin_dir/tiup" mirror set ${script_dir}
"$bin_dir/tiup" mirror set ${script_dir} --silent

bold=$(tput bold 2>/dev/null)
green=$(tput setaf 2 2>/dev/null)
cyan=$(tput setaf 6 2>/dev/null)
sgr0=$(tput sgr0 2>/dev/null)

# Reference: https://stackoverflow.com/questions/14637979/how-to-permanently-set-path-on-linux-unix
echo

# Refrence: https://stackoverflow.com/questions/14637979/how-to-permanently-set-path-on-linux-unix
shell=$(echo $SHELL | awk 'BEGIN {FS="/";} { print $NF }')
echo "Detected shell: ${bold}$shell${sgr0}"
if [ -f "${HOME}/.${shell}_profile" ]; then
Expand All @@ -103,18 +104,23 @@ else
PROFILE=${HOME}/.profile
fi
echo "Shell profile: ${bold}$PROFILE${sgr0}"

echo
echo "${bold}${green}✔ ${sgr0}Installed in ${bold}$bin_dir/tiup${sgr0}"
case :$PATH: in
*:$bin_dir:*) : "PATH already contains $bin_dir" ;;
*) printf 'export PATH=%s:$PATH\n' "$bin_dir" >> "$PROFILE"
echo "$PROFILE has been modified to to add tiup to PATH"
echo "open a new terminal or ${bold}source ${PROFILE}${sgr0} to use it"
*:$bin_dir:*) echo "${bold}${green}✔ ${sgr0}tiup PATH is already set, skip" ;;
*) printf '\nexport PATH=%s:$PATH\n' "$bin_dir" >> "$PROFILE"
echo "${bold}${green}✔ ${sgr0}Added tiup PATH into ${bold}${shell}${sgr0} profile"
;;
esac
echo
echo "${bold}tiup is installed now${sgr0} 🎉"
echo
echo Next step:
echo
echo " 1: To make PATH change effective, restart your shell or execute:"
echo " ${bold}${cyan}source ${PROFILE}${sgr0}"
echo
echo " 2: Start a local TiDB for development:"
echo " ${bold}${cyan}tiup playground${sgr0}"

echo "Installed path: ${bold}$bin_dir/tiup${sgr0}"
echo "==============================================="
echo "1. ${bold}source ${PROFILE}${sgr0}"
echo "2. Have a try: ${bold}tiup playground${sgr0}"
echo "==============================================="
`
6 changes: 3 additions & 3 deletions pkg/localdata/profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,9 @@ func (p *Profile) ResetMirror(addr, root string) error {

// Only cache remote mirror
if strings.HasPrefix(addr, "http") && root != localRoot {
if strings.HasPrefix(root, "http") {
fmt.Printf("WARN: adding root certificate via internet: %s\n", root)
fmt.Printf("You can revoke this by remove %s\n", localRoot)
if strings.HasPrefix(root, "http") && !strings.HasPrefix(root, "https") {
fmt.Printf("WARN: Trusting component distribution key via insecure Internet: %s\n", root)
fmt.Printf(" To revoke TiUP's trust, remove this file: %s\n", localRoot)
}
_ = utils.Copy(p.Path("bin", "root.json"), localRoot)
}
Expand Down
Loading