sync

AnOldStory · Mar 21, 2023 · cffcce9 · cffcce9
1 parent e8e53d9
commit cffcce9
Show file tree

Hide file tree

Showing 16 changed files with 69 additions and 64 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/README.md b/README.md
@@ -1,63 +1,61 @@
 # PersonalSetting
+
 > 개인적인 설정 파일 목록
 
+## Setting Manager
 
+> All-In-One Script
 
-## Setting Manager 
-> All-In-One Script 
+Window
 
-Window -> [*Window PowerShell*](https://raw.githubusercontent.com/AnOldStory/Setting/master/Setting-Manager/Setting-Manager_anoldstory.ps1)
 ```
-Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/AnOldStory/Setting/master/Setting-Manager/Setting-Manager_anoldstory.ps1'))
+Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/AnOldStory/Setting/master/script/window.ps1'))
 ```
 
+Linux
 
-Linux -> [*Linux Bash*](https://raw.githubusercontent.com/AnOldStory/Setting/master/Setting-Manager/Setting-Manager_anoldstory.sh)
 ```
-wget https://raw.githubusercontent.com/AnOldStory/Setting/master/Setting-Manager/Setting-Manager_anoldstory.sh -O - | bash
+wget https://raw.githubusercontent.com/AnOldStory/Setting/master/script/ubuntu.sh -O - | bash
 ```
 
+# <!-- Windows
+
+| 링크                                                                                         | 설명                                       | 다운로드                                                            |
+| -------------------------------------------------------------------------------------------- | ------------------------------------------ | ------------------------------------------------------------------- |
+| [Setting-Manager](https://help.github.com/en/articles/telling-git-about-your-signing-key)    | 윈도우 GPG 설치법                          |                                                                     |
+| [WinLinker](https://raw.githubusercontent.com/AnOldStory/Setting/master/Win/WinLinker.bat)   | 윈도우 Github Shortcut 생성                | [다운로드](https://anoldstory.github.io/Setting/Win/WinLinker.bat)  |
+| [WinPSYarn](https://raw.githubusercontent.com/AnOldStory/Setting/master/Win/WinPSYarn.bat)   | 윈도우 yarn global 저장경로 설정           | [다운로드](https://anoldstory.github.io/Setting/Win/WinPSYarn.bat)  |
+| [WinSandBox](https://raw.githubusercontent.com/AnOldStory/Setting/master/Win/WinSandBox.wsb) | 윈도우 샌드박스 인터넷 익스플로러 자동실행 | [다운로드](https://anoldstory.github.io/Setting/Win/WinSandBox.wsb) |
+| [WinSym](https://raw.githubusercontent.com/AnOldStory/Setting/master/Win/WinSym.bat)         | 윈도우 심볼릭링크 생성                     | [다운로드](https://anoldstory.github.io/Setting/Win/WinSym.bat)     |
+
+# Windows Subsystem for Linux
+
+| 링크                                                                                      | 설명         | 다운로드                                                          |
+| ----------------------------------------------------------------------------------------- | ------------ | ----------------------------------------------------------------- |
+| [WSLBashrc](https://raw.githubusercontent.com/AnOldStory/Setting/master/WSL/WSLBashrc.sh) | WSL .bashrc  | [다운로드](https://anoldstory.github.io/Setting/WSL/WSLBashrc.sh) |
+| [WSLCdn](https://raw.githubusercontent.com/AnOldStory/Setting/master/WSL/WSLCdn.sh)       | WSL CDN 변경 | [다운로드](https://anoldstory.github.io/Setting/WSL/WSLCdn.sh)    |
+
+# Mac
+
+| 링크                                                                                        | 설명                    | 다운로드                                                           |
+| ------------------------------------------------------------------------------------------- | ----------------------- | ------------------------------------------------------------------ |
+| [MacNoSleep](https://raw.githubusercontent.com/AnOldStory/Setting/master/Mac/MacNoSleep.sh) | 맥북 충전중 잠자기 방지 | [다운로드](https://anoldstory.github.io/Setting/Mac/MacNoSleep.sh) |
+| [MacSshpass](https://raw.githubusercontent.com/AnOldStory/Setting/master/Mac/MacSshpass.sh) | 맥북 sshpass설치        | [다운로드](https://anoldstory.github.io/Setting/Mac/MacSshpass.sh) |
 
-<!-- Windows
-===
-
-| 링크 | 설명 | 다운로드 |
-| --- | --- | --- |
-| [Setting-Manager](https://help.github.com/en/articles/telling-git-about-your-signing-key) | 윈도우 GPG 설치법 |   |
-| [WinLinker](https://raw.githubusercontent.com/AnOldStory/Setting/master/Win/WinLinker.bat) | 윈도우 Github Shortcut 생성 | [다운로드](https://anoldstory.github.io/Setting/Win/WinLinker.bat)   |
-| [WinPSYarn](https://raw.githubusercontent.com/AnOldStory/Setting/master/Win/WinPSYarn.bat) | 윈도우 yarn global 저장경로 설정 | [다운로드](https://anoldstory.github.io/Setting/Win/WinPSYarn.bat)   |
-| [WinSandBox](https://raw.githubusercontent.com/AnOldStory/Setting/master/Win/WinSandBox.wsb) | 윈도우 샌드박스 인터넷 익스플로러 자동실행 | [다운로드](https://anoldstory.github.io/Setting/Win/WinSandBox.wsb)   |
-| [WinSym](https://raw.githubusercontent.com/AnOldStory/Setting/master/Win/WinSym.bat)  | 윈도우 심볼릭링크 생성 | [다운로드](https://anoldstory.github.io/Setting/Win/WinSym.bat)   |
-
-Windows Subsystem for Linux
-===
-
-| 링크 | 설명 | 다운로드 |
-| --- | --- | --- |
-| [WSLBashrc](https://raw.githubusercontent.com/AnOldStory/Setting/master/WSL/WSLBashrc.sh)  | WSL .bashrc | [다운로드](https://anoldstory.github.io/Setting/WSL/WSLBashrc.sh)   |
-| [WSLCdn](https://raw.githubusercontent.com/AnOldStory/Setting/master/WSL/WSLCdn.sh)   | WSL CDN 변경 | [다운로드](https://anoldstory.github.io/Setting/WSL/WSLCdn.sh)   |
-
-Mac
-===
-| 링크 | 설명 | 다운로드 |
-| --- | --- | --- |
-| [MacNoSleep](https://raw.githubusercontent.com/AnOldStory/Setting/master/Mac/MacNoSleep.sh)    | 맥북 충전중 잠자기 방지 | [다운로드](https://anoldstory.github.io/Setting/Mac/MacNoSleep.sh)    |
-| [MacSshpass](https://raw.githubusercontent.com/AnOldStory/Setting/master/Mac/MacSshpass.sh)    | 맥북 sshpass설치  | [다운로드](https://anoldstory.github.io/Setting/Mac/MacSshpass.sh)    |
-
-
-Ubuntu
-===
-| 링크 | 설명 | 다운로드 |
-| --- | --- | --- |
-| [.vimrc](https://raw.githubusercontent.com/AnOldStory/Setting/master/Ubuntu/.vimrc)  | vim설정파일 | [다운로드](https://anoldstory.github.io/Setting/Ubuntu/.vimrc)   |
-| [UbuInit](https://raw.githubusercontent.com/AnOldStory/Setting/master/Ubuntu/UbuInit.sh)  | 우분투 기본 설정 | [다운로드](https://anoldstory.github.io/Setting/Ubuntu/UbuInit.sh)   |
-
-Etc
-===
-| 링크 | 설명 | 다운로드 |
-| --- | --- | --- |
-| [VibePlayList](https://raw.githubusercontent.com/AnOldStory/Setting/master/etc/VibePlayList.js)   | Vibe 플레이리스트 목록 가져오기 | [다운로드](https://anoldstory.github.io/Setting/etc/VibePlayList.js)   |
- -->
+# Ubuntu
+
+| 링크                                                                                     | 설명             | 다운로드                                                           |
+| ---------------------------------------------------------------------------------------- | ---------------- | ------------------------------------------------------------------ |
+| [.vimrc](https://raw.githubusercontent.com/AnOldStory/Setting/master/Ubuntu/.vimrc)      | vim설정파일      | [다운로드](https://anoldstory.github.io/Setting/Ubuntu/.vimrc)     |
+| [UbuInit](https://raw.githubusercontent.com/AnOldStory/Setting/master/Ubuntu/UbuInit.sh) | 우분투 기본 설정 | [다운로드](https://anoldstory.github.io/Setting/Ubuntu/UbuInit.sh) |
+
+# Etc
+
+| 링크                                                                                            | 설명                            | 다운로드                                                             |
+| ----------------------------------------------------------------------------------------------- | ------------------------------- | -------------------------------------------------------------------- |
+| [VibePlayList](https://raw.githubusercontent.com/AnOldStory/Setting/master/etc/VibePlayList.js) | Vibe 플레이리스트 목록 가져오기 | [다운로드](https://anoldstory.github.io/Setting/etc/VibePlayList.js) |
+
+-->
 
 <!--
 | []() | test |

diff --git a/etc/.DS_Store b/etc/.DS_Store
diff --git a/etc/VSCODE/Synthesis/settings-win.json → etc/.vscode/Synthesis/settings-win.json b/etc/VSCODE/Synthesis/settings-win.json → etc/.vscode/Synthesis/settings-win.json
diff --git a/etc/VSCODE/settings-win.json → etc/.vscode/settings-win.json b/etc/VSCODE/settings-win.json → etc/.vscode/settings-win.json
diff --git a/etc/VSCODE/settings.json → etc/.vscode/settings.json b/etc/VSCODE/settings.json → etc/.vscode/settings.json
diff --git a/etc/linux/WSLCdn.sh → etc/linux/cdn_speed.sh b/etc/linux/WSLCdn.sh → etc/linux/cdn_speed.sh
diff --git a/etc/Mac/MacNoSleep.sh → etc/mac/nosleep.sh b/etc/Mac/MacNoSleep.sh → etc/mac/nosleep.sh
diff --git a/etc/Mac/MacSshpass.sh → etc/mac/sshpass.sh b/etc/Mac/MacSshpass.sh → etc/mac/sshpass.sh
diff --git a/etc/Win/WinGPG → etc/window/gpg_setting b/etc/Win/WinGPG → etc/window/gpg_setting
diff --git a/etc/Win/WinLinker.bat → etc/window/linker.bat b/etc/Win/WinLinker.bat → etc/window/linker.bat
diff --git a/etc/Win/WinSym.bat → etc/window/symlink.bat b/etc/Win/WinSym.bat → etc/window/symlink.bat
diff --git a/resource/.DS_Store b/resource/.DS_Store
diff --git a/resource/docker/init.sh b/resource/docker/init.sh
@@ -1,18 +1,18 @@
 #/bin/bash
 
-#default value
+# 
+
+# default value
 DATA_DIRECTORY="/HDD/docker"
 PUID="1000"
 PGID="1000"
 PASSWORD="password"
 PROXY_DOMAIN="code.anoldstory.com"
 
-function read_input(default_value) {
-    read -p "Enter $default_value [$default_value]: " input
-    if [ -z "$input" ]; then # check empty
-        input=$default_value
-    fi
-    echo $input
+read_input() { #string
+    read -p "Enter $1 [${1}]: " input
+    input=${input:-${1}}
+    return $input
 }
 
 ##############################################################################################
@@ -24,30 +24,37 @@ docker network create -d bridge Local-Host
 #initial environment variables
 echo "setting environment variables"
 
-read -p "Enter Data Directory[${DATA_DIRECTORY}]:" input
-DATA_DIRECTORY=${input:-$DATA_DIRECTORY}
+DATA_DIRECTORY=$(read_input DATA_DIRECTORY)
 
-read -p "Enter PUID[1000]:" input
-PUID=${input:-$PUID}
+PUID=$(read_input PUID)
 
-read -p "Enter PGID[1000]:" input
-PGID=${input:-$PGID}
+PGID=$(read_input PGID)
 
 ##############################################################################################
 #install code-server
 
 CURRENT_PROGRAM="code-server"
 echo "Install $CURRENT_PROGRAM"
 
-read -p "Enter Password[${PASSWORD}]:" input
-PASSWORD=${input:-$PASSWORD}
+PASSWORD=$(read_input PASSWORD)
+PROXY_DOMAIN=$(read_input PROXY_DOMAIN)
+
+echo "Download Compose.yml"
+mkdir -p $DATA_DIRECTORY/$CURRENT_PROGRAM
+wget -q -P $DATA_DIRECTORY/$CURRENT_PROGRAM "https://raw.githubusercontent.com/AnOldStory/Setting/master/resource/docker/$CURRENT_PROGRAM/docker-compose.yml"
+
+echo "Docker Compose"
+docker-compose -f "$DATA_DIRECTORY/$CURRENT_PROGRAM/docker-compose.yml" up -d 
 
-read -p "Enter Proxy Domain[$PROXY_DOMAIN]:" input
-PROXY_DOMAIN=${input:-$PROXY_DOMAIN}
+##############################################################################################
+#install heimdall
+
+CURRENT_PROGRAM="heimdall"
+echo "Install $CURRENT_PROGRAM"
 
 echo "Download Compose.yml"
 mkdir -p $DATA_DIRECTORY/$CURRENT_PROGRAM
 wget -q -P $DATA_DIRECTORY/$CURRENT_PROGRAM "https://raw.githubusercontent.com/AnOldStory/Setting/master/resource/docker/$CURRENT_PROGRAM/docker-compose.yml"
 
 echo "Docker Compose"
-docker-compose -f "$DATA_DIRECTORY/$CURRENT_PROGRAM/docker-compose.yml" up -d 
+docker-compose -f "$DATA_DIRECTORY/$CURRENT_PROGRAM/docker-compose.yml" up -d
diff --git a/...ing-Manager/Setting-Manager_anoldstory.sh → script/ubuntu.sh b/...ing-Manager/Setting-Manager_anoldstory.sh → script/ubuntu.sh
diff --git a/...ng-Manager/Setting-Manager_anoldstory.ps1 → script/window.ps1 b/...ng-Manager/Setting-Manager_anoldstory.ps1 → script/window.ps1