Hello community, here is the log from the commit of package plowshare for openSUSE:Factory checked in at 2015-09-02 00:36:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plowshare (Old) and /work/SRC/openSUSE:Factory/.plowshare.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plowshare" Changes: -------- --- /work/SRC/openSUSE:Factory/plowshare/plowshare.changes 2015-05-10 10:46:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plowshare.new/plowshare.changes 2015-09-02 00:36:35.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 1 07:26:24 UTC 2015 - [email protected] + +- Update to 2.1.2 + * [core] Minor fixes. More cygwin/bsd friendly. +- Merge bash completion to main package + +------------------------------------------------------------------- Old: ---- v2.1.1.tar.gz New: ---- v2.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plowshare.spec ++++++ --- /var/tmp/diff_new_pack.Ks0iL8/_old 2015-09-02 00:36:36.000000000 +0200 +++ /var/tmp/diff_new_pack.Ks0iL8/_new 2015-09-02 00:36:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: plowshare -Version: 2.1.1 +Version: 2.1.2 Release: 0 Summary: Download and upload files from file-sharing websites License: GPL-3.0+ @@ -29,7 +29,8 @@ Requires: bash >= 4.1 Requires: curl >= 7.24 Requires: recode -Recommends: %{name}-bash-completion +Provides: %{name}-bash-completion = %{version} +Obsoletes: %{name}-bash-completion < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -39,23 +40,13 @@ files and manage remote folders and link deletion. It runs on Linux/BSD/Unix operating system. The basic concept is that files can be downloaded and uploaded though command line as easily as wget (or curl). -%package bash-completion -Summary: Bash-completion for plowshare -Group: Productivity/Networking/Web/Utilities -Requires: %{name} = %{version} -Requires: bash-completion -BuildArch: noarch - -%description bash-completion -This package contains bash-completion support for plowshare utility. - %prep %setup -q %build %install -%make_install PREFIX=%{_prefix} %{?_smp_mflags} +make DESTDIR=%{buildroot} install %{?_smp_mflags} install -D -m 0644 scripts/%{name}.completion %{buildroot}%{_sysconfdir}/bash_completion.d/%{name} sed -i 's|/local||g' %{buildroot}%{_sysconfdir}/bash_completion.d/%{name} @@ -68,9 +59,6 @@ %{_datadir}/%{name} %{_mandir}/man1/* %{_mandir}/man5/%{name}.conf.5.* - -%files bash-completion -%defattr(-,root,root,-) %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/* %config %{_sysconfdir}/bash_completion.d/plowshare ++++++ v2.1.1.tar.gz -> v2.1.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plowshare-2.1.1/CHANGELOG new/plowshare-2.1.2/CHANGELOG --- old/plowshare-2.1.1/CHANGELOG 2015-05-03 08:45:53.000000000 +0200 +++ new/plowshare-2.1.2/CHANGELOG 2015-08-15 12:20:49.000000000 +0200 @@ -1,3 +1,9 @@ +plowshare (2.1.2) stable; urgency=low + + * [core] Minor fixes. More cygwin/bsd friendly. + + -- Matthieu Crapet <[email protected]> Sat, 15 Aug 2015 12:17:36 +0200 + plowshare (2.1.1) stable; urgency=medium * [plowmod] Fixes with git (requires git v1.8.5+) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plowshare-2.1.1/INSTALL new/plowshare-2.1.2/INSTALL --- old/plowshare-2.1.1/INSTALL 2015-05-03 08:45:53.000000000 +0200 +++ new/plowshare-2.1.2/INSTALL 2015-08-15 12:20:49.000000000 +0200 @@ -62,6 +62,8 @@ 2) Manual method: from git sources +$ git clone https://github.com/mcrapet/plowshare.git + # If you have root privileges (like Ubuntu) $ sudo make install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plowshare-2.1.1/README.md new/plowshare-2.1.2/README.md --- old/plowshare-2.1.1/README.md 2015-05-03 08:45:53.000000000 +0200 +++ new/plowshare-2.1.2/README.md 2015-08-15 12:20:49.000000000 +0200 @@ -177,6 +177,19 @@ **Remark**: Be aware that cURL is not capable of uploading files containing a comma `,` in their name, so make sure to rename them before using *plowup*. +Use cache over sessions to avoid multiple logins: + +```sh +$ plowup --cache=shared -a 'user:pasword' 1fichier file1.zip +$ plowup --cache=shared 1fichier file2.zip +``` + +On first command line, login stage will be performed and session (token or cookie) will be saved in +`~/.config/plowshare/storage/module-name.txt`. +On second command line, *plowup* will reuse the data stored to bypass login step. You don't have to specify credentials. + +**Note**: Only few hosters currently support cache mecanism. + ### Plowdel Delete a file from MegaShares (*delete link* required): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plowshare-2.1.1/src/core.sh new/plowshare-2.1.2/src/core.sh --- old/plowshare-2.1.1/src/core.sh 2015-05-03 08:45:53.000000000 +0200 +++ new/plowshare-2.1.2/src/core.sh 2015-08-15 12:20:49.000000000 +0200 @@ -1003,8 +1003,7 @@ # # $1: filename basename_file() { - # `basename -- "$1"` may be screwed on some BusyBox versions - echo "${1##*/}" + basename -- "$1" || return $ERR_SYSTEM } # HTML entities will be translated @@ -2396,7 +2395,7 @@ ;; # kibibyte (KiB) KiB|Ki|K|KB) - echo $(( 1024 * R + F)) + echo $(( 1024 * R + 1024 * F / 1000)) ;; # megabyte (10^6) M|MB) @@ -2404,7 +2403,7 @@ ;; # mebibyte (MiB) MiB|Mi|m|mB) - echo $(( 1048576 * R + 1000 * F)) + echo $(( 1048576 * R + 1048576 * F / 1000)) ;; # gigabyte (10^9) G|GB) @@ -2412,7 +2411,7 @@ ;; # gibibyte (GiB) GiB|Gi) - echo $(( 1073741824 * R + 1000000 * F)) + echo $(( 1073741824 * R + 1073741824 * F / 1000)) ;; # bytes B|'') @@ -2450,7 +2449,7 @@ CONFIG="$PLOWSHARE_CONFDIR/storage" if [ ! -d "$CONFIG" ]; then - mkdir --parents "$CONFIG" + mkdir -p "$CONFIG" chmod 700 "$CONFIG" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plowshare-2.1.1/src/download.sh new/plowshare-2.1.2/src/download.sh --- old/plowshare-2.1.1/src/download.sh 2015-05-03 08:45:53.000000000 +0200 +++ new/plowshare-2.1.2/src/download.sh 2015-08-15 12:20:49.000000000 +0200 @@ -612,12 +612,12 @@ return $ERR_NETWORK fi - chmod 644 "$FILENAME_TMP" || log_error "chmod failed: $FILENAME_TMP" + chmod 644 "$FILENAME_TMP" 2>/dev/null || log_error "chmod failed: $FILENAME_TMP" if [ "$FILENAME_TMP" != "$FILENAME_OUT" ]; then test "$TEMP_RENAME" || \ log_notice "Moving file to output directory: ${OUT_DIR:-.}" - mv -f "$FILENAME_TMP" "$FILENAME_OUT" + mv -f "$FILENAME_TMP" "$FILENAME_OUT" 2>/dev/null || log_error "mv failed: $FILENAME_TMP" fi mark_queue "$TYPE" "$MARK_DOWN" "$ITEM" "$URL_RAW" OK "$FILENAME_OUT" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plowshare-2.1.1/src/mod.sh new/plowshare-2.1.2/src/mod.sh --- old/plowshare-2.1.1/src/mod.sh 2015-05-03 08:45:53.000000000 +0200 +++ new/plowshare-2.1.2/src/mod.sh 2015-08-15 12:20:49.000000000 +0200 @@ -299,7 +299,7 @@ fi log_debug "modules directory: $DDIR" -[ -d "$DDIR" ] || mkdir --parents "$DDIR" +[ -d "$DDIR" ] || mkdir -p "$DDIR" if [ ! -w "$DDIR" ]; then log_error 'ERROR: Modules directory is not writable, abort.' exit $ERR_BAD_COMMAND_LINE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plowshare-2.1.1/src/upload.sh new/plowshare-2.1.2/src/upload.sh --- old/plowshare-2.1.1/src/upload.sh 2015-05-03 08:45:53.000000000 +0200 +++ new/plowshare-2.1.2/src/upload.sh 2015-08-15 12:20:49.000000000 +0200 @@ -508,6 +508,13 @@ log_debug 'arbitrary wait (from module)' fi wait ${AWAIT:-60} || { URETVAL=$?; break; } + + # Unspecified retry but this error does not count as a retry + if [[ $MAXRETRIES -eq 0 ]]; then + log_notice "Starting upload ($MODULE): retry (after wait request)" + continue + fi + elif [[ $MAXRETRIES -eq 0 ]]; then break elif [ $URETVAL -ne $ERR_FATAL -a $URETVAL -ne $ERR_NETWORK -a \
