Improved file manager API functions

Author: serghey-rodin

bin/v-add-fs-archive

@@ -0,0 +1,59 @@
+#!/bin/bash
+# info: archive directory
+# options: USER ARCHIVE DIRECTORY [DIRECTORY_N]
+#
+# The function creates tar archive
+
+user=$1
+archive=$2
+src1=$3
+src2=$4
+src3=$5
+src4=$6
+src5=$7
+src6=$8
+src7=$9
+
+# Checking arguments
+if [ -z "$src1" ]; then
+    echo "Usage: USER ARCHIVE DIRECTORY [DIRECTORY_N]"
+    exit 1
+fi
+
+# Checking vesta user
+if [ ! -e "$VESTA/data/users/$user" ]; then
+    echo "Error: vesta user $user doesn't exist"
+    exit 3
+fi
+
+# Checking user homedir
+homedir=$(grep "^$user:" /etc/passwd | cut -f 6 -d :)
+if [ -z $homedir ]; then
+    echo "Error: user home directory doesn't exist"
+    exit 12
+fi
+
+# Checking archive
+if [ -e "$archive.tar.gz" ]; then
+    echo "Error: archive already exist $archive.tar.gz"
+    exit 1
+fi
+
+# Checking source path
+for src_path in $src1 $src2 $src3 $src4 $src5 $src6 $src7; do
+    rpath=$(readlink -f "$src_path")
+    if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
+        echo "Error: invalid source path $src_path"
+        exit 1
+    fi
+done
+
+# Creating tar.gz archive
+sudo -u $user tar -czf "$archive.tar.gz" \
+    $src1 $src2 $src3 $src4 $src5 $src6 $src7 > /dev/null 2>&1
+if [ "$?" -ne 0 ]; then
+    echo "Error: archive $archive.tar.gz was not created"
+    exit 3
+fi
+
+exit

bin/v-add-fs-directory

@@ -15,23 +15,30 @@ fi
 
 # Checking vesta user
 if [ ! -e "$VESTA/data/users/$user" ]; then
-    exit 1
+    echo "Error: vesta user $user doesn't exist"
+    exit 3
 fi
 
 # Checking user homedir
 homedir=$(grep "^$user:" /etc/passwd | cut -f 6 -d :)
 if [ -z $homedir ]; then
-    exit 1
+    echo "Error: user home directory doesn't exist"
+    exit 12
 fi
 
 # Checking destination path
 rpath=$(readlink -f "$dst_dir")
 if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
-    exit 1
+    echo "Error: invalid destination path $dst_dir"
+    exit 2
 fi
 
 # Adding directory
-sudo -u $user mkdir -p $dst_dir >/dev/null 2>&1
+sudo -u $user mkdir -p "$dst_dir" >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+    echo "Error: directory $dst_dir was not created"
+    exit 3
+fi
 
 # Extiging
-exit $?
+exit

bin/v-add-fs-file

@@ -15,23 +15,30 @@ fi
 
 # Checking vesta user
 if [ ! -e "$VESTA/data/users/$user" ]; then
-    exit 1
+    echo "Error: vesta user $user doesn't exist"
+    exit 3
 fi
 
 # Checking user homedir
 homedir=$(grep "^$user:" /etc/passwd | cut -f 6 -d :)
 if [ -z $homedir ]; then
-    exit 1
+    echo "Error: user home directory doesn't exist"
+    exit 12
 fi
 
 # Checking destination path
 rpath=$(readlink -f "$dst_file")
 if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
-    exit 1
+    echo "Error: invalid destination path $dst_dir"
+    exit 2
 fi
 
 # Creating file
-sudo -u $user touch $dst_file >/dev/null 2>&1
+sudo -u $user touch "$dst_file" >/dev/null 2>&1
+if [ $? -ne 0 ]; then 
+    echo "Error: file $dst_file was not created"
+    exit 3
+fi
 
 # Exiting
-exit $?
+exit

bin/v-change-fs-file-permission

@@ -16,28 +16,36 @@ fi
 
 # Checking vesta user
 if [ ! -e "$VESTA/data/users/$user" ]; then
-    exit 1
+    echo "Error: vesta user $user doesn't exist"
+    exit 3
 fi
 
 # Checking user homedir
 homedir=$(grep "^$user:" /etc/passwd | cut -f 6 -d :)
 if [ -z $homedir ]; then
-    exit 1
+    echo "Error: user home directory doesn't exist"
+    exit 12
 fi
 
 # Checking source file
 if [ ! -f "$src_file" ]; then
-    exit 1
+    echo "Error: source file doesn't exist $src_file"
+    exit 3
 fi
 
 # Checking source path
 rpath=$(readlink -f "$src_file")
 if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
-    exit 1
+    echo "Error: invalid source path $src_file"
+    exit 2
 fi
 
 # Changing file permissions
-sudo -u $user chmod $permisions $src_file >/dev/null 2>&1
+sudo -u $user chmod $permisions "$src_file" >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+    echo "Error: access permission on $src_file was not changed"
+    exit 3
+fi
 
 # Exiting
-exit $?
+exit

bin/v-copy-fs-directory

@@ -16,34 +16,43 @@ fi
 
 # Checking vesta user
 if [ ! -e "$VESTA/data/users/$user" ]; then
-    exit 1
+    echo "Error: vesta user $user doesn't exist"
+    exit 3
 fi
 
 # Checking user homedir
 homedir=$(grep "^$user:" /etc/passwd | cut -f 6 -d :)
 if [ -z $homedir ]; then
-    exit 1
+    echo "Error: user home directory doesn't exist"
+    exit 12
 fi
 
 # Checking source dir
 if [ ! -e "$src_dir" ]; then
-    exit 1
+    echo "Error: source directory $src_dir doesn't exist"
+    exit 3
 fi
 
 # Checking source path
 rpath=$(readlink -f "$src_dir")
 if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
-    exit 1
+    echo "Error: invalid source path $src_dir"
+    exit 2
 fi
 
 # Checking destination path
 rpath=$(readlink -f "$dst_dir")
 if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
-    exit 1
+    echo "Error: invalid destination path $dst_dir"
+    exit 2
 fi
 
 # Copying directory
-sudo -u $user cp -r $src_dir $dst_dir >/dev/null 2>&1
+sudo -u $user cp -r "$src_dir" "$dst_dir" >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+    echo "Error: directory $src_dir was not copied"
+    exit 3
+fi
 
 # Exiting
-exit $?
+exit

bin/v-copy-fs-file

@@ -16,34 +16,43 @@ fi
 
 # Checking vesta user
 if [ ! -e "$VESTA/data/users/$user" ]; then
-    exit 1
+    echo "Error: vesta user $user doesn't exist"
+    exit 3
 fi
 
 # Checking user homedir
 homedir=$(grep "^$user:" /etc/passwd | cut -f 6 -d :)
 if [ -z $homedir ]; then
-    exit 1
+    echo "Error: user home directory doesn't exist"
+    exit 12
 fi
 
 # Checking source file
 if [ ! -f "$src_file" ]; then
-    exit 1
+    echo "Error: $src_file doesn't exist"
+    exit 3
 fi
 
 # Checking source path
 rpath=$(readlink -f "$src_file")
 if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
-    exit 1
+    echo "Error: invalid source path $src_file"
+    exit 2
 fi
 
 # Checking destination path
 rpath=$(readlink -f "$dst_file")
 if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
-    exit 1
+    echo "Error: ivalid destination path $dst_file"
+    exit 2
 fi
 
 # Copying file
-sudo -u $user cp $src_file $dst_file >/dev/null 2>&1
+sudo -u $user cp "$src_file" "$dst_file" >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+    echo "Error: file $src_file was not copied"
+    exit 3
+fi
 
 # Exiting
-exit $?
+exit

bin/v-delete-fs-dir bin/v-delete-fs-directorybin/v-delete-fs-dir renamed to bin/v-delete-fs-directory

@@ -16,23 +16,30 @@ fi
 
 # Checking vesta user
 if [ ! -e "$VESTA/data/users/$user" ]; then
-    exit 1
+    echo "Error: vesta user $user doesn't exist"
+    exit 3
 fi
 
 # Checking user homedir
 homedir=$(grep "^$user:" /etc/passwd | cut -f 6 -d :)
 if [ -z $homedir ]; then
-    exit 1
+    echo "Error: user home directory doesn't exist"
+    exit 12
 fi
 
 # Checking destination path
 rpath=$(readlink -f "$dst_dir")
 if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
+    echo "Error: invalid destination path $dst_dir"
     exit 1
 fi
 
 # Deleting directory
-sudo -u $user rm -rf $dst_dir >/dev/null 2>&1
+sudo -u $user rm -rf "$dst_dir" # >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+    echo "Error: directory $dst_dir was not deleted"
+    exit 3
+fi
 
 # Exiting
-exit $?
+exit

bin/v-delete-fs-file

@@ -16,23 +16,30 @@ fi
 
 # Checking vesta user
 if [ ! -e "$VESTA/data/users/$user" ]; then
-    exit 1
+    echo "Error: vesta user $user doesn't exist"
+    exit 3
 fi
 
 # Checking user homedir
 homedir=$(grep "^$user:" /etc/passwd | cut -f 6 -d :)
 if [ -z $homedir ]; then
-    exit 1
+    echo "Error: user home directory doesn't exist"
+    exit 12
 fi
 
 # Checking destination path
 rpath=$(readlink -f "$dst_file")
 if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
-    exit 1
+    echo "Error: invalid destination path $dst_file"
+    exit 2
 fi
 
 # Deleting file
-sudo -u $user rm -f $dst_file >/dev/null 2>&1
+sudo -u $user rm -f "$dst_file" >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+    echo "Error: file $dst_file was not deleted"
+    exit 3
+fi
 
 # Exiting
-exit $?
+exit