diff options
author | grufo | 2017-09-24 22:21:14 +0100 |
---|---|---|
committer | grufo | 2017-09-24 22:21:14 +0100 |
commit | 42832cdee993344f4965b5b2f2060e5897a7d10e (patch) | |
tree | f1a50baec1f2ac4a4e69bfd40cf96d6449f63713 | |
parent | b98018f2940535d1710f238a9a7a2d0f1c07138e (diff) | |
download | aur-42832cdee993344f4965b5b2f2060e5897a7d10e.tar.gz |
tor-browser.sh: preserve the folder `~/.tor-browser/app/Browser/TorBrowser/Data/Browser` (bug fixed)
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 4 | ||||
-rwxr-xr-x | tor-browser.sh | 20 |
3 files changed, 22 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = tor-browser-fa pkgdesc = Tor Browser Bundle: Anonymous browsing using firefox and tor (fa) pkgver = 7.0.5 - pkgrel = 1 + pkgrel = 3 url = https://www.torproject.org/projects/torbrowser.html install = tor-browser.install arch = i686 @@ -36,7 +36,7 @@ pkgbase = tor-browser-fa validpgpkeys = EF6E286DDA85EA2A4BA7DE684E2C6E8793298290 md5sums = 9178c9325979377f7ec57569b15fcb61 md5sums = 494afbfa60fb4ce21840244cc3f7208c - md5sums = 9ba504d97e5841d80e0d1388d3e18951 + md5sums = 01b9fc74fb2ecb96cfa8a1fce1866bb8 source_i686 = https://dist.torproject.org/torbrowser/7.0.5/tor-browser-linux32-7.0.5_fa.tar.xz source_i686 = https://dist.torproject.org/torbrowser/7.0.5/tor-browser-linux32-7.0.5_fa.tar.xz.asc md5sums_i686 = SKIP @@ -20,7 +20,7 @@ _language='fa' _pkgname='tor-browser' pkgname="${_pkgname}-${_language,,}" pkgver='7.0.5' -pkgrel='1' +pkgrel='3' pkgdesc="Tor Browser Bundle: Anonymous browsing using firefox and tor (${_language})" url='https://www.torproject.org/projects/torbrowser.html' arch=('i686' 'x86_64') @@ -50,7 +50,7 @@ source=("${_pkgname}.desktop" md5sums=('9178c9325979377f7ec57569b15fcb61' '494afbfa60fb4ce21840244cc3f7208c' - '9ba504d97e5841d80e0d1388d3e18951') + '01b9fc74fb2ecb96cfa8a1fce1866bb8') md5sums_i686=('SKIP' 'SKIP') md5sums_x86_64=('SKIP' diff --git a/tor-browser.sh b/tor-browser.sh index 0f557ddfb42d..9b17161825a4 100755 --- a/tor-browser.sh +++ b/tor-browser.sh @@ -31,9 +31,9 @@ _TB_ARCH_='__REPL_ARCH__' # other constants and variables _TB_HOME_DIR_=~/".${_TB_PKGNAME_}" -_TB_APP_DIR_="${_TB_HOME_DIR_}/app" _TB_VER_FILE_="${_TB_HOME_DIR_}/VERSION" _TB_LOG_FILE_="${_TB_HOME_DIR_}/LOG" +_TB_APP_DIR_="${_TB_HOME_DIR_}/app" _TB_REFRESH_=0 @@ -63,6 +63,17 @@ _compare_ver_() { _refresh_local_() { + local KEEP_DIR="${_TB_APP_DIR_}/Browser/TorBrowser/Data/Browser" + local KEPT_DIR=~/".${_TB_PKGNAME_}-tmpdata" + local DIR_IS_KEPT=0 + + if [[ -d "${KEEP_DIR}" ]]; then + [[ -d "${KEPT_DIR}" ]] && rm -R "${KEPT_DIR}" + mv "${KEEP_DIR}" "${KEPT_DIR}" + echo "${0}: Preserving files in ${KEPT_DIR}/." >> "${_TB_LOG_FILE_}" + DIR_IS_KEPT=1 + fi + echo "${0}: Extracting files to ${_TB_APP_DIR_}." >> "${_TB_LOG_FILE_}" rm -rf "${_TB_APP_DIR_}"/* tar --strip-components=1 -xJf "/opt/${_TB_PKGNAME_}/tor-browser-${_TB_ARCH_}-${_TB_VERSION_}_${_TB_LANGUAGE_}.tar.xz" \ @@ -71,6 +82,11 @@ _refresh_local_() { \nCheck permissions of ${_TB_APP_DIR_}. \ \nThe error log can be found in ${_TB_LOG_FILE_}." + if [[ ! ${DIR_IS_KEPT} -eq 0 ]]; then + rm -R "${KEEP_DIR}" + mv "${KEPT_DIR}" "${KEEP_DIR}" + fi + [[ -f "${_TB_APP_DIR_}/Browser/start-tor-browser" ]] && echo "${_TB_VERSION_}" > "${_TB_VER_FILE_}" } @@ -109,7 +125,7 @@ _aur_update_() { echo "Everything is up to date (current version: ${_TB_VERSION_})." fi - [[ ${DO_UPDATE} -eq 1 ]] && makepkg -si + [[ ! ${DO_UPDATE} -eq 0 ]] && makepkg -si rm -rf "${TMP_PKGBUILD}" |