immudex_build-mksums.sh - dodanie komentarza o użyciu skryptu; immudex_build-upload...

diff --git a/immudex_build-mksums.sh b/immudex_build-mksums.sh
index 96b0badc076cfa21549388ae0778e6cf51dc4f1c..daf015e976d35a899dd7b95e25d2ea230c6ede01 100755 (executable)
--- a/immudex_build-mksums.sh
+++ b/immudex_build-mksums.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+
+#Użycie:
+# $ ./mksums.sh <iso_path> <version>
+
 function okorfail() {
        if [ $1 -eq 0 ]; then echo -e "[ \e[32mOK\e[0m ]";
        else echo -e "[ \e[31mFAIL\e[0m ]"; 

diff --git a/immudex_build-upload.sh b/immudex_build-upload.sh
index 017f9aa84db40a44608dae6494796bfe6cc3c67d..9d3507371dcea3175694b099752a7c901ef1ec4f 100644 (file)
--- a/immudex_build-upload.sh
+++ b/immudex_build-upload.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-BRANCH=$1;
-VERSION=$2;
+BRANCH="testing";
+VERSION=$1;
 
 function okorfail() {
        if [ $1 -eq 0 ]; then echo -e "[ \e[32mOK\e[0m ]";
@@ -10,77 +10,80 @@ function okorfail() {
 }
 
 function prepare_mirror() {
-       if [ "$2" ]; then
-               connection="-p $2 $(echo $1 | cut -d ':' -f 1)";
-       else
-               connection="$(echo $1 | cut -d ':' -f 1)";
-       fi
-       mirrorRootPath=$(echo $1 | cut -d ":" -f 2);
+  mirror=$1;
+  shift;
+  SSH_OPTS=$(echo "$@" | tr [A-Z] [a-z]);
+       connection="$SSH_OPTS $(echo $mirror | cut -d ':' -f 1)";
+       mirrorRootPath=$(echo $mirror | cut -d ":" -f 2);
        ssh $connection "mkdir -p ${mirrorRootPath}/${BRANCH}/{iso/${VERSION},upgrades/${VERSION}/{32,64}}";
        return $?;
 }
 
 function finish_upload() {
-       if [ "$2" ]; then
-               connection="-p $2 $(echo $1 | cut -d ':' -f 1)";
-       else
-               connection="$(echo $1 | cut -d ':' -f 1)";
-       fi
-       #EOLVersion=$(ssh $connection "ls --sort=time | tail -1");
-       #echo -n "Removing old latest symlink...";
-       #ssh $connection "rm ${mirrorRootPath}/${BRANCH}/upgrades/latest";
-       #okorfail $?;
+  mirror=$1;
+  shift;
+  SSH_OPTS=$(echo "$@" | tr [A-Z] [a-z]);
+       connection="$SSH_OPTS $(echo $mirror | cut -d ':' -f 1)";
+       EOLVersion=$(ssh $connection "ls ${mirrorRootPath}/${BRANCH}/iso --sort=time | tail -1");
+       echo -n "Removing old latest symlink...";
+       ssh $connection "rm ${mirrorRootPath}/${BRANCH}/upgrades/latest";
+       okorfail $?;
        echo -n "Creating new latest symlink...";
        ssh $connection "cd ${mirrorRootPath}/${BRANCH}/upgrades && ln -s $VERSION latest;";
        okorfail $?;
-       #echo -n "Removing EOL immudex version from upgrades directory...";
-               #ssh $connection "rm -rf ${mirrorRootPath}/${BRANCH}/upgrades/${EOLVersion}";
-       #`okorfail $?
-       #echo -n "Removing EOL immudex version from iso directory...";
-       #ssh $connection "rm -rf ${mirrorRootPath}/${BRANCH}/iso/${EOLVersion}";
-       #okorfail $?
-       
+       echo -n "Removing EOL immudex version from upgrades directory...";
+  ssh $connection "rm -rf ${mirrorRootPath}/${BRANCH}/upgrades/${EOLVersion}";
+       okorfail $?
+       echo -n "Removing EOL immudex version from iso directory...";
+       ssh $connection "rm -rf ${mirrorRootPath}/${BRANCH}/iso/${EOLVersion}";
+       okorfail $?
 }
 
-echo -n "Getting mirrors list...";
-#wget -q https://raw.githubusercontent.com/xf0r3m/immudex-testing/main/mirrors.txt -O /tmp/mirrors.list;
-okorfail $?;
+function upload() {
+  mirror=$1;
+  shift;
+  SSH_OPTS="$@";
+  echo -n "Uploading iso files...";
+       scp $SSH_OPTS immudex-testing/{32,64}/*.{iso,txt} ${mirror}/${BRANCH}/iso/${VERSION};
+       okorfail $?;
+       echo -n "Uploading 32-bit live (upgrades) files...";
+       scp -P $SSH_OPTS immudex-testing/32/staging/live/* ${mirror}/${BRANCH}/upgrades/${VERSION}/32;
+       okorfail $?
+       echo -n "Uploading 64-bit live (upgrades) files...";
+       scp -P $SSH_OPTS immudex-testing/64/staging/live/* ${mirror}/${BRANCH}/upgrades/${VERSION}/64;
+       okorfail $?
+}
 
-mirrorsList=$(awk '{printf $1" "}' /tmp/mirrors.list)
-for mirror in $mirrorsList; do
-       echo "Uploading immudex-testing version to mirror: $(echo $mirror | cut -d "@" -f2 | cut -d ":" -f 1)...";
-       port=$(grep "^${mirror}" /tmp/mirrors.list | awk '{printf $2}');
-       if [ "$port" ]; then
-               echo -n "Creating necessary directory structure in mirror...";
-               prepare_mirror $mirror $port;
-               okorfail $?;
-               echo -n "Uploading iso files...";
-               scp -P $port immudex-testing/{32,64}/*.{iso,txt} ${mirror}/${BRANCH}/iso/${VERSION};
-               okorfail $?;
-               echo -n "Uploading 32-bit live (upgrades) files...";
-               scp -P $port immudex-testing/32/staging/live/* ${mirror}/${BRANCH}/upgrades/32;
-               okorfail $?
-               echo -n "Uploading 64-bit live (upgrades) files...";
-               scp -P $port immudex-testing/64/staging/live/* ${mirror}/${BRANCH}/upgrades/64;
-               okorfail $?
-               echo -n "Finishing upload new version of immudex...";
-               finish_upload $mirror $port
-       else
-               echo -n "Creating necessary directory structure in mirror...";
-               prepare_mirror $mirror $port;
-               okorfail $?;
-               echo -n "Uploading iso files...";
-               scp immudex-testing/{32,64}/*.{iso,txt} ${mirror}/${BRANCH}/iso/${VERSION};
-               okorfail $?;
-               echo -n "Uploading 32-bit live (upgrades) files...";
-               scp immudex-testing/32/staging/live/* ${mirror}/${BRANCH}/upgrades/32;
-               okorfail $?
-               echo "-n Uploading 64-bit live (upgrades) files...";
-               scp immudex-testing/64/staging/live/* ${mirror}/${BRANCH}/upgrades/64;
-               okorfail $?
-               echo -n "Finishing upload new version of immudex...";
-               finish_upload $mirror $port
-       fi
-done
+#echo -n "Getting mirrors list...";
+#wget -q https://raw.githubusercontent.com/xf0r3m/immudex-testing/main/mirrors.txt -O /tmp/mirrors.list;
+#okorfail $?;
+function main() {
+  mirrorsList=$(awk '{printf $1" "}' /tmp/mirrors.list)
+  for mirror in $mirrorsList; do
+         echo "Uploading immudex-testing version to mirror: $(echo $mirror | cut -d "@" -f2 | cut -d ":" -f 1)...";
+         field2=$(grep "^${mirror}" /tmp/mirrors.list | awk '{printf $2}');
+    field3=$(grep "^${mirror}" /tmp/mirrors.list | awk '{printf $3}');
+    if [ "$field2" ]; then
+      if $(echo $field2 | grep -q '^[0-9]$'); then
+        port=$field2;
+        if [ "$field3" ]; then 
+          idFile=$field3;
+          SSH_OPTS="-P $port -i $idFile";
+        else
+          SSH_OPTS="-P $port";
+        fi
+      else
+        idFile=$field2;
+        SSH_OPTS="-i $idFile";
+      fi
+    fi
+         echo -n "Creating necessary directory structure in mirror...";
+         prepare_mirror $mirror $SSH_OPTS;
+         okorfail $?;
+    upload $mirror $SSH_OPTS;
+         echo -n "Finishing upload new version of immudex...";
+         finish_upload $mirror $SSH_OPTS;
+  done
+}
        
 

diff --git a/sf_upload.sh b/sf_upload.sh
new file mode 100644 (file)
index 0000000..12528f4
--- /dev/null
+++ b/sf_upload.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+source immudex_build-upload.sh
+
+BRANCH="testing";
+VERSION="1.0.7";
+SSH_OPTS="-i /home/nahub5328/.ssh/id_ed25519";
+
+prepare_mirror nahub5328@shell.sourceforge.net:/home/frs/project/breathwood/immudex $SSH_OPTS;
+
+upload nahub5328@frs.sourceforge.net:/home/frs/project/breathwood/immudex $SSH_OPTS;
+
+finish_upload nahub5328@shell.sourceforge.net:/home/frs/project/breathwood/immudex $SSH_OPTS;