Emanon42 · lovelyyoshino · Jul 7, 2021 · Jul 7, 2021 · Jul 7, 2021 · Jul 7, 2021
diff --git a/20.04手册.md b/20.04手册.md
diff --git a/README.md b/README.md
@@ -1,9 +1,8 @@
-# UbuntuAutoScript
-Linux Auto Configuration Script- Linux 软件自动安装配置脚本
+# Ubuntu 配置脚本 全功能美化一键安装
 
+## 介绍
 
-废话不多说，先来一张效果图，没图片你们肯定是不会看下去的。
-简单的运行一下脚本，然后喝杯咖啡，打个游戏，做点其他事情，然后就没有然后了
+欢迎使用 Ubuntu 配置脚本 README。本文件将指导您如何使用 `setup.bash` 脚本来配置您的 Ubuntu 系统，安装各种工具和实用程序。该脚本提供了一种方便的方法来安装一系列的软件包，您可以选择进行完整安装，或者根据需要选择特定的软件包进行安装。
 
 
 ![Screenshot from 2017-10-23 22-01-52.png](http://upload-images.jianshu.io/upload_images/3127217-5aba480a92e0229e.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240)
@@ -12,117 +11,104 @@ Linux Auto Configuration Script- Linux 软件自动安装配置脚本
 ![Screenshot from 2017-10-23 22-01-35.png](http://upload-images.jianshu.io/upload_images/3127217-259258316bcc280f.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240)
 
 
-写这个脚本的原因是因为作者手太贱，我有一颗强烈的好奇心，但是同时又有一双︿(￣︶￣)︿非常贱贱的双手，所以当作者在安装了无数个Linux发行版之后，再疲于每一次安装都需要重新安装软件，配置各种环境变量的生活，
-简直苦不堪言，时间就是金钱，但是手贱喜欢换系统怎么办，
-最后实在受不了了，自己写了一个自动化配置安装软件脚本
+![在这里插入图片描述](https://img-blog.csdnimg.cn/direct/be2bd70f02034279ad6ca2dea364a2bb.png)
 
 
-`用法`
-```
-正确打开命令行：
-git clone https://github.com/SickoOrange/UbuntuAutoScript.git
-cd UbuntuAutoScript
-chmod +x setup.sh
-sudo ./ setup.sh
-```
-> 如果你想自动配置你的github ssh 秘钥，只需要在命令上述命令后面追加 -g xxxxxxx@gmail.com即可，生成的秘钥会自动保存在桌面的github_ssh_key.txt文件中。
-
-> sudo ./setup.sh -g xxxxxxx@gmail.com
+## 脚本概述
 
+`setup.bash` 脚本旨在自动化安装和配置各种软件包。您可以通过运行脚本并按照提示进行选择，来轻松地设置开发环境、办公工具、媒体工具等。脚本支持不同的 Ubuntu 版本，并包含多个功能模块，用户可以根据需要选择安装。
 
-    脚本已经在Github开源，欢迎随时
-    `Start`
-    `Fork`
-    `Issue`
-作者精力有限，所以还有什么没有想到希望大家多提意见
+## 使用说明
 
-> Github:
-> https://github.com/SickoOrange/UbuntuAutoScript
+### 前提条件
 
+在运行脚本之前，请确保您的系统满足以下条件：
 
+1. 运行 Ubuntu 操作系统（支持 14.04、16.04、18.04、20.04、22.04 版本）。
+2. 您具有 sudo 权限。
+3. 系统已连接到互联网。
 
-### 这个Bash Script都帮我们干了啥？
+### 下载和运行脚本
 
-这里简单列举一下这个Bash Script的功能：
+1. 打开终端。
+2. 下载脚本文件：
+   ```bash
+   git clone  https://github.com/lovelyyoshino/UbuntuAutoScript.git
+   ```
+3. 赋予脚本执行权限：
+   ```bash
+   cd UbuntuAutoScript
+   chmod +x setup.bash
+   ```
+4. 运行脚本：
+   ```bash
+   ./setup.bash
+   ```
 
-1. 更新系统的软件源
-2. 针对Ubuntu16.04:
-`楼主轻微桌面颜控，所以简单美观的桌面优化是必不可少的了`
-   - 自动下载安装Gnome桌面
-   - 自动下载安装 Dash To Dock插件 (就是类似苹果的软件栏)
-   - 自动下载安装 ARC 风格主题
-   - 自动下载安装 Flat Remix 扁平化图标
-3. 自动配置 Node Js 以及 npm, 开箱即用
-4. 自动下载配置 Oracle JDK，版本  1.8.0_151, 同时自动配置环境变量
-       打开Terminal
-       输入 java -version 验证是否正确安装
-5. 自动安装Gradle 版本构建工具
-6. 自动安装sdkman 用于管理多个软件开发套件的并行版本的工具
-7. 自动安装Typora Linux版本的Markdown写作神器 
-8. 安装常用小工具：
-```
-       Git           -- 版本控制软件
-       Curl         -- 调试网络连接的小工具
-       Gdebi        -- 有些deb软件不能通过默认安装器安装的, 可以试试他
-       Vim          -- 不说了撸代码神器
-       Unzip        -- linux解压zip压缩文件
-       unrar        -- 解压rar
-       jd           -- 命令行解析json工具
-       kolourpaint4 --画图工具 
-```
-9. 自动下载安装常用的软件：
-```
-       Visual Studio Code
-       Genymotion
-       Skype
-       Android Studio
-       IntellijIDEA
- ```
+### 使用脚本
 
+运行脚本后，您将看到如下提示：
 
-#### 最后，时间仓促，目前就想到这么多，以后有什么需要的工具还会继续更新，如果大家有什么想法或者意见可以给我留言， 或者直接在Github上fork.
-
-```
- 23.10.2017 更新日志
- 1. 添加了网易云音乐
- 2. 添加搜狗输入法
- ps: 搜狗输入法已经安装完毕，但是脚本只是帮你安装到系统了，你需要自己把搜狗输入法添加到fcitx中，如下图
 ```
-> ![Screenshot from 2017-10-23 21-56-55.png](http://upload-images.jianshu.io/upload_images/3127217-3430d3da55a7fdfb.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240)
-
+请按回车键以全部安装，或者输入您想安装的功能编号（用空格分隔，例如：1 3 8）：
 ```
-25.10.2017 更新日志
-1. 添加了 linux 命令行 Json解析工具 jd
-2. 添加了 画图板 kolour paint
-3. 修复了window与ubuntu双系统，时间不同步的错误
-4. 增加了自动配置github ssh
-5. 添加解压rar工具
-```
-
-```
-26.10.2017 更新日志
-1. 添加了SDKMAN！是一个用于管理多个软件开发套件的并行版本的工具
-2. 自动安装Gradle版本构建工具
-```
-
-```
-29.10.2017 更新日志
-1.自动安装 maven
-2.自动安装 docker
-    2.1 mysql image
-    2.2 tomcat image
-    2.3 nginx image
-```
-
-```
-30.10.2017 更新日志
-1.自动安装 sqliteman linux下一款轻量级数据库图形化软件
-2. clementine linux下一款受欢迎的开源音乐播放软件
-```
-
-
-> 背景图片地址
-> http://i.imgur.com/nZLDzzk.jpg
 
-> Github地址:  
-> https://github.com/SickoOrange/UbuntuAutoScript
+您有两种选择：
+1. **直接按回车键**：脚本将自动安装所有功能。
+2. **输入数字选项**：根据您的需要选择要安装的功能模块，数字之间用空格分隔。例如，输入 `1 3 8` 表示安装功能 1、3 和 8。
+
+### 可选安装功能列表
+
+以下是脚本中可选的安装功能及其对应的数字编号：
+
+1. **系统更新**
+2. **基础工具（如 git、vim、curl、tree、htop、fish、字体等）**
+3. **Docker**
+4. **Terminator 终端**
+5. **搜狗输入法**
+6. **系统监视器**
+7. **GIMP 图像处理**
+8. **VS Code**
+9. **Sublime Text**
+10. **Flameshot 截图**
+11. **Retext Markdown 编辑器**
+12. **mplayer/smplayer 视频播放器**
+13. **Chrome 浏览器**
+14. **Meld 文件比较**
+15. **Kazam 屏幕录像**
+16. **Figlet 命令行艺术字体**
+17. **WhiteSur 主题美化**
+18. **Clash/Clash Nyanpasu 代理工具**
+19. **CLion C/C++ IDE**
+20. **Miniconda**
+21. **Termius SSH 客户端**
+22. **systemback 系统备份**
+23. **CompizConfig 窗口增强**
+24. **Sticky Notes 便签**
+25. **Peek 动图截图**
+26. **Drawio 流程图编辑器**
+27. **PyCharm Python IDE**
+28. **Kdenlive 视频剪辑**
+29. **Cursor AI IDE（需手动下载 AppImage 后运行本脚本）**
+30. **ROS 机器人操作系统（FishROS 脚本）**
+31. **Neofetch 系统信息展示**
+32. **Tailscale 内网穿透**
+33. **zsh + oh-my-zsh + 常用 alias**
+34. **Variety 动态壁纸**
+
+
+### 示例
+
+1. **安装所有功能**：
+   运行脚本并直接按回车键。
+
+   ```bash
+   ./setup.bash
+   ```
+
+2. **选择性安装功能**：
+   运行脚本并输入数字选项，例如只安装更新系统、Docker 和 VS Code：
+
+   ```bash
+   ./setup.bash 1 3 8
+   ```
diff --git a/githelp.sh b/githelp.sh
diff --git a/jetbra-2024/.DS_Store b/jetbra-2024/.DS_Store
diff --git a/jetbra-2024/config-jetbrains/dns.conf b/jetbra-2024/config-jetbrains/dns.conf
@@ -0,0 +1,3 @@
+[DNS]
+EQUAL,jetbrains.com
+EQUAL,plugin.obroom.com
diff --git a/jetbra-2024/config-jetbrains/power.conf b/jetbra-2024/config-jetbrains/power.conf
@@ -0,0 +1,7 @@
+[Result]
+; Suit 230914
+EQUAL,75888623192465772084955377951198306702135327313062315225563718470653661793801719178647553532410237467495550800187973529202133466238825354135988657390766050197160093050945611087414688022502220060564716139142356429494315004946432334067127515081383336664162877126600357077796107641437507844835265792365885264118815924123978949395829736969354441202826225673948313261585644898954777409621857150971668073862687253868141869122469331021430401371289707681211947592819675200121184556360932201089199282211738120006888533563163642302207579745484728384486428222208213812291528007428530070242454238203928550683105421062331094750845145505608972009635176965215115688208740845303355991059521804735078574469432870400787428253602342729300042328170420659062588195293985517003844343989763104027328569042852690996233875190439074960872926324787157115483523118473430609411096400697894536993294915535905449630056538884982426205451557516203033628658808550799424730131437543420952769712793044255279152357141856290356977839447381244929084411487482957782888343837193520146442780899122074573307925429597225835206724304378622338028349953089952976438255759582568115277066791679931555627913314296216846420738487344812850701846117667234235837952975099539950423673283,65537,860106576952879101192782278876319243486072481962999610484027161162448933268423045647258145695082284265933019120714643752088997312766689988016808929265129401027490891810902278465065056686129972085119605237470899952751915070244375173428976413406363879128531449407795115913715863867259163957682164040613505040314747660800424242248055421184038777878268502955477482203711835548014501087778959157112423823275878824729132393281517778742463067583320091009916141454657614089600126948087954465055321987012989937065785013284988096504657892738536613208311013047138019418152103262155848541574327484510025594166239784429845180875774012229784878903603491426732347994359380330103328705981064044872334790365894924494923595382470094461546336020961505275530597716457288511366082299255537762891238136381924520749228412559219346777184174219999640906007205260040707839706131662149325151230558316068068139406816080119906833578907759960298749494098180107991752250725928647349597506532778539709852254478061194098069801549845163358315116260915270480057699929968468068015735162890213859113563672040630687357054902747438421559817252127187138838514773245413540030800888215961904267348727206110582505606182944023582459006406137831940959195566364811905585377246353->31872219281407242025505148642475109331663948030010491344733687844358944945421064967310388547820970408352359213697487269225694990179009814674781374751323403257628081559561462351695605167675284372388551941279783515209238245831229026662363729380633136520288327292047232179909791526492877475417113579821717193807584807644097527647305469671333646868883650312280989663788656507661713409911267085806708237966730821529702498972114194166091819277582149433578383639532136271637219758962252614390071122773223025154710411681628917523557526099053858210363406122853294409830276270946292893988830514538950951686480580886602618927728470029090747400687617046511462665469446846624685614084264191213318074804549715573780408305977947238915527798680393538207482620648181504876534152430149355791756374642327623133843473947861771150672096834149014464956451480803326284417202116346454345929350148770746553056995922154382822307758515805142704373984019252210715650875853634697920708113806880196144197384637328982263167395073688501517286678083973976140696077590122053014085412828620051470085033364773099146103525313018873319293728800442101520384088109603555959893639842091339193857485407672132882577840295039058621747654642202620767068924079813640067442975
+EQUAL,18334983902317920056407822076363704637127511531538667546454397384237002307773468304678083268940125026889850144873377524086979381177447338726740515125485990255804943597229646061638739889766127330669573122850717958841899404955081920145521154771305144425440057732333493057842144190570008851861105129783440041663779514287133102203234622617071230933765542056696346242481464904964506696247983144941959930402082784396824311315073713284265519582655262360264508170809532574071410971740082846089152772578790836229920359729093453981067609164052947062747210374015835086399513848397669153177129004699260465730470356144424062305576,65537,24156627931985958051017183040835577271803742470193804806479316178045088981962804168393398987646446251087541768081971475544151551235525470790716604369379805327668466429966167642117961353233058515180243264560201783520956161510523416923017697354365782825500659342029196527776056976223174394946371372849906309277537461992299774200098515526818746947230488275456663264920440977381968978227273889068919338259949793686590492904029279861913225794809675826299753284990778166519152326723946780528965868736869495336993456735232755342913885746267768375682771655854436236934171901662660193080235109535758464079136573948168636773471->986236757547332986472011617696226561292849812918563355472727826767720188564083584387121625107510786855734801053524719833194566624465665316622563244215340671405971599343902468620306327831715457360719532421388780770165778156818229863337344187575566725786793391480600129482653072861971002459947277805295727097226389568776499707662505334062639449916265137796823793276300221537201727072401742985542559596685092673521228140822200236743113743661549252453726123450722876929538747702356573783116366629850199080495560991841329893037291900147497007197055572787780928474439121996761454121550126010635197320122603857735547407
+
+[Args]
+EQUAL,65537,24773058818499217187577663886010908531303294206336895556072197892590450942803807164562754911175164262596715237551312004078542654996496301487027034803410086499747369353221485073240039340641397198525027728751956658900801359887190562885573922317930300068615009483578963467556425525328780085523172495307229112069939166202511721671904748968934606589702999279663332403655662225374084460291376706916679151764149324177444374590606643838366605181996272409014933080082205048098737253668016260658830645459388519595314928290853199112791333551144805347785109465401055719331231478162870216035573012645710763533896540021550083104281->3,24773058818499217187577663886010908531303294206336895556072197892590450942803807164562754911175164262596715237551312004078542654996496301487027034803410086499747369353221485073240039340641397198525027728751956658900801359887190562885573922317930300068615009483578963467556425525328780085523172495307229112069939166202511721671904748968934606589702999279663332403655662225374084460291376706916679151764149324177444374590606643838366605181996272409014933080082205048098737253668016260658830645459388519595314928290853199112791333551144805347785109465401055719331231478162870216035573012645710763533896540021550083104281
diff --git a/jetbra-2024/config-jetbrains/url.conf b/jetbra-2024/config-jetbrains/url.conf
@@ -0,0 +1,3 @@
+[URL]
+PREFIX,https://account.jetbrains.com/lservice/rpc/validateKey.action
+PREFIX,https://account.jetbrains.com.cn/lservice/rpc/validateKey.action
diff --git a/jetbra-2024/ja-netfilter.jar b/jetbra-2024/ja-netfilter.jar
diff --git a/jetbra-2024/plugins-jetbrains/dns.jar b/jetbra-2024/plugins-jetbrains/dns.jar
diff --git a/jetbra-2024/plugins-jetbrains/hideme.jar b/jetbra-2024/plugins-jetbrains/hideme.jar
diff --git a/jetbra-2024/plugins-jetbrains/power.jar b/jetbra-2024/plugins-jetbrains/power.jar
diff --git a/jetbra-2024/plugins-jetbrains/url.jar b/jetbra-2024/plugins-jetbrains/url.jar
diff --git a/jetbra-2024/scripts/install-all-users.vbs b/jetbra-2024/scripts/install-all-users.vbs
@@ -0,0 +1,73 @@
+If Not WScript.Arguments.Named.Exists("elevate") Then
+  CreateObject("Shell.Application").ShellExecute WScript.FullName, """" & WScript.ScriptFullName & """ /elevate", "", "runas", 10
+  WScript.Quit
+End If
+
+Set oShell = CreateObject("WScript.Shell")
+Set oEnvSystem = oShell.Environment("SYSTEM")
+Set oFS = CreateObject("Scripting.FileSystemObject")
+
+Dim sBasePath, sJarFile
+sBasePath = oFS.GetParentFolderName(oFS.GetParentFolderName(WScript.ScriptFullName))
+sJarFile = sBasePath & "\ja-netfilter.jar"
+
+If Not oFS.FileExists(sJarFile) Then
+    MsgBox "ja-netfilter.jar not found", vbOKOnly Or vbCritical
+    WScript.Quit -1
+End If
+
+MsgBox "It may take a few seconds to execute this script." & vbCrLf & vbCrLf & "Click 'OK' button and wait for the prompt of 'Done.' to pop up!"
+
+Dim sEnvKey, sEnvVal, aJBProducts
+aJBProducts = Array("idea", "clion", "phpstorm", "goland", "pycharm", "webstorm", "webide", "rider", "datagrip", "rubymine", "dataspell", "aqua", "rustrover", "gateway", "jetbrains_client", "jetbrainsclient", "studio", "devecostudio")
+
+Set re = New RegExp
+re.Global     = True
+re.IgnoreCase = True
+re.Pattern    = "^\-javaagent:.*[\/\\]ja\-netfilter\.jar.*"
+
+Sub RemoveEnv(env)
+    On Error Resume Next
+
+    For Each sPrd in aJBProducts
+        sEnvKey = UCase(sPrd) & "_VM_OPTIONS"
+        sEnvVal = oShell.ExpandEnvironmentStrings("%" & sEnvKey & "%")
+        If sEnvVal <> ("%" & sEnvKey & "%") Then
+            env.Remove(sEnvKey)
+        End If
+        Next
+End Sub
+
+RemoveEnv oShell.Environment("USER")
+
+Dim sVmOptionsFile
+For Each sPrd in aJBProducts
+    sEnvKey = UCase(sPrd) & "_VM_OPTIONS"
+    sVmOptionsFile = sBasePath & "\vmoptions\" & sPrd & ".vmoptions"
+    If oFS.FileExists(sVmOptionsFile) Then
+        ProcessVmOptions sVmOptionsFile
+        oEnvSystem(sEnvKey) = sVmOptionsFile
+    End If
+Next
+
+Sub ProcessVmOptions(ByVal file)
+    Dim sLine, sNewContent, bMatch
+    Set oFile = oFS.OpenTextFile(file, 1, 0)
+
+    sNewContent = ""
+    Do Until oFile.AtEndOfStream
+        sLine = oFile.ReadLine
+        bMatch = re.Test(sLine)
+        If Not bMatch Then
+            sNewContent = sNewContent & sLine & vbLf
+        End If
+    Loop
+    oFile.Close
+
+    sNewContent = sNewContent & "-javaagent:" & sJarFile & "=jetbrains"
+    Set oFile = oFS.OpenTextFile(file, 2, 0)
+    oFile.Write sNewContent
+    oFile.Close
+End Sub
+
+MsgBox "Done."
diff --git a/jetbra-2024/scripts/install-current-user.vbs b/jetbra-2024/scripts/install-current-user.vbs
@@ -0,0 +1,54 @@
+Set oShell = CreateObject("WScript.Shell")
+Set oEnv = oShell.Environment("USER")
+Set oFS = CreateObject("Scripting.FileSystemObject")
+
+Dim sEnvKey, sEnvVal, aJBProducts
+aJBProducts = Array("idea", "clion", "phpstorm", "goland", "pycharm", "webstorm", "webide", "rider", "datagrip", "rubymine", "dataspell", "aqua", "rustrover", "gateway", "jetbrains_client", "jetbrainsclient", "studio", "devecostudio")
+
+Set re = New RegExp
+re.Global     = True
+re.IgnoreCase = True
+re.Pattern    = "^\-javaagent:.*[\/\\]ja\-netfilter\.jar.*"
+
+Dim sBasePath, sJarFile
+sBasePath = oFS.GetParentFolderName(oShell.CurrentDirectory)
+sJarFile = sBasePath & "\ja-netfilter.jar"
+
+If Not oFS.FileExists(sJarFile) Then
+    MsgBox "ja-netfilter.jar not found", vbOKOnly Or vbCritical
+    WScript.Quit -1
+End If
+
+MsgBox "It may take a few seconds to execute this script." & vbCrLf & vbCrLf & "Click 'OK' button and wait for the prompt of 'Done.' to pop up!"
+
+Dim sVmOptionsFile
+For Each sPrd in aJBProducts
+    sEnvKey = UCase(sPrd) & "_VM_OPTIONS"
+    sVmOptionsFile = sBasePath & "\vmoptions\" & sPrd & ".vmoptions"
+    If oFS.FileExists(sVmOptionsFile) Then
+        ProcessVmOptions sVmOptionsFile
+        oEnv(sEnvKey) = sVmOptionsFile
+    End If
+Next
+
+Sub ProcessVmOptions(ByVal file)
+    Dim sLine, sNewContent, bMatch
+    Set oFile = oFS.OpenTextFile(file, 1, 0)
+
+    sNewContent = ""
+    Do Until oFile.AtEndOfStream
+        sLine = oFile.ReadLine
+        bMatch = re.Test(sLine)
+        If Not bMatch Then
+            sNewContent = sNewContent & sLine & vbLf
+        End If
+    Loop
+    oFile.Close
+
+    sNewContent = sNewContent & "-javaagent:" & sJarFile & "=jetbrains"
+    Set oFile = oFS.OpenTextFile(file, 2, 0)
+    oFile.Write sNewContent
+    oFile.Close
+End Sub
+
+MsgBox "Done."