Skip to content

Update mvd_transfer.sh #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
darkshade9 wants to merge 2 commits into
base: aqtion
Choose a base branch
from
Open

Update mvd_transfer.sh #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
920611f
Update mvd_transfer.sh
darkshade9 Oct 17, 2023
0ea5f91
Update mvd.lua
darkshade9 Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion plugins/mvd.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ end

function mvd_os_exec(script)
gi.dprintf('mvd.lua mvd_os_exec(): '..script..'\n')
local returnstuff = os.execute(script)
local cmd = string.format('nohup %s > script.log 2>&1 &', script)
local returnstuff = os.execute(cmd)
gi.dprintf('mvd.lua mvd_os_exec(): returns: '..returnstuff..'\n')
return returnstuff
end
Expand Down
34 changes: 27 additions & 7 deletions plugins/mvd_transfer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,36 @@ _rsakeylocation="$HOME/.ssh/id_rsa"

## AQTion MVD transfer

if [ -f "${_fullfilepath}" ]; then
( sleep 10 ) && ( s3cmd put "${_fullfilepath}" s3://${_s3bucket}/${_targetdir}/${_servertargetdir}/${_file} ) &
elif [ -z "${_file}" ]; then
echo "$0 Error: $_file not found. Not transferring anything. :("
exit 1
else
echo "Something went wrong other than file not found"
max_retries=5
retries=0

while [ $retries -lt $max_retries ]; do
if [ -f "${_fullfilepath}" ]; then
if lsof "${_fullfilepath}" > /dev/null; then
echo "Error: ${_file} is open or being written to by another process. Not transferring."
exit 1
else
( sleep 5 ) && ( s3cmd put "${_fullfilepath}" s3://${_s3bucket}/${_targetdir}/${_servertargetdir}/${_file} ) && break
fi
elif [ -z "${_file}" ]; then
echo "$0 Error: ${_file} not found. Not transferring anything. :("
exit 1
else
echo "Something went wrong other than file not found"
exit 1
fi

retries=$((retries+1))
echo "Upload failed (retry $retries of $max_retries). Retrying in 2 seconds..."
sleep 2
done

if [ $retries -eq $max_retries ]; then
echo "Max retries reached for ${_file}. Upload failed after $max_retries attempts. Exiting."
exit 1
fi


## Old method, keeping around but unused:

# if [ -f "${_filepath}/${_file}" ]; then
Expand Down