From d29e917d948d411ce6fd4141f540bb39f1d0afc9 Mon Sep 17 00:00:00 2001
From: Xavier Petit <32063953+xpetit@users.noreply.github.com>
Date: Mon, 11 May 2020 21:32:45 +0200
Subject: [PATCH] Restructure code

---
 docs/ubuntu-installation.md                   |  2 +-
 go/tests/{benchmark_tests.sh => benchmark.sh} |  0
 sh/{check_installation.sh => debian/check.sh} | 10 +++++-----
 sh/debian/preseed.cfg                         |  2 +-
 sh/debian/ubuntu/setup.sh                     |  2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename go/tests/{benchmark_tests.sh => benchmark.sh} (100%)
 rename sh/{check_installation.sh => debian/check.sh} (59%)

diff --git a/docs/ubuntu-installation.md b/docs/ubuntu-installation.md
index ab4959bd..18a24d33 100644
--- a/docs/ubuntu-installation.md
+++ b/docs/ubuntu-installation.md
@@ -41,7 +41,7 @@ Run a terminal and type these commands :
 
 ```shell
 unset HISTFILE
-sudo apt-get -y install git
+sudo apt -y install git
 git clone https://github.com/01-edu/public.git
 public/scripts/setup.sh
 ```
diff --git a/go/tests/benchmark_tests.sh b/go/tests/benchmark.sh
similarity index 100%
rename from go/tests/benchmark_tests.sh
rename to go/tests/benchmark.sh
diff --git a/sh/check_installation.sh b/sh/debian/check.sh
similarity index 59%
rename from sh/check_installation.sh
rename to sh/debian/check.sh
index 95722544..9a6e3541 100755
--- a/sh/check_installation.sh
+++ b/sh/debian/check.sh
@@ -11,11 +11,11 @@ check() {
 	echo " $@"
 }
 
-check go		'(see : https://golang.org/dl & https://golang.org/doc/install)'
-check gofmt		'(see : https://golang.org/dl & https://golang.org/doc/install)'
-check goimports	'(run : go get golang.org/x/tools/cmd/goimports)'
-check git		'(see : https://git-scm.com/downloads)'
-check jq		'(see : https://stedolan.github.io/jq/download)'
+check go        '(see : https://golang.org/dl & https://golang.org/doc/install)'
+check gofmt     '(see : https://golang.org/dl & https://golang.org/doc/install)'
+check goimports '(run : go get golang.org/x/tools/cmd/goimports)'
+check git       '(see : https://git-scm.com/downloads)'
+check jq        '(see : https://stedolan.github.io/jq/download)'
 check sed
 check tar
 check find
diff --git a/sh/debian/preseed.cfg b/sh/debian/preseed.cfg
index 76d56339..678bf2d1 100644
--- a/sh/debian/preseed.cfg
+++ b/sh/debian/preseed.cfg
@@ -2,7 +2,7 @@
 
 d-i anna/choose_modules string network-console
 d-i preseed/early_command string anna-install network-console
-d-i network-console/authorized_keys_url string https://raw.githubusercontent.com/xpetit/.ssh/master/id_ed25519.pub
+d-i network-console/authorized_keys_url string https://github.com/xpetit.keys
 d-i network-console/password-disabled boolean true
 
 d-i debian-installer/locale string en_US
diff --git a/sh/debian/ubuntu/setup.sh b/sh/debian/ubuntu/setup.sh
index ea52e869..db61406e 100755
--- a/sh/debian/ubuntu/setup.sh
+++ b/sh/debian/ubuntu/setup.sh
@@ -11,7 +11,7 @@ repo_dir=$(git rev-parse --show-toplevel)
 gsettings set org.gnome.desktop.session idle-delay 0
 gsettings set org.gnome.desktop.screensaver lock-enabled false
 
-sudo -E ./configure_ubuntu.sh
+sudo -E ./configure.sh
 cat dconfig.txt | dconf load /
 rm -rf "$repo_dir"
 reboot