Update CHANGELOG.md

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog for ishare2
 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.6.6] - 2023-Feb-02
+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.3.8 (Not possible for this case: 6.x to 5.3.8)
+
+## [v1.6.5] - 2023-Feb-02
+1) Added: Now, menu `ishare2 upgrade` > `option 2` displays a message next to each version to distinguish between the STABLE and BETA versions of PNETLab
+
 ## [v1.6.4] - 2023-Feb-02
 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.3.7 (Not possible for this case: 6.x to 5.3.7)
 

README.md

@@ -129,6 +129,7 @@ wget -O /usr/sbin/ishare2 https://raw.githubusercontent.com/pnetlabrepo/ishare2/
 - Upgrade from any to v5.3.4: [Instructions](https://github.com/pnetlabrepo/ishare2/tree/main/upgrades/from_any_to_5.3.4)
 - Upgrade from any to v5.3.5: [Instructions](https://github.com/pnetlabrepo/ishare2/tree/main/upgrades/from_any_to_5.3.5)
 - Upgrade from any to v5.3.7: [Instructions](https://github.com/pnetlabrepo/ishare2/tree/main/upgrades/from_any_to_5.3.7)
+- Upgrade from any to v5.3.8: [Instructions](https://github.com/pnetlabrepo/ishare2/tree/main/upgrades/from_any_to_5.3.8)
 
 Note: You can also upgrade PNETLab using `ishare2 upgrade`, then using the `option 2` and finally selecting an option from the displayed list
                                                 

gui/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog for ishare2 GUI
 All notable changes to this project will be documented in this file. You can upgrade ishare2 GUI to the latest version using `ishare2 upgrade` and then selecting `option 3`
 
+## [v1.0.4] - 2023-Feb-02
+1) Modified: In this version, when a user looks for installed images, those images are now displayed with correspondant IDs and not with a table starting from 1. This was not causing any bug in previous versions. This upgrade just shows a precise version of installed image IDs. Also, Size and Unit columns were added in order to display more information. It applies to bin, dynamips and qemu searches
+
 ## [v1.0.3] - 2023-Feb-02
 1) Modified: A bug related to search field was solved. This bug was not retrieving the correct id for every match causing wrong downloads. It applies to bin, dynamips and qemu searches
 

gui/version_gui

@@ -1 +1 @@
-v1.0.3
+v1.0.4

ishare2

@@ -29,6 +29,7 @@ function set_url_constants() {
     URL_UPGRADE_PNETLAB_FROM_any_TO_5_3_4=https://raw.githubusercontent.com/pnetlabrepo/ishare2/main/upgrades/from_any_to_5.3.4/upgrade.sh
     URL_UPGRADE_PNETLAB_FROM_any_TO_5_3_5=https://raw.githubusercontent.com/pnetlabrepo/ishare2/main/upgrades/from_any_to_5.3.5/upgrade.sh
     URL_UPGRADE_PNETLAB_FROM_any_TO_5_3_7=https://raw.githubusercontent.com/pnetlabrepo/ishare2/main/upgrades/from_any_to_5.3.7/upgrade.sh
+    URL_UPGRADE_PNETLAB_FROM_any_TO_5_3_8=https://raw.githubusercontent.com/pnetlabrepo/ishare2/main/upgrades/from_any_to_5.3.8/upgrade.sh
     URL_GUI_APP_ZIP=https://raw.githubusercontent.com/pnetlabrepo/ishare2/main/gui/app.zip
     URL_REQUIREMENTS_GUI_APP=https://raw.githubusercontent.com/pnetlabrepo/ishare2/main/gui/requirements.txt
     URL_ISHARE2_GUI_VERSION=https://raw.githubusercontent.com/pnetlabrepo/ishare2/main/gui/version_gui
@@ -968,16 +969,17 @@ function upgrade_ishare2() {
 function menu_ishare2_upgrade_pnetlab() {
     prompt="Please, select an option: "
     options=(
-        "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"
-        "Upgrade PNETLab: from any version to 5.2.9"
-        "Upgrade PNETLab: from any version to 5.3.0"
-        "Upgrade PNETLab: from any version to 5.3.2"
-        "Upgrade PNETLab: from any version to 5.3.4"
-        "Upgrade PNETLab: from any version to 5.3.5"
-        "Upgrade PNETLab: from any version to 5.3.7"
+        "(STABLE) Upgrade PNETLab: from 4.2.10 to 5.0.1"
+        "(BETA) Upgrade PNETLab: from 4.2.10 to 5.2.7" 
+        "(BETA) Upgrade PNETLab: from 5.0.1 to 5.2.7"
+        "(BETA) Upgrade PNETLab: from any version to 5.2.8"
+        "(BETA) Upgrade PNETLab: from any version to 5.2.9"
+        "(BETA) Upgrade PNETLab: from any version to 5.3.0"
+        "(BETA) Upgrade PNETLab: from any version to 5.3.2"
+        "(BETA) Upgrade PNETLab: from any version to 5.3.4"
+        "(BETA) Upgrade PNETLab: from any version to 5.3.5"
+        "(BETA) Upgrade PNETLab: from any version to 5.3.7"
+        "(BETA) Upgrade PNETLab: from any version to 5.3.8"
     )
 
     PS3="$prompt"
@@ -1043,11 +1045,17 @@ function menu_ishare2_upgrade_pnetlab() {
             bash upgrade.sh
             break
             ;;
+        11)
+            wget -O upgrade.sh $URL_UPGRADE_PNETLAB_FROM_any_TO_5_3_8 > /dev/null 2>&1
+            chmod +x upgrade.sh
+            bash upgrade.sh
+            break
+            ;;
         $((${#options[@]}+1)))
             break
             ;;
         *) 
-            STR="Invalid option: Select a number from 1 to 11"
+            STR="Invalid option: Select a number from 1 to 12"
             echo -e "${RED}$STR${NO_COLOR}"
             continue
             ;;

upgrades/from_any_to_5.3.8/README.md

@@ -0,0 +1,27 @@
+```linux
+This script allows to upgrade PNETLab from almost any version to v5.3.8
+It cannot be used when version is 6.x
+
+File 5.3.8.zip will be downloaded from unetlab.cloud
+```
+## upgrade.sh
+
+`This script cannot be used in cases where PNETLab version is 6.x: An error message will be displayed and the script execution will be finished`
+
+`Also, this script detects if you already have PNETLab v5.3.8 in your system and avoids to upgrade twice`
+
+### Upgrade
+Apply this command using the terminal
+```linux
+wget -O upgrade.sh https://raw.githubusercontent.com/pnetlabrepo/ishare2/main/upgrades/from_any_to_5.3.8/upgrade.sh > /dev/null 2>&1 && chmod +x upgrade.sh && bash upgrade.sh
+```
+
+After a few seconds, the upgrade will be done.
+
+Note: This upgrade does not use ishare2:
+
+When you execute the command from above, the steps are as follows:
+
+1) A file called [upgrade.sh](https://raw.githubusercontent.com/pnetlabrepo/ishare2/main/upgrades/from_any_to_5.3.8/upgrade.sh) will be downloaded from this repository
+2) Execution permissions will be made to this file
+3) This script will be executed in order to make the upgrade

upgrades/from_any_to_5.3.8/upgrade.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# Script designed to upgrade PNETLab from almost any version to NEW_PNETLAB_VERSION version
+# Requirement: Not having PNETLab 6.x installed for being able to upgrade to NEW_PNETLAB_VERSION
+# This script avoids to make this upgrade process twice
+
+# CONSTANTS
+NEW_PNETLAB_VERSION=5.3.8
+GREEN='\033[32m'
+NO_COLOR='\033[0m'
+URL_ZIP_FILE=https://unetlab.cloud/api/raw/?path=/UNETLAB%20I/upgrades_pnetlab/from_any_to_$NEW_PNETLAB_VERSION/$NEW_PNETLAB_VERSION.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)
+pnetlab_info=($data)
+pnetlab_version=${pnetlab_info[1]}
+
+if [[ $pnetlab_version == $NEW_PNETLAB_VERSION ]]; then
+    echo "PNETLab already upgraded to v$NEW_PNETLAB_VERSION. You can´t upgrade twice"
+    exit 0
+fi
+
+if [[ $pnetlab_version == *6.* ]]; then
+    echo "It is not possible to upgrade to $NEW_PNETLAB_VERSION having version 6.x"
+    exit 0
+fi
+    
+echo -e "${GREEN}Downloading $NEW_PNETLAB_VERSION zip file...${NO_COLOR}"
+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
+
+echo -e "${GREEN}Unzipping zip file...${NO_COLOR}"
+unzip $NEW_PNETLAB_VERSION.zip -d ./upgrade > /dev/null 2>&1
+echo -e "${GREEN}Zip file has been unzipped successfully...${NO_COLOR}"
+
+chmod 755 -R upgrade
+find upgrade -type f -print0 | xargs -0 dos2unix > /dev/null 2>&1
+
+echo -e "${GREEN}Upgrading to v$NEW_PNETLAB_VERSION...${NO_COLOR}"
+./upgrade/upgrade
+echo -e "${GREEN}Upgrade to v$NEW_PNETLAB_VERSION has been done successfully${NO_COLOR}"
+
+rm -rf upgrade
+#rm $NEW_PNETLAB_VERSION.zip
+
+echo -e "${GREEN}PNETLab VM will be rebooted right now...${NO_COLOR}"
+echo -e "${GREEN}Try to connect again in about a minute${NO_COLOR}"
+reboot

version

@@ -1 +1 @@
-v1.6.4
+v1.6.6