]> Pileus Git - vpaste/blobdiff - index.cgi
projects / vpaste / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
use pty instead of screen
[vpaste] / index.cgi
diff --git a/index.cgi b/index.cgi
index aed8c3c9278dca27cf4ad37fabdd5699ebed8905..3e3c8d5a6f7c92b337cae42438b072426666ab93 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -12,7 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-# Remove url codings form stdin
+# Remove url codings from stdin
 function get_modeline {
        modeline=$(
                echo "$QUERY_STRING" | 
@@ -63,20 +63,21 @@ function do_print {
                sed "1a$(get_modeline)" "$input" > "$tmp"
 
                # - I have some plugins in ~/.vim
-               # - Run ex in screen to trick it into thinking that it
-               #   has a real terminal, not that we also have to set
+               # - Run ex in a pty to trick it into thinking that it
+               #   has a real terminal, note that we also have to set
                #   term=xterm-256color in vimrc
                HOME=/home/andy \
-               screen -D -m ex -nXZ -i NONE -u vimrc \
+               /home/andy/bin/pty ex -nXZ -i NONE -u vimrc \
                        '+set bexpr= fde= fdt= fex= inde= inex= key= pa= pexpr' \
-                       '+set iconstring= ruf= stl= tal= titlestring=' \
+                       '+set iconstring= ruf= stl= tal=' \
+                       "+set titlestring=$1\ -\ vpaste.net" \
                        '+set noml'     \
                        '+2d|'$trim     \
-                       '+%s/\r//g'     \
+                       '+%s/\r//g'     \
                        '+TOhtml'       \
                        "+sav! $output" \
                        '+qall!'        \
-                       "$tmp"
+                       "$tmp" </dev/null >/dev/null 2>&1
 
                header text/html
                cat "$output" 
@@ -90,9 +91,15 @@ function do_print {
 
 # Upload handler
 function do_upload {
+       text=$(cut_file "$1")
+       if [ -z "$text" ]; then
+               header text/plain
+               echo "No text pasted"
+               exit
+       fi
        output="$(mktemp db/XXXXX)"
        uri="$url$(basename "$output")${QUERY_STRING:+"?"}"
-       (get_modeline; cut_file "$1") > "$output"
+       (get_modeline; echo "$text") > "$output"
        echo "Status: 302 Found"
        echo "Location: $uri"
        header text/plain
@@ -106,7 +113,7 @@ filetypes=$(
        sed -n '/^\(syntax\|manual\|synload\|2html\|colortest\|hitest\).vim$/d; s/.vim$//p' |
        sort | uniq
 )
-uploads=$(ls -t db | head -n 5 | sed "s!^!$url!")
+uploads=$(ls -t db | head -n 5)
 
 header text/html
 cat - <<EOF
@@ -116,6 +123,8 @@ cat - <<EOF
        <head>
                <title>vpaste.net - Vim based pastebin</title>
                <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
+               <meta name="description" content="vpaste: Vim based pastebin" />
+               <meta name="keywords" content="vpaste,paste,pastebin,vim" />
                <style type="text/css">
                        * { margin:0; padding:0; }
                        body { margin:1em; }
@@ -123,6 +132,7 @@ cat - <<EOF
                        blockquote,dd,dl,p,pre,ul { margin:0 0 0 2em; }
                        dt { font-weight:bold; padding:0.5em 0 0 0; }
                        blockquote { width:50em; font-size:small; }
+                       span { font-family:monospace; }
                </style>
        </head>
        <body>
@@ -184,14 +194,20 @@ cat - <<EOF
                <li><a href="vpaste?ft=sh">vpaste</a></li>
                <li><a href="index.cgi?ft=sh">index.cgi</a>
                    <a href="vimrc?ft=vim">vimrc</a>
-                   <a href="htaccess?ft=apache">htaccess</a></li>
-               <li><a href="2html-et.patch?ft=diff">2html-et.patch</a></li>
+                   <a href="htaccess?ft=apache">htaccess</a>
+                   <a href="robots.txt?ft=robots">robots.txt</a>
+                   <a href="sitemap.xml?ft=xml">sitemap.xml</a></li>
+               <li><a href="2html.patch?ft=diff">2html.patch</a></li>
                <li><a href="https://lug.rose-hulman.edu/svn/misc/trunk/htdocs/vpaste/">Subversion</a></li>
                </ul>
 
                <h4>LATEST UPLOADS</h4>
-               <ul>$(for uri in ${uploads[@]}; do
-                       echo "<li><a href='$uri'>$uri</a></li>"
+               <ul>$(for upload in ${uploads[@]}; do
+                       echo -n "<li>"
+                       echo -n "<span>$upload</span> "
+                       echo -n "<a href='$upload'>text</a> "
+                       echo -n "<a href='$upload?'>rainbow</a>"
+                       echo "</li>"
                done)</ul>
        </body>
 </html>
Vim based pastebin