openmamba/autodist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

webbuild: support adding BASE_URL to search result links

Browse Source
This commit is contained in:
Silvan Calarco 2014-10-05 19:26:55 +02:00
parent 4d8a804eee
commit d77d29fd37
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/autodist/config
View File

@ -1,7 +1,8 @@
# Global configuration file for autodist # Global configuration file for autodist
# #
AUTODIST_ARCHS=(i586 x86_64 arm) AUTODIST_ARCHS=(i586 x86_64 arm)
REPS_BASE_URL=http://www.openmamba.org/pub/openmamba SITE_BASE_URL=http://www.openmamba.org
REPS_BASE_URL=${SITE_BASE_URL}/pub/openmamba
LOCAL_REPS_BASE_DIR=/var/ftp/pub/openmamba LOCAL_REPS_BASE_DIR=/var/ftp/pub/openmamba
SEND_SERVER=devel-autodist SEND_SERVER=devel-autodist
#WEBBUILD_URL=http://localhost/cgi-bin/webbuild #WEBBUILD_URL=http://localhost/cgi-bin/webbuild

6
webbuild/webbuild-cgi
View File

@ -467,7 +467,8 @@ if [ "$REQUEST" = "repsearch" ]; then
echo -n "<hr><b>Search results for \"$REPSEARCHTEXT\":</b><div align=left class=output id=outputtop style=\"font-family:serif;color:black;background-color:#E0F2D0;\">" echo -n "<hr><b>Search results for \"$REPSEARCHTEXT\":</b><div align=left class=output id=outputtop style=\"font-family:serif;color:black;background-color:#E0F2D0;\">"
# echo -n "<pre><!-- SCROLL -->" # echo -n "<pre><!-- SCROLL -->"
curl -s "${WEBBUILD_DISTROQUERY_URL}?query=$REPSEARCHTEXT&search_milestone2=true&search_devel=true\ curl -s "${WEBBUILD_DISTROQUERY_URL}?query=$REPSEARCHTEXT&search_milestone2=true&search_devel=true\
&search_i586=true&search_x86_64=true&search_arm=true&search_sources=true&query_compact=true&replyplain=true" &search_i586=true&search_x86_64=true&search_arm=true&search_sources=true&query_compact=true&replyplain=true" | \
sed "s| \(href=.\)/| \1${SITE_BASE_URL}/|g"
# $SUDO_WRAPPER 0 local "$USER" "" "autodist-repository search -i ${REPSEARCHTEXT/-/\-}" | \ # $SUDO_WRAPPER 0 local "$USER" "" "autodist-repository search -i ${REPSEARCHTEXT/-/\-}" | \
# parse_search_output ${AUTOPORT_ARCH[$ENVIRONMENT]} # parse_search_output ${AUTOPORT_ARCH[$ENVIRONMENT]}
# sed "s|\(.*(source).*\)|<font color=white><b>\1</b></font>|; # sed "s|\(.*(source).*\)|<font color=white><b>\1</b></font>|;
@ -1149,7 +1150,8 @@ if [ "$MAINTAINERMODE" = "true" ]; then
curl -s $REPS_BASE_URL/distromatic/$REPOSITORY/_recent.inc > $WEBBUILD_STATEDIR/cache/repository-recent-$REPOSITORY curl -s $REPS_BASE_URL/distromatic/$REPOSITORY/_recent.inc > $WEBBUILD_STATEDIR/cache/repository-recent-$REPOSITORY
curl -s $REPS_BASE_URL/$REPOSITORY/distromatic.log > $WEBBUILD_STATEDIR/cache/repository-distromaticlog-$REPOSITORY curl -s $REPS_BASE_URL/$REPOSITORY/distromatic.log > $WEBBUILD_STATEDIR/cache/repository-distromaticlog-$REPOSITORY
fi fi
cat $WEBBUILD_STATEDIR/cache/repository-recent-$REPOSITORY | sed "s|a href=|a target=new href=|g" cat $WEBBUILD_STATEDIR/cache/repository-recent-$REPOSITORY | sed "s|a \(href=.\)/|a target=new \1${SITE_BASE_URL}/|g"
echo -n "<br><b>Log:</b><br><pre>" echo -n "<br><b>Log:</b><br><pre>"
cat $WEBBUILD_STATEDIR/cache/repository-distromaticlog-$REPOSITORY cat $WEBBUILD_STATEDIR/cache/repository-distromaticlog-$REPOSITORY
echo -n "</pre></div>" echo -n "</pre></div>"