Merge pull request #47 from FOXBI/v4.2.1-r01

V4.2.1 r01
FOXBI · Mar 5, 2023 · 4453fd8 · 4453fd8
2 parents b1d3f0d + 2ee01cd
commit 4453fd8
Show file tree

Hide file tree

Showing 11 changed files with 2,082 additions and 5 deletions.
diff --git a/Archive/ch_cpuinfo_4.2.0/LANG.txt b/Archive/ch_cpuinfo_4.2.0/LANG.txt
@@ -0,0 +1,40 @@
+## Do not Change variable!!!
+##
+## If you change to Y value of CUSTLANG,
+## You can do change messages contents to your language.
+##
+## Change the value of MSGECHO to use
+##
+CUSTLANG=N
+##
+##
+### Messages Contents
+MSGECHO01="warning!! Work directly on the original file without backup."
+MSGECHO02="Restore to Original Source and Continue."
+MSGECHO03="Delete Previos Version Backup Location."
+MSGECHO04="Auto Excute, If you select n, proceed interactively  (Cancel : q) [y/n] :"
+MSGECHO05="Proceed with original file backup and preparation.. If you select n, Work directly on the original file. (Cancel : q) [y/n] :"
+MSGECHO06="CPU name, Core count and reflects it. If you select n, Resote original file (Cancel : q) [y/n] :"
+MSGECHO07="There is a history of running the same version. Please run again select 2) redo ."
+MSGECHO08="Do not restore to source when installing a higher version. Contiue..."
+MSGECHO09="You have verified and installed the previous version. Contiue..."
+MSGECHO10="Problem and exit. Please run again after checking."
+MSGECHO11="No execution history at this version. Please go back to the first run."
+MSGECHO12="The target file(location) does not exist. Please run again after checking."
+MSGECHO13="The operation is complete!! It takes about 1-2 minutes to apply, \n(Please refresh the DSM page with F5 or after logout/login and check the information.)"
+MSGECHO14="Only y / n / q can be input. Please proceed again."
+MSGECHO15="DSM CPU Information Change Tool ver."
+MSGECHO16="made by"
+MSGECHO17="Your version of DSM is"
+MSGECHO18="continue"
+MSGECHO19="DSM version less than 5 is not supported. End the process."
+MSGECHO20="1) First run  2) Redo  3) Restore - Select Number :"
+MSGECHO21="Do you want to proceed again? Restore to original file backup and proceed.(Cancel : q) [y/n] :"
+MSGECHO22="Do not proceed with the redo."
+MSGECHO23="Do you want to restore using the original backup file? (Cancel : q) [y/n] :"
+MSGECHO24="No restore was performed."
+MSGECHO25="Please select the correct number."
+## Add inforation 2021.09.30
+MSGECHO26="The CPU information to be applied is as follows."
+## Add inforation 2023.02.17
+MSGECHO27="If you use Surveillance Studio, it also applies to Surveillance Studio System Information."
diff --git a/Archive/ch_cpuinfo_4.2.0/ch_cpuinfo.sh b/Archive/ch_cpuinfo_4.2.0/ch_cpuinfo.sh
diff --git a/Archive/ch_cpuinfo_4.2.0/ch_cpuinfo.tar b/Archive/ch_cpuinfo_4.2.0/ch_cpuinfo.tar
diff --git a/Archive/ch_cpuinfo_4.2.1/LANG.txt b/Archive/ch_cpuinfo_4.2.1/LANG.txt
@@ -0,0 +1,40 @@
+## Do not Change variable!!!
+##
+## If you change to Y value of CUSTLANG,
+## You can do change messages contents to your language.
+##
+## Change the value of MSGECHO to use
+##
+CUSTLANG=N
+##
+##
+### Messages Contents
+MSGECHO01="warning!! Work directly on the original file without backup."
+MSGECHO02="Restore to Original Source and Continue."
+MSGECHO03="Delete Previos Version Backup Location."
+MSGECHO04="Auto Excute, If you select n, proceed interactively  (Cancel : q) [y/n] :"
+MSGECHO05="Proceed with original file backup and preparation.. If you select n, Work directly on the original file. (Cancel : q) [y/n] :"
+MSGECHO06="CPU name, Core count and reflects it. If you select n, Resote original file (Cancel : q) [y/n] :"
+MSGECHO07="There is a history of running the same version. Please run again select 2) redo ."
+MSGECHO08="Do not restore to source when installing a higher version. Contiue..."
+MSGECHO09="You have verified and installed the previous version. Contiue..."
+MSGECHO10="Problem and exit. Please run again after checking."
+MSGECHO11="No execution history at this version. Please go back to the first run."
+MSGECHO12="The target file(location) does not exist. Please run again after checking."
+MSGECHO13="The operation is complete!! It takes about 1-2 minutes to apply, \n(Please refresh the DSM page with F5 or after logout/login and check the information.)"
+MSGECHO14="Only y / n / q can be input. Please proceed again."
+MSGECHO15="DSM CPU Information Change Tool ver."
+MSGECHO16="made by"
+MSGECHO17="Your version of DSM is"
+MSGECHO18="continue"
+MSGECHO19="DSM version less than 5 is not supported. End the process."
+MSGECHO20="1) First run  2) Redo  3) Restore - Select Number :"
+MSGECHO21="Do you want to proceed again? Restore to original file backup and proceed.(Cancel : q) [y/n] :"
+MSGECHO22="Do not proceed with the redo."
+MSGECHO23="Do you want to restore using the original backup file? (Cancel : q) [y/n] :"
+MSGECHO24="No restore was performed."
+MSGECHO25="Please select the correct number."
+## Add inforation 2021.09.30
+MSGECHO26="The CPU information to be applied is as follows."
+## Add inforation 2023.02.17
+MSGECHO27="If you use Surveillance Studio, it also applies to Surveillance Studio System Information."
diff --git a/Archive/ch_cpuinfo_4.2.1/ch_cpuinfo.sh b/Archive/ch_cpuinfo_4.2.1/ch_cpuinfo.sh
diff --git a/Archive/ch_cpuinfo_4.2.1/ch_cpuinfo.tar b/Archive/ch_cpuinfo_4.2.1/ch_cpuinfo.tar
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,10 @@
 # Change Log 
 
+4.2.1-r01.
+   - Update new version (ch_cpuinfo ver 4.2.1-r01) 2023.03.05
+
+   - Fixed error when users of previous version perform redo with version 4.2.0-r01
+
 4.2.0-r01.
    - Update new version (ch_cpuinfo ver 4.2.0-r01) 2023.02.18 
 

diff --git a/LANG.txt b/LANG.txt
@@ -37,4 +37,4 @@ MSGECHO25="Please select the correct number."
 ## Add inforation 2021.09.30
 MSGECHO26="The CPU information to be applied is as follows."
 ## Add inforation 2023.02.17
-MSGECHO27="If you use Surveillance Studio, it also applies to Surveillance Studio System Information."
+MSGECHO27="If you use Surveillance Studio, it also applies to Surveillance Studio System Information."
diff --git a/ch_cpuinfo b/ch_cpuinfo
diff --git a/ch_cpuinfo.sh b/ch_cpuinfo.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-# Updated 2023.02.18 - By FOXBI
+# Updated 2023.03.05 - By FOXBI
 # htttps://github.com/foxbi/ch_cpuinfo
-ver="4.2.0-r01"
+ver="4.2.1-r01"
 # ==============================================================================
 # Location Check
 # ==============================================================================
@@ -99,14 +99,20 @@ PREPARE_FN () {
         then
             mv $WORK_DIR/admin_center.js.gz $BKUP_DIR/
             mv $MWORK_DIR/mobile.js.gz $BKUP_DIR/
-            cp -Rf $SWORK_DIR/System.js $BKUP_DIR/
+            if [ -f "$SWORK_DIR/System.js" ]
+            then              
+                cp -Rf $SWORK_DIR/System.js $BKUP_DIR/
+            fi
 	        cd $BKUP_DIR/
             gzip -df $BKUP_DIR/admin_center.js.gz 
             gzip -df $BKUP_DIR/mobile.js.gz
         else
             cp -Rf $WORK_DIR/admin_center.js $BKUP_DIR/
             cp -Rf $MWORK_DIR/mobile.js $BKUP_DIR/
-            cp -Rf $SWORK_DIR/System.js $BKUP_DIR/
+            if [ -f "$SWORK_DIR/System.js" ]
+            then            
+                cp -Rf $SWORK_DIR/System.js $BKUP_DIR/
+            fi
         fi
     else
         COMMENT08_FN

diff --git a/ch_cpuinfo.tar b/ch_cpuinfo.tar