diff --git a/init.sh b/init.sh index 352bd53..42ef898 100755 --- a/init.sh +++ b/init.sh @@ -10,6 +10,7 @@ if [ -d "$WA_REPO" ]; then echo "$WA_REPO does exist, skipping cloning" source $WA_REPO/export_client_name.sh echo "found client name: $CLIENT_NAME" + git_pull else echo -n "client name: " read -r CLIENT_NAME @@ -28,8 +29,9 @@ else ssh-keygen -t rsa -N "$passphrase" -C "deploy_key_$CLIENT_NAME" -f $HOME/.ssh/deploy_key - echo "please upload now pub key into user $CLIENT_NAME keys ..." - echo "firefox https://git.service.wiseadvice.eu/" + echo "please upload now pub key bay logging into user $CLIENT_NAME keys ..." + + echo "firefox https://git.service.wiseadvice.eu/user/settings/keys" echo " " cat $HOME/.ssh/deploy_key.pub @@ -56,16 +58,19 @@ EOT cd $WA_REPO echo "starting to pull into $(pwd)" - git clone git@git.service.wiseadvice.eu:wiseadvice_apps/shared_resources_k8s.git - git clone git@git.service.wiseadvice.eu:wiseadvice_apps/cimp_$CLIENT_NAME.git - git clone git@git.service.wiseadvice.eu:wiseadvice_apps/common_sysadmin.git + git clone git@git.service.wiseadvice.eu:wiseadvice_apps/shared_resources_k8s.git -b main + git clone git@git.service.wiseadvice.eu:wiseadvice_apps/cimp_$CLIENT_NAME.git -b main + git clone git@git.service.wiseadvice.eu:wiseadvice_apps/common_sysadmin.git -b main ln -sf $WA_REPO/common_sysadmin/k8s $HOME/kubeconfs_common ln -sf $WA_REPO/shared_resources_k8s/k8s $HOME/kubeconfs_common - ln -sf $WA_REPO/shared_resources_k8s/manifest.sh .zshrc + ln -sf $WA_REPO/shared_resources_k8s/manifest.sh $HOME/.zshrc ln -sf $WA_REPO/cimp_etops_lgt/k8s $HOME/kubeconfs else echo "Aborting" - + exit 1 fi fi + + +