Skip to content

Commit

Permalink
Update to v5.40
Browse files Browse the repository at this point in the history
  • Loading branch information
exalab999 committed Mar 9, 2019
1 parent 6a3cd85 commit ebb9bf1
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 17 deletions.
Binary file modified AnLinux/.idea/caches/build_file_checksums.ser
Binary file not shown.
4 changes: 2 additions & 2 deletions AnLinux/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ android {
applicationId "exa.lnx.a"
minSdkVersion 21
targetSdkVersion 26
versionCode 536
versionName "5.36 Stable"
versionCode 540
versionName "5.40 Stable"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand Down
Binary file modified AnLinux/app/release/app-release.apk
Binary file not shown.
2 changes: 1 addition & 1 deletion AnLinux/app/release/output.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":536,"versionName":"5.36 Stable","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":540,"versionName":"5.40 Stable","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
8 changes: 4 additions & 4 deletions AnLinux/app/src/main/java/exa/lnx/a/DesktopEnvironment.java
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@ public void onClick(View view) {
}
}else if(distro.equals("Arch")){
if(s.contains("arm")){
ClipData clip = ClipData.newPlainText("Command", "pacman-key --init && pacman-key --populate archlinuxarm && pacman -Sy --noconfirm wget && wget https://raw.githubusercontent.com/EXALAB/AnLinux-Resources/master/Scripts/DesktopEnvironment/Pacman/de-pac.sh && bash de-pac.sh");
ClipData clip = ClipData.newPlainText("Command", "pacman -Sy --noconfirm wget && wget https://raw.githubusercontent.com/EXALAB/AnLinux-Resources/master/Scripts/DesktopEnvironment/Pacman/de-pac.sh && bash de-pac.sh");
clipboard.setPrimaryClip(clip);
}else{
ClipData clip = ClipData.newPlainText("Command", "pacman-key --init && pacman-key --populate archlinux && pacman -Sy --noconfirm wget && wget https://raw.githubusercontent.com/EXALAB/AnLinux-Resources/master/Scripts/DesktopEnvironment/Pacman/de-pac.sh && bash de-pac.sh");
ClipData clip = ClipData.newPlainText("Command", "pacman -Sy --noconfirm wget && wget https://raw.githubusercontent.com/EXALAB/AnLinux-Resources/master/Scripts/DesktopEnvironment/Pacman/de-pac.sh && bash de-pac.sh");
clipboard.setPrimaryClip(clip);
}
}
Expand Down Expand Up @@ -537,10 +537,10 @@ public void onClick(DialogInterface dialog, int which) {
}
}else if(distro.equals("Arch")){
if(s.contains("arm")){
textView3.setText(getString(R.string.de_step2, "pacman-key --init && pacman-key --populate archlinuxarm && pacman -Sy --noconfirm wget && wget https://raw.githubusercontent.com/EXALAB/AnLinux-Resources/master/Scripts/DesktopEnvironment/Pacman/de-pac.sh && bash de-pac.sh", "LXDE"));
textView3.setText(getString(R.string.de_step2, "pacman -Sy --noconfirm wget && wget https://raw.githubusercontent.com/EXALAB/AnLinux-Resources/master/Scripts/DesktopEnvironment/Pacman/de-pac.sh && bash de-pac.sh", "LXDE"));
textView4.setText(getString(R.string.de_step3, "./start-arch.sh"));
}else{
textView3.setText(getString(R.string.de_step2, "pacman-key --init && pacman-key --populate archlinux && pacman -Sy --noconfirm wget && wget https://raw.githubusercontent.com/EXALAB/AnLinux-Resources/master/Scripts/DesktopEnvironment/Pacman/de-pac.sh && bash de-pac.sh", "LXDE"));
textView3.setText(getString(R.string.de_step2, "pacman -Sy --noconfirm wget && wget https://raw.githubusercontent.com/EXALAB/AnLinux-Resources/master/Scripts/DesktopEnvironment/Pacman/de-pac.sh && bash de-pac.sh", "LXDE"));
textView4.setText(getString(R.string.de_step3, "./start-arch.sh"));
}
}
Expand Down
8 changes: 4 additions & 4 deletions AnLinux/app/src/main/java/exa/lnx/a/SSH.java
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ public void onClick(View view) {
clipboard.setPrimaryClip(clip);
}else if(distro.equals("Arch")){
if(s.contains("arm")){
ClipData clip = ClipData.newPlainText("Command", "pacman-key --init && pacman-key --populate archlinuxarm && pacman -Sy --noconfirm wget && wget https://raw.githubusercontent.com/EXALAB/AnLinux-Resources/master/Scripts/SSH/Pacman/ssh-pac.sh && bash ssh-pac.sh");
ClipData clip = ClipData.newPlainText("Command", "pacman -Sy --noconfirm wget && wget https://raw.githubusercontent.com/EXALAB/AnLinux-Resources/master/Scripts/SSH/Pacman/ssh-pac.sh && bash ssh-pac.sh");
clipboard.setPrimaryClip(clip);
}else{
ClipData clip = ClipData.newPlainText("Command", "pacman-key --init && pacman-key --populate archlinux && pacman -Sy --noconfirm wget && wget https://raw.githubusercontent.com/EXALAB/AnLinux-Resources/master/Scripts/SSH/Pacman/ssh-pac.sh && bash ssh-pac.sh");
ClipData clip = ClipData.newPlainText("Command", "pacman -Sy --noconfirm wget && wget https://raw.githubusercontent.com/EXALAB/AnLinux-Resources/master/Scripts/SSH/Pacman/ssh-pac.sh && bash ssh-pac.sh");
clipboard.setPrimaryClip(clip);
}
}
Expand Down Expand Up @@ -357,10 +357,10 @@ public void onClick(DialogInterface dialog, int which) {
textView3.setText(getString(R.string.ssh_step3, "./start-centos.sh"));
}else if(distro.equals("Arch")){
if(s.contains("arm")){
textView2.setText(getString(R.string.ssh_step2, "pacman-key --init && pacman-key --populate archlinuxarm && pacman -Sy --noconfirm wget && wget https://raw.githubusercontent.com/EXALAB/AnLinux-Resources/master/Scripts/SSH/Pacman/ssh-pac.sh && bash ssh-pac.sh"));
textView2.setText(getString(R.string.ssh_step2, "pacman -Sy --noconfirm wget && wget https://raw.githubusercontent.com/EXALAB/AnLinux-Resources/master/Scripts/SSH/Pacman/ssh-pac.sh && bash ssh-pac.sh"));
textView3.setText(getString(R.string.ssh_step3, "./start-arch.sh"));
}else{
textView2.setText(getString(R.string.ssh_step2, "pacman-key --init && pacman-key --populate archlinux && pacman -Sy --noconfirm wget && wget https://raw.githubusercontent.com/EXALAB/AnLinux-Resources/master/Scripts/SSH/Pacman/ssh-pac.sh && bash ssh-pac.sh"));
textView2.setText(getString(R.string.ssh_step2, "pacman -Sy --noconfirm wget && wget https://raw.githubusercontent.com/EXALAB/AnLinux-Resources/master/Scripts/SSH/Pacman/ssh-pac.sh && bash ssh-pac.sh"));
textView3.setText(getString(R.string.ssh_step3, "./start-arch.sh"));
}
}
Expand Down
4 changes: 2 additions & 2 deletions AnLinux/app/src/main/res/values-zh-rCN/string.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
<string name="de_step3">第三步:启动Termux,贴上并输入指令以安装桌面。注意:您必须先使用 %1$s 来启动Linux System后才能使用此指令。</string>
<string name="dashboard_step2">第二步:请复制此指令:%1$s \n\n这将会把 %2$s 安装到您的系统,之后您可以使用 %3$s 指令来启动系统。</string>
<string name="dashboard_step3">第三步:启动Termux,贴上并输入指令以安装系统。注意:您之后必须使用 %1$s 指令来启动系统。</string>
<string name="dashboard_step2_arch">第二步:请复制此指令:%1$s \n\n这将安装 %2$s 到您的设备, 您稍后可以使用 %3$s 指令来启动系统。\n\n启动后,您必须执行以下指令:chmod 755 additional.sh &amp;&amp; ./additional.sh 来设置 resolv.conf,否则网络连接将无法使用。 (仅限第一次)</string>
<string name="dashboard_step3_arch">第三步:启动Termux,贴上并输入指令以安装系统。注意:您之后必须使用 ./start-arch.sh 指令来启动系统,之后,您必须执行以下指令:chmod 755 additional.sh &amp;&amp; ./additional.sh 来设置 resolv.conf,否则网络连接将无法使用。</string>
<string name="dashboard_step2_arch">第二步:请复制此指令:%1$s \n\n这将安装 %2$s 到您的设备, 您稍后可以使用 %3$s 指令来启动系统。\n\n启动后,您必须执行以下指令:chmod 755 additional.sh &amp;&amp; ./additional.sh 来设置 resolv.conf 和 pacman-key,否则网络连接和 pacman 将无法使用!(仅限第一次)</string>
<string name="dashboard_step3_arch">第三步:启动Termux,贴上并输入指令以安装系统。注意:您之后必须使用 ./start-arch.sh 指令来启动系统,之后,您必须执行以下指令:chmod 755 additional.sh &amp;&amp; ./additional.sh 来设置 resolv.conf 和 pacman-key,否则网络连接和 pacman 将无法使用!(仅限第一次)</string>
<string name="dashboard_step2_blackarch">注意:请在Arch Linux系统中执行此指令以开启BlackArch Repo (Arch Linux必须先安装\n\n第二步:请复制此指令:%1$s</string>
<string name="dashboard_step3_blackarch">第三步:启动Termux,输入 ./start-arch.sh 指令以进入Arch Linux, 贴上并输入指令以BlackArch Repo。注意: 您必须先使用 ./start-arch.sh 来进入Arch Linux后才能执行此指令。</string>
<string name="arch_linux_warning_content">Arch Linux 的系统比一般系统更大 (大约 400 MB), 在解压后讲占用更多空间。推荐至少有1.5GB空间储备。\n\n\n注意:\n\n1. 在解压时会出现此问题:tar: Ignoring unknown extended header keyword \'SCHILY.fflags\',这并不会造成任何问题,请无视。\n\n2. Arch Linux 系统存在于第三方服务器,并有可能出现无法使用的状态,如果您发现任何问题,请回报至[email protected]</string>
Expand Down
4 changes: 2 additions & 2 deletions AnLinux/app/src/main/res/values-zh-rTW/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
<string name="de_step3">第三步:啟動Termux,貼上並輸入指令以安裝桌面。注意:您必須先使用 %1$s 來啟動Linux System後才能使用此指令。 </string>
<string name="dashboard_step2">第二步:請複制此指令:%1$s \n\n這將會把%2$s 安裝到您的系統,之後您可以使用%3$s 指令來啟動系統。 </string>
<string name="dashboard_step3">第三步:啟動Termux,貼上並輸入指令以安裝系統。注意:您之後必須使用 %1$s 指令來啟動系統。 </string>
<string name="dashboard_step2_arch">第二步:請複制此指令:%1$s \n\n這將安裝%2$s 到您的設備, 您稍後可以使用%3$s 指令來啟動系統。 \n\n啟動後,您必須執行以下指令:chmod 755 additional.sh &amp;&amp; ./additional.sh 來設置 resolv.conf,否則網絡連接將無法使用。 (僅限第一次)</string>
<string name="dashboard_step3_arch">第三步:啟動Termux,貼上並輸入指令以安裝系統。注意:您之後必須使用./start-arch.sh 指令來啟動系統,之後,您必須執行以下指令:chmod 755 additional.sh &amp;&amp; ./additional.sh 來設置resolv.conf,否則網絡連接將無法使用。 </string>
<string name="dashboard_step2_arch">第二步:請複制此指令:%1$s \n\n這將安裝%2$s 到您的設備, 您稍後可以使用%3$s 指令來啟動系統。 \n\n啟動後,您必須執行以下指令:chmod 755 additional.sh &amp;&amp; ./additional.sh 來設置 resolv.conf 和 pacman-key,否則網絡連接和 pacman 將無法使用! (僅限第一次)</string>
<string name="dashboard_step3_arch">第三步:啟動Termux,貼上並輸入指令以安裝系統。注意:您之後必須使用./start-arch.sh 指令來啟動系統,之後,您必須執行以下指令:chmod 755 additional.sh &amp;&amp; ./additional.sh 來設置resolv.conf 和pacman-key,否則網絡連接和pacman 將無法使用! (僅限第一次)</string>
<string name="dashboard_step2_blackarch">注意:請在Arch Linux系統中執行此指令以開啟BlackArch Repo (Arch Linux必須先安裝\n\n第二步:請複制此指令:%1$s</string>
<string name="dashboard_step3_blackarch">第三步:啟動Termux,輸入 ./start-arch.sh 指令以進入Arch Linux, 貼上並輸入指令以BlackArch Repo。注意: 您必須先使用 ./start-arch.sh 來進入Arch Linux後才能執行此指令。 </string>
<string name="arch_linux_warning_content">Arch Linux 的系統比一般系統更大 (大約 400 MB), 在解壓後講佔用更多空間。推薦至少有1.5GB空間儲備。 \n\n\n注意:\n\n1. 在解壓時會出現此問題:tar: Ignoring unknown extended header keyword \'SCHILY.fflags\',這並不會造成任何問題,請無視。 \n\n2. Arch Linux 系統存在於第三方服務器,並有可能出現無法使用的狀態,如果您發現任何問題,請回報至[email protected]</string>
Expand Down
4 changes: 2 additions & 2 deletions AnLinux/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
<string name="de_step3">Step 3 : Start Termux, paste and enter the command to install the desktop environment. Remember: you will need to run %1$s to run the Linux System before using this command.</string>
<string name="dashboard_step2">Step 2 : Copy the command to clipboard : %1$s \n\nThis should install %2$s on your system, you can then run %3$s to run the command line.</string>
<string name="dashboard_step3">Step 3 : Start Termux, paste and enter the command to install distro. Remember: you will need to run %1$s to run the command line.</string>
<string name="dashboard_step2_arch">Step 2 : Copy the command to clipboard : %1$s \n\nThis should install %2$s on your system, you can then run %3$s to run the command line.\n\nAfter that, you will need to run: chmod 755 additional.sh &amp;&amp; ./additional.sh to setup resolv.conf, otherwise network connection wont work!!! (First time only)</string>
<string name="dashboard_step3_arch">Step 3 : Start Termux, paste and enter the command to install distro. Remember: you will need to run ./start-arch.sh to run the command line, after that, you will also need to run ./additional.sh to setup resolv.conf, otherwise network connection wont work!!!</string>
<string name="dashboard_step2_arch">Step 2 : Copy the command to clipboard : %1$s \n\nThis should install %2$s on your system, you can then run %3$s to run the command line.\n\nAfter that, you will need to run: chmod 755 additional.sh &amp;&amp; ./additional.sh to setup resolv.conf and pacman-key, otherwise network connection and pacman wont work!!! (First time only)</string>
<string name="dashboard_step3_arch">Step 3 : Start Termux, paste and enter the command to install distro. Remember: you will need to run ./start-arch.sh to run the command line, after that, you will also need to run ./additional.sh to setup resolv.conf and pacman-key, otherwise network connection and pacman wont work!!! (First time only)</string>
<string name="dashboard_step2_blackarch">Note: Please run this command inside Arch Linux shell to enable BlackArch Repository (Arch Linux need to be installed first).\n\nStep 2 : Copy the command to clipboard : %1$s</string>
<string name="dashboard_step3_blackarch">Step 3 : Start Termux, enter Arch Linux shell by running ./start-arch.sh, then paste and enter the command to install BlackArch Repo. Remember: you will need to run ./start-arch.sh to enter Arch Linux shell first before using the command above.</string>
<string name="arch_linux_warning_content">Arch Linux image is bigger than other distro (Around 400 MB), and may cost a lot of device space after decompressing. Having spare space over 1.5GB is highly recommended before installing.\n\n\nNote:\n\n1. Tar may produce an error while extracting the image such as: tar: Ignoring unknown extended header keyword \'SCHILY.fflags\', it is not harmful, simply ignore it.\n\n2. Arch Linux image is hosted on an external server, the link may broken in some special case, Please email the developers at [email protected] if encountered this issue.</string>
Expand Down

0 comments on commit ebb9bf1

Please sign in to comment.