From 2a123594c9834eea044caed037c75801ee64b107 Mon Sep 17 00:00:00 2001 From: Op52 Date: Sun, 16 Dec 2018 03:59:41 -0500 Subject: [PATCH] change unix --- setup1_apt.sh | 20 +++++------ setup2_gpg.sh | 34 +++++++++--------- setup3_ubuntu_pkg.sh | 18 +++++----- setupo_wsl.sh | 86 ++++++++++++++++++++++---------------------- 4 files changed, 79 insertions(+), 79 deletions(-) diff --git a/setup1_apt.sh b/setup1_apt.sh index 4af4449..342ace8 100644 --- a/setup1_apt.sh +++ b/setup1_apt.sh @@ -1,10 +1,10 @@ -#!/bin/bash - -# create apt snapshot and script for manually installed packages -echo "Creating APT snapshot..." -mkdir ~/.pkgsrc -apt-mark showmanual > ~/.pkgsrc/pkgs_org -echo "Creating APT script..." -cp ./_show_pkgs ~/show_pkgs -chmod +x ~/show_pkgs - +#!/bin/bash + +# create apt snapshot and script for manually installed packages +echo "Creating APT snapshot..." +mkdir ~/.pkgsrc +apt-mark showmanual > ~/.pkgsrc/pkgs_org +echo "Creating APT script..." +cp ./_show_pkgs ~/show_pkgs +chmod +x ~/show_pkgs + diff --git a/setup2_gpg.sh b/setup2_gpg.sh index ef3fa92..07f5380 100644 --- a/setup2_gpg.sh +++ b/setup2_gpg.sh @@ -1,18 +1,18 @@ -#!/bin/bash - -KEY_GRIP=5351806D27F0E18166370620F4ED903E973C03C6 - -echo "Importing keys" -gpg --import gpgkey.pub -gpg --import gpgkey.pri - -echo "Adding ssh support" -echo "enable-ssh-support" >> $HOME/.gnupg/gpg-agent.conf -cat _gpg_bashrc >> $HOME/.bashrc -echo $KEY_GRIP >> $HOME/.gnupg/sshcontrol - -echo "Restarting gpg-agent" -gpgconf --kill gpg-agent -gpgconf --launch gpg-agent - +#!/bin/bash + +KEY_GRIP=5351806D27F0E18166370620F4ED903E973C03C6 + +echo "Importing keys" +gpg --import gpgkey.pub +gpg --import gpgkey.pri + +echo "Adding ssh support" +echo "enable-ssh-support" >> $HOME/.gnupg/gpg-agent.conf +cat _gpg_bashrc >> $HOME/.bashrc +echo $KEY_GRIP >> $HOME/.gnupg/sshcontrol + +echo "Restarting gpg-agent" +gpgconf --kill gpg-agent +gpgconf --launch gpg-agent + echo "Please use \"gpg --editkeys key_id\" to trust your keys" \ No newline at end of file diff --git a/setup3_ubuntu_pkg.sh b/setup3_ubuntu_pkg.sh index 564d711..87daf1e 100644 --- a/setup3_ubuntu_pkg.sh +++ b/setup3_ubuntu_pkg.sh @@ -1,10 +1,10 @@ -#!/bin/bash - -echo "Installing packages" -sudo add-apt-repository -y -u ppa:snwh/ppa -sudo add-apt-repository -y ppa:graphics-drivers -sudo apt-get -y update -sudo apt-get -y upgrade -sudo apt install -y vim arc-theme gnome-tweak-tool paper-icon-theme ibus-pinyin clang lld qemu cmake nasm grub-pc-bin bochs bochs-sdl xorriso -sudo apt-get -y autoremove +#!/bin/bash + +echo "Installing packages" +sudo add-apt-repository -y -u ppa:snwh/ppa +sudo add-apt-repository -y ppa:graphics-drivers +sudo apt-get -y update +sudo apt-get -y upgrade +sudo apt install -y vim arc-theme gnome-tweak-tool paper-icon-theme ibus-pinyin clang lld qemu cmake nasm grub-pc-bin bochs bochs-sdl xorriso +sudo apt-get -y autoremove ibus restart \ No newline at end of file diff --git a/setupo_wsl.sh b/setupo_wsl.sh index 9098fe8..7ce9135 100644 --- a/setupo_wsl.sh +++ b/setupo_wsl.sh @@ -1,44 +1,44 @@ -#!/bin/bash - -if [[ -z "$1" ]] ; then -echo "ERROR - invalid arguments" -echo "Usage: win_username" -echo "win_username: Required. The username of Windows." -exit 1 -fi - -#setup WSL - -WSL_USER=$1 -SSHD_PORT=77 -SSHD_FILE=/etc/ssh/sshd_config -SUDOERS_FILE=/etc/sudoers - -sudo apt-get update -sudo apt-get install -y openssh-server build-essential cmake gdb - -# 1.1. configure sshd -sudo sed -i '/^Port/ d' $SSHD_FILE -sudo sed -i '/^PasswordAuthentication/ d' $SSHD_FILE -echo "# configured for CLion" | sudo tee -a $SSHD_FILE -echo "Port ${SSHD_PORT}" | sudo tee -a $SSHD_FILE -echo "PasswordAuthentication yes" | sudo tee -a $SSHD_FILE - -# 1.2. apply new settings -sudo ssh-keygen -A -sudo service ssh --full-restart -sudo systemctl enable ssh - -echo "# ENV VAR for WSL" >> ~/.bashrc -echo "export WHOME=\"/mnt/c/Users/$WSL_USER\"" >> ~/.bashrc -echo "export WDOC=\"\$WHOME/Documents\"" >> ~/.bashrc -echo "export WDESK=\"\$WHOME/Desktop\"" >> ~/.bashrc -echo "export DISPLAY=:0" >> ~/.bashrc - -echo "WSL summary" -echo "\$WHOME is set to /mnt/c/Users/$WSL_USER" -echo "\$WDOC is set to \$WHOME/Documents" -echo "\$WDESK is set to \$WHOME/Desktop" -echo "SSH server parameters ($SSHD_FILE):" -echo "Port ${SSHD_PORT}" +#!/bin/bash + +if [[ -z "$1" ]] ; then +echo "ERROR - invalid arguments" +echo "Usage: win_username" +echo "win_username: Required. The username of Windows." +exit 1 +fi + +#setup WSL + +WSL_USER=$1 +SSHD_PORT=77 +SSHD_FILE=/etc/ssh/sshd_config +SUDOERS_FILE=/etc/sudoers + +sudo apt-get update +sudo apt-get install -y openssh-server build-essential cmake gdb + +# 1.1. configure sshd +sudo sed -i '/^Port/ d' $SSHD_FILE +sudo sed -i '/^PasswordAuthentication/ d' $SSHD_FILE +echo "# configured for CLion" | sudo tee -a $SSHD_FILE +echo "Port ${SSHD_PORT}" | sudo tee -a $SSHD_FILE +echo "PasswordAuthentication yes" | sudo tee -a $SSHD_FILE + +# 1.2. apply new settings +sudo ssh-keygen -A +sudo service ssh --full-restart +sudo systemctl enable ssh + +echo "# ENV VAR for WSL" >> ~/.bashrc +echo "export WHOME=\"/mnt/c/Users/$WSL_USER\"" >> ~/.bashrc +echo "export WDOC=\"\$WHOME/Documents\"" >> ~/.bashrc +echo "export WDESK=\"\$WHOME/Desktop\"" >> ~/.bashrc +echo "export DISPLAY=:0" >> ~/.bashrc + +echo "WSL summary" +echo "\$WHOME is set to /mnt/c/Users/$WSL_USER" +echo "\$WDOC is set to \$WHOME/Documents" +echo "\$WDESK is set to \$WHOME/Desktop" +echo "SSH server parameters ($SSHD_FILE):" +echo "Port ${SSHD_PORT}" echo "PasswordAuthentication yes" \ No newline at end of file