[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-82-g7e76d1d

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit c2f663a693cf5c786506c0bf49b946832a67d2b9
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Feb 23 09:00:34 2013 +0100

    eliminate remaining references to $HOME and ~/bin
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/TODO b/TODO
index 5bd0631..1df4cca 100644
--- a/TODO
+++ b/TODO
@@ -15,7 +15,6 @@ for 0.50:
   - verify that all scripts in $user/bin/ also work from master-slave packages
     eventually enable some conjobs in the packages
   - remove references to /org/piuparts.debian.org from the stock packages
-  - remove references to $HOME/bin and ~/bin from the stock packages
   - slave.postinst should setup ~piupartss/.ssh/known_hosts from /etc/ssh, even
     if only for localhost
   - slave.postinst should setup ~piupartsm/.ssh/authorized_keys using triggers
diff --git a/debian/changelog b/debian/changelog
index f8bea09..026f042 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ piuparts (0.50) UNRELEASED; urgency=low
   * master-bin/slave-bin: Switch to sourcing read_config.sh.
   * conf/crontab*: Substitute @sharedir@ at build time.
   * known_problems: Install to @sharedir@/piuparts/known_problems/.
+  * Replace all remaining references to $HOME/bin and ~/bin with @sharedir at .
   * pre_install_exceptions: Handle bootcd-ia64 installation in squeeze.
   * post_distupgrade_exceptions: Handle libdb4.8 removal in wheezy.
   * pre_remove_50_find_bad_permissions: Add some exceptions.
diff --git a/master-bin/generate_daily_report.in b/master-bin/generate_daily_report.in
index 54b9717..53f936b 100755
--- a/master-bin/generate_daily_report.in
+++ b/master-bin/generate_daily_report.in
@@ -41,7 +41,7 @@ date > $LOCKFILE
 #
 OUTPUT=$(mktemp)
 for SCRIPT in detect_network_issues detect_piuparts_issues archive_old_logs report_newly_bugged_packages ; do
-  ~/bin/$SCRIPT 2>&1 > $OUTPUT
+  @sharedir@/piuparts/master/$SCRIPT 2>&1 > $OUTPUT
   if [ -s $OUTPUT ] ; then
 	cat $OUTPUT | mail -s $SCRIPT $LOGNAME
   fi
@@ -69,11 +69,13 @@ done | sed s#^$MASTER#$URLBASE# >> $DAILYREPORT
 
 echo "" >> $DAILYREPORT
 date >> $DAILYREPORT
-~/bin/detect_well_known_errors 2>&1 >> $DAILYREPORT
+ at sharedir@/piuparts/master/detect_well_known_errors 2>&1 >> $DAILYREPORT
 
 echo "" >> $DAILYREPORT
 date >> $DAILYREPORT
-nice python $PIUPARTS_PREFIX/share/piuparts/piuparts-report 2>&1 >> $DAILYREPORT 2>&1
+nice \
+	@sharedir@/piuparts/piuparts-report \
+	>> $DAILYREPORT 2>&1
 date >> $DAILYREPORT
 
 cat $DAILYREPORT | mail -s piuparts-report $LOGNAME
diff --git a/master-bin/reclassify_bugged.in b/master-bin/reclassify_bugged.in
index 30c8a4c..0bc8426 100755
--- a/master-bin/reclassify_bugged.in
+++ b/master-bin/reclassify_bugged.in
@@ -34,4 +34,5 @@ for SECTION in $SECTIONS ; do
 		cd "$OLDPWD"
 	fi
 done
-~/bin/report_newly_bugged_packages
+
+ at sharedir@/piuparts/master/report_newly_bugged_packages
diff --git a/master-bin/report_newly_bugged_packages.in b/master-bin/report_newly_bugged_packages.in
index ca96507..8f457f9 100755
--- a/master-bin/report_newly_bugged_packages.in
+++ b/master-bin/report_newly_bugged_packages.in
@@ -33,7 +33,7 @@ for SECTION in $SECTIONS ; do
 	test -d $MASTER/$SECTION || continue
 		cd $MASTER/$SECTION
 		get_config_value DISTROS $SECTION upgrade-test-distros " "
-		$PIUPARTS_PREFIX/share/piuparts/piuparts-analyze ${DISTROS##* } 2>&1 > $OUTPUT
+		@sharedir@/piuparts/piuparts-analyze ${DISTROS##* } 2>&1 > $OUTPUT
 		if [ -s $OUTPUT ]; then
 			echo $SECTION
 			cat $OUTPUT

-- 
piuparts git repository