more verbosity in install

src/makestaticdist.sh

@@ -2,7 +2,7 @@
 #set -x
 # A shell-script to make a recoll static binary distribution:
 
-TAR=/usr/bin/tar
+TAR=tar
  
 targetdir=${targetdir-/tmp}
 

src/recollinstall

@@ -28,28 +28,45 @@ if test $# != 1 ; then
 fi
 targetdir=$1
 
-echo "Installing to $targetdir"
+echo "Installing binaries to $targetdir"
 
 test -x qtgui/recoll || fatal "qtgui/recoll does not exist." \
      " You need to build first."
 
-install qtgui/recoll $targetdir/bin/recoll
+if test -d $targetdir/bin -a -w $targetdir/bin ; then
-install index/recollindex $targetdir/bin/recollindex
+   install qtgui/recoll $targetdir/bin/recoll
-
+   install index/recollindex $targetdir/bin/recollindex
-if test -d $HOME/.recoll ; then 
+else
-   cat <<EOF
+   echo "Not installing binary executables to $targetdir/bin which is not writable"
-
+   echo "Going on with personal install"
-   $HOME/.recoll already exists, no modification done.
-   You should check for new filters in the filters/ directory, and
-   for modifications to files in the sampleconf/ directory (ie new 
-   mime types in mimemap).
-EOF
-  exit 0
 fi
 
-mkdir $HOME/.recoll || exit 1
+me=`whoami`
-cp filters/rcl* $HOME/.recoll
+if test "$me" != root ; then
-chmod a+x $HOME/.recoll/rcl*
+  if test -d $HOME/.recoll ; then 
-cd sampleconf
+     cat <<EOF
-cp  mimeconf mimemap recoll.conf $HOME/.recoll
+     
+     $HOME/.recoll already exists, no modification done.
+     You should check for new filters in the filters/ directory, and
+     for modifications to files in the sampleconf/ directory (ie new 
+     mime types in mimemap).
+EOF
+     exit 0
+  fi
+
+  mkdir $HOME/.recoll || exit 1
+  cp filters/rcl* $HOME/.recoll
+  chmod a+x $HOME/.recoll/rcl*
+  cd sampleconf
+  cp mimeconf mimemap recoll.conf $HOME/.recoll
+  chmod +w $HOME/.recoll/recoll.conf
+  chmod +w $HOME/.recoll/mimeconf
+
+  echo You should now take a look at $HOME/.recoll/recoll.conf
+ 
+else
+
+  echo "Not installing personal configuration for root user"
+
+fi