Update CHANGELOG.md

Updated 5.2.8 update package link to new index's link
Added --content-disposition to wget since the new index's direct download link requires that to work

CHANGELOG.md

@@ -1,6 +1,24 @@
 # Changelog
 All notable changes to this project will be documented in this file. You can upgrade ishare2 to the latest version using `ishare2 upgrade` and then selecting `option 1`
 
+## [v1.5.4] - 2023-Jan-23
+
+1) Modified: Changes were made in set_yml_template_folder_location() function. Now, this function support the following PNETLab versions:
+
+    For `/opt/unetlab/html/templates/`: 4.2.10 and 5.0.1
+
+    For `/opt/unetlab/html/templates/intel/` or `/opt/unetlab/html/templates/amd/`: 5.2.x, 5.3.x and 6.x
+
+    5.3.x is not implemented yet (Change made in case it is needed in the future)
+
+## [v1.5.3] - 2023-Jan-22
+
+1) Modified: --content-disposition was added in order to download images from other repo
+
+## [v1.5.2] - 2023-Jan-22
+
+1) Modified: Some strings were modified when using this option: `ishare2 upgrade` > `option 2`. Now, it looks better for users
+
 ## [v1.5.1] - 2023-Jan-22
 
 1) Added: A new option was added to `ishare2 upgrade` > `option 2`: Now, it is possible to upgrade PNETLab from almost any version to v5.2.8 (Not possible for this case: 6.x to 5.2.8)

ishare2

@@ -64,13 +64,11 @@ function set_yml_template_folder_location() {
     data_array=($data)
     pnetlab_version=${data_array[1]}
 
-    if [[ $pnetlab_version == "4.2.10" ]]; then YML_DIR="/opt/unetlab/html/templates/" ; fi
-
-    if [[ $pnetlab_version == "5.2.5" ]] || [[ $pnetlab_version == "5.2.6" ]] || [[ $pnetlab_version == "5.2.7" ]] || [[ $pnetlab_version == "5.2.8" ]]; then
-        get_server_platform
+    if [[ $pnetlab_version == "4.2.10" ]] || [[ $pnetlab_version == "5.0.1" ]]; then
+        YML_DIR="/opt/unetlab/html/templates/"
     fi
     
-    if [[ $pnetlab_version == *6.* ]]; then
+    if [[ $pnetlab_version == *5.2* ]] || [[ $pnetlab_version == *5.3* ]] || [[ $pnetlab_version == *6.* ]]; then
         get_server_platform
     fi
 }
@@ -955,10 +953,10 @@ function upgrade_ishare2() {
 function menu_ishare2_upgrade_pnetlab() {
     prompt="Please, select an option: "
     options=(
-        "Upgrade PNETLab 4.2.10 to 5.0.1"
-        "Upgrade PNETLab 4.2.10 to 5.2.7" 
-        "Upgrade PNETLab 5.0.1 to 5.2.7"
-        "Upgrade PNETLab any to 5.2.8"
+        "Upgrade PNETLab: from 4.2.10 to 5.0.1"
+        "Upgrade PNETLab: from 4.2.10 to 5.2.7" 
+        "Upgrade PNETLab: from 5.0.1 to 5.2.7"
+        "Upgrade PNETLab: from any version to 5.2.8"
     )
 
     PS3="$prompt"
@@ -1089,11 +1087,11 @@ function download_1_file_bin_or_dynamips() {
     echo -e "$SIZE $UNIT\n"
     
     if [[ $TYPE = "dynamips" ]]; then
-        wget -q --show-progress -O /opt/unetlab/addons/dynamips/"$NAME" "$LINK"
+        wget --content-disposition -q --show-progress -O /opt/unetlab/addons/dynamips/"$NAME" "$LINK"
     fi
     
     if [[ $TYPE = "bin" ]]; then
-        wget -q --show-progress -O /opt/unetlab/addons/iol/bin/"$NAME" "$LINK"
+        wget --content-disposition -q --show-progress -O /opt/unetlab/addons/iol/bin/"$NAME" "$LINK"
     fi
 }
 
@@ -1110,7 +1108,7 @@ function download_1_file_qemu() {
     echo -e "\n\033[33mFolder requested:\033[0m $FOLDERNAME (""$SIZE"" ""$UNIT"")"
     echo -e "\nFile requested:\n  $NAME - $SIZE $UNIT\n"
     
-    wget -q --show-progress -O "$NAME" "$LINK"
+    wget --content-disposition -q --show-progress -O "$NAME" "$LINK"
 }
 
 function download_multiple_files_qemu() {
@@ -1127,7 +1125,7 @@ function download_multiple_files_qemu() {
     for (( c=1; c<=FILES_COUNTER; c++ ))
     do
         echo -e "\nFile $c/$FILES_COUNTER"
-        wget -q --connect-timeout 5 --show-progress -P /opt/unetlab/addons/qemu/"$FOLDERNAME" "${myArray[c-1]}"
+        wget --content-disposition -q --connect-timeout 5 --show-progress -P /opt/unetlab/addons/qemu/"$FOLDERNAME" "${myArray[c-1]}"
     done
 }
 

upgrades/from_any_to_5.2.8/upgrade.sh

@@ -8,7 +8,7 @@
 NEW_PNETLAB_VERSION=5.2.8
 GREEN='\033[32m'
 NO_COLOR='\033[0m'
-URL_ZIP_FILE=https://unetlab.cloud/0:/upgrades_pnetlab/from_any_to_5.2.8/5.2.8.zip
+URL_ZIP_FILE=https://unetlab.cloud/api/raw/?path=/UNETLAB%20I/upgrades_pnetlab/from_any_to_5.2.8/5.2.8.zip
 
 # Getting PNETLab version from db
 data=$(mysql -uroot -ppnetlab -D pnetlab_db -e "SELECT control_value FROM control WHERE control_value>1;" 2>/dev/null)
@@ -26,7 +26,7 @@ if [[ $pnetlab_version == *6.* ]]; then
 fi
     
 echo -e "${GREEN}Downloading $NEW_PNETLAB_VERSION zip file...${NO_COLOR}"
-wget -q --show-progress -O /root/$NEW_PNETLAB_VERSION.zip $URL_ZIP_FILE
+wget --content-disposition -q --show-progress -O /root/$NEW_PNETLAB_VERSION.zip $URL_ZIP_FILE
 echo -e "${GREEN}$NEW_PNETLAB_VERSION zip file has been downloaded successfully${NO_COLOR}"
 
 cd /root && rm -rf upgrade

version

@@ -1 +1 @@
-v1.5.1
+v1.5.4