diff --git a/build/SynologyNAS/toolkit/source/megacmdpkg/INFO.sh b/build/SynologyNAS/toolkit/source/megacmdpkg/INFO.sh index 96cde3a4..dcc7adea 100644 --- a/build/SynologyNAS/toolkit/source/megacmdpkg/INFO.sh +++ b/build/SynologyNAS/toolkit/source/megacmdpkg/INFO.sh @@ -3,17 +3,18 @@ source /pkgscripts/include/pkg_util.sh package="MEGAcmd" -version="0.9.9000" +version="0.9.9" displayname="MEGAcmd" maintainer="Mega NZ" arch="$(pkg_get_unified_platform)" -description="MEGAcmd command line tool" +description="MEGAcmd command line tool. Access your MEGA.nz secure cloud storage account and upload/download files, use its commands in scripts, automatically synchronise folders between your MEGA.nz account and your Synology NAS. Connect to your NAS via ssh or Putty to use the MEGAcmd commands. Run mega-help from the command line for documentation, or see our User Guide online." os_min_ver="6.1-14715" maintainer="Mega Ltd." maintaner_url="https://MEGA.nz" support_url="https://mega.nz/help" helpurl="https://github.com/meganz/MEGAcmd/blob/master/UserGuide.md" thirdparty="yes" +ctl_stop="no" [ "$(caller)" != "0 NULL" ] && return 0 pkg_dump_info diff --git a/build/SynologyNAS/toolkit/source/megacmdpkg/scripts/postinst b/build/SynologyNAS/toolkit/source/megacmdpkg/scripts/postinst index 2d845ba7..ed890f14 100644 --- a/build/SynologyNAS/toolkit/source/megacmdpkg/scripts/postinst +++ b/build/SynologyNAS/toolkit/source/megacmdpkg/scripts/postinst @@ -1,3 +1,9 @@ #!/bin/bash + +for C in mega-attr mega-backup mega-cd mega-cmd mega-cmd-server mega-confirm mega-cp mega-debug mega-deleteversions mega-du mega-exclude mega-exec mega-export mega-find mega-get mega-help mega-https mega-import mega-invite mega-ipc mega-killsession mega-lcd mega-log mega-login mega-logout mega-lpwd mega-ls mega-mkdir mega-mount mega-mv mega-passwd mega-permissions mega-preview mega-put mega-pwd mega-quit mega-reload mega-rm mega-session mega-share mega-showpcr mega-signup mega-speedlimit mega-sync mega-thumbnail mega-transfers mega-userattr mega-users mega-versio mega-webdav mega-whoami +do + ln -s $SYNOPKG_PKGDEST/$C /usr/local/bin/$C +done + exit 0 diff --git a/build/SynologyNAS/toolkit/source/megacmdpkg/scripts/postuninst b/build/SynologyNAS/toolkit/source/megacmdpkg/scripts/postuninst index 2d845ba7..67197d56 100644 --- a/build/SynologyNAS/toolkit/source/megacmdpkg/scripts/postuninst +++ b/build/SynologyNAS/toolkit/source/megacmdpkg/scripts/postuninst @@ -1,3 +1,9 @@ #!/bin/bash + +for C in mega-attr mega-backup mega-cd mega-cmd mega-cmd-server mega-confirm mega-cp mega-debug mega-deleteversions mega-du mega-exclude mega-exec mega-export mega-find mega-get mega-help mega-https mega-import mega-invite mega-ipc mega-killsession mega-lcd mega-log mega-login mega-logout mega-lpwd mega-ls mega-mkdir mega-mount mega-mv mega-passwd mega-permissions mega-preview mega-put mega-pwd mega-quit mega-reload mega-rm mega-session mega-share mega-showpcr mega-signup mega-speedlimit mega-sync mega-thumbnail mega-transfers mega-userattr mega-users mega-versio mega-webdav mega-whoami +do + rm /usr/local/bin/$C +done + exit 0 diff --git a/build/SynologyNAS/toolkit/source/megacmdpkg/scripts/start-stop-status b/build/SynologyNAS/toolkit/source/megacmdpkg/scripts/start-stop-status index d7434096..677fe522 100644 --- a/build/SynologyNAS/toolkit/source/megacmdpkg/scripts/start-stop-status +++ b/build/SynologyNAS/toolkit/source/megacmdpkg/scripts/start-stop-status @@ -2,13 +2,32 @@ #if changed check no errors are logged in /var/log/bash_err.log on install or run steps if [ "$SYNOPKG_TEMP_LOGFILE" = "" ] ; then - exit 3 +# exit 3 + exit 0 fi -echo "" > "$SYNOPKG_TEMP_LOGFILE" 2> /dev/null +#echo "" > "$SYNOPKG_TEMP_LOGFILE" 2> /dev/null +# +#if [ -e "$SYNOPKG_TEMP_LOGFILE" ] && [ -w "$SYNOPKG_TEMP_LOGFILE" ] ; then +# echo "Please use telnet/ssh/PuTTY or similar to connect and use MEGAcmd. Executables are at $SYNOPKG_PKGDEST/ " >> "$SYNOPKG_TEMP_LOGFILE" +#fi + +#exit 3 + +case $1 in + start) + exit 0 + ;; + stop) + exit 0 + ;; + status) + exit 0 + #exit 150 + ;; + *) + exit 0 + ;; +esac -if [ -e "$SYNOPKG_TEMP_LOGFILE" ] && [ -w "$SYNOPKG_TEMP_LOGFILE" ] ; then - echo "Please use telnet/ssh/PuTTY or similar to connect and use MEGAcmd. Executables are at $SYNOPKG_PKGDEST/ " >> "$SYNOPKG_TEMP_LOGFILE" -fi -exit 3 diff --git a/sdk b/sdk index a7287963..93576558 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit a7287963f36778cc95164401d8a561aa1ae57f2e +Subproject commit 93576558f955d90ed14a48101cbc906bb45ba4cd diff --git a/src/comunicationsmanagerfilesockets.cpp b/src/comunicationsmanagerfilesockets.cpp index 32686741..b035d49e 100644 --- a/src/comunicationsmanagerfilesockets.cpp +++ b/src/comunicationsmanagerfilesockets.cpp @@ -25,6 +25,7 @@ #endif using namespace mega; +using namespace std; int ComunicationsManagerFileSockets::get_next_comm_id() { diff --git a/src/comunicationsmanagerportsockets.cpp b/src/comunicationsmanagerportsockets.cpp index ee742dea..ca4e5637 100644 --- a/src/comunicationsmanagerportsockets.cpp +++ b/src/comunicationsmanagerportsockets.cpp @@ -39,6 +39,7 @@ #endif using namespace mega; +using namespace std; void closeSocket(SOCKET socket){ #ifdef _WIN32 diff --git a/src/listeners.cpp b/src/listeners.cpp index 18f8f865..f1f40a86 100644 --- a/src/listeners.cpp +++ b/src/listeners.cpp @@ -21,6 +21,7 @@ #include "megacmdutils.h" using namespace mega; +using namespace std; #ifdef ENABLE_CHAT void MegaCmdGlobalListener::onChatsUpdate(MegaApi*, MegaTextChatList*) diff --git a/src/megacmd.cpp b/src/megacmd.cpp index 6c943a3e..d4d0bc90 100644 --- a/src/megacmd.cpp +++ b/src/megacmd.cpp @@ -140,6 +140,7 @@ std::ostringstream & operator<< ( std::ostringstream & ostr, std::wstring const #endif using namespace mega; +using namespace std; MegaCmdExecuter *cmdexecuter; MegaCmdSandbox *sandboxCMD; diff --git a/src/megacmd.h b/src/megacmd.h index 3b26947f..68aae96f 100644 --- a/src/megacmd.h +++ b/src/megacmd.h @@ -24,7 +24,7 @@ #define OUTSTREAMTYPE std::wostream #define OUTSTRINGSTREAM std::wostringstream #define OUTSTRING std::wstring -#define COUT wcout +#define COUT std::wcout @@ -39,7 +39,7 @@ void localwtostring(const std::wstring* wide, std::string *multibyte); #define OUTSTREAMTYPE std::ostream #define OUTSTRINGSTREAM std::ostringstream #define OUTSTRING std::string -#define COUT cout +#define COUT std::cout #endif #include "megaapi_impl.h" diff --git a/src/megacmdexecuter.cpp b/src/megacmdexecuter.cpp index 0cf392b9..b8c7da20 100644 --- a/src/megacmdexecuter.cpp +++ b/src/megacmdexecuter.cpp @@ -35,6 +35,7 @@ #include using namespace mega; +using namespace std; static const char* rootnodenames[] = { "ROOT", "INBOX", "RUBBISH" }; static const char* rootnodepaths[] = { "/", "//in", "//bin" };