From 5db10a97247414dd1d1e1fcb1ff60a396762a434 Mon Sep 17 00:00:00 2001
From: Geoffrey Frogeye <geoffrey@frogeye.fr>
Date: Sun, 20 Nov 2016 19:53:27 +0100
Subject: [PATCH] Debloc dependent of apt

This was needed for Ubuntu systems where dpkg don't hold all the
informations. Though, apt is not used when using $DEBIAN_DB.
---
 scripts/debloc-custom.sh |  2 +-
 scripts/debloc.sh        | 28 ++++++++++++++++++++--------
 scripts/proxy.sh         |  8 --------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/scripts/debloc-custom.sh b/scripts/debloc-custom.sh
index 58073a6..cc5e910 100755
--- a/scripts/debloc-custom.sh
+++ b/scripts/debloc-custom.sh
@@ -4,7 +4,7 @@
 
 function debloc-custom-cli {
     # Utils
-    debloc-install moreutils screen ncdu htop sl proxytunnel pass
+    debloc-install moreutils screen ncdu htop sl proxytunnel pass pv
 
     # Text editor
     debloc-install vim exuberant-ctags
diff --git a/scripts/debloc.sh b/scripts/debloc.sh
index 0dfec1b..9eeb1b4 100755
--- a/scripts/debloc.sh
+++ b/scripts/debloc.sh
@@ -6,7 +6,7 @@ DEBLOC_ROOT=$HOME/.debloc/$ARCH
 
 if [ -z $DEBIAN_MIRROR ]; then
     DEBIAN_MIRROR=$(cat /etc/apt/sources.list | grep '^deb ' | grep main | grep -v security | grep -v updates | grep -v backports)
-    DEBIAN_MIRROR=$(echo $DEBIAN_MIRROR | head -1 | cut -d ' ' -f 2 | sed 's/\w\+:\/\///')
+    DEBIAN_MIRROR=$(echo $DEBIAN_MIRROR | head -1 | cut -d ' ' -f 2 | sed 's/\/$//')
 fi
 
 mkdir -p $DEBLOC_DB &> /dev/null
@@ -19,10 +19,10 @@ export QT_QPA_PLATFORM_PLUGIN_PATH="$DEBLOC_ROOT/usr/lib/x86_64-linux-gnu/qt5/pl
 
 # Tell if a package exists
 function _debloc-exists { # package
-    if [ -f $DEBIAN_DB ]; then
+    if [[ -n $DEBIAN_DB && -f $DEBIAN_DB ]]; then
         grep "^Package: $1\$" $DEBIAN_DB --quiet
     else
-        dpkg --status $1 &> /dev/null
+        LANG=C apt-cache show $1 &> /dev/null
     fi
     if [ $? == 0 ]; then
         return 1
@@ -51,7 +51,7 @@ function _debloc-filterVirtual { # package
 
 # Tell if a package is installed via debloc
 function _debloc-locallyInstalled { # package
-    if [ -e $DEBLOC_DB/$1 ]; then
+    if [ -f $DEBLOC_DB/$1 ]; then
         return 1
     else
         return 0
@@ -60,10 +60,18 @@ function _debloc-locallyInstalled { # package
 
 # Tell if a package is installed system-wide
 function _debloc-globallyInstalled { # package
-    dpkg --status $1 | grep '^Status:' | grep 'not-installed' --quiet
+    STATUS=$(mktemp)
+    LANG=C dpkg --status $1 &> $STATUS
     if [ $? != 0 ]; then
+        rm -f $STATUS > /dev/null
+        return 0
+    fi
+    cat $STATUS | grep '^Status:' | grep 'not-installed' --quiet
+    if [ $? != 0 ]; then
+        rm -f $STATUS > /dev/null
         return 1
     else
+        rm -f $STATUS > /dev/null
         return 0
     fi
 }
@@ -81,7 +89,12 @@ function _debloc-packageShow { # package
         done
         return 1
     else
-        dpkg --print-avail $pkg
+        LANG=C apt-cache show $pkg | while read line; do
+            if [ -z "$line" ]; then
+                return 0
+            fi
+            echo $line
+        done
         return 0
     fi
 }
@@ -145,10 +158,9 @@ function _debloc-installDeb { # path
 function _debloc-install { # package
     pkg=$1
 
-    echo "→ Downloading"
     url=${DEBIAN_MIRROR}/$(_debloc-packagePath $pkg)
+    echo "→ Downloading $url"
     DEB_FILE=$(mktemp) &> /dev/null
-    echo $url
     wget "$url" --quiet -O $DEB_FILE
     if [ $? != 0 ]; then
         echo "→ Failed!"
diff --git a/scripts/proxy.sh b/scripts/proxy.sh
index 13158c5..9f15429 100755
--- a/scripts/proxy.sh
+++ b/scripts/proxy.sh
@@ -5,10 +5,6 @@ function proxy_set {
     export https_proxy=$1
     export ftp_proxy=$1
     export rsync_proxy=$1
-    export HTTP_PROXY=$1
-    export HTTPS_PROXY=$1
-    export FTP_PROXY=$1
-    export RSYNC_PROXY=$1
     echo "Proxy changed"
 }
 
@@ -42,10 +38,6 @@ function proxy_off {
     unset https_proxy
     unset ftp_proxy
     unset rsync_proxy
-    unset HTTP_PROXY
-    unset HTTPS_PROXY
-    unset FTP_PROXY
-    unset RSYNC_PROXY
     echo -e "Proxy removed"
 }