View | Details | Raw Unified | Return to bug 7124
Collapse All | Expand All

(-)dosemu-1.3.2.orig/dist/dosemu (-90 / +2 lines)
Lines 8-14 Link Here
8
# the below line gets patched, when a systemwide install is done
8
# the below line gets patched, when a systemwide install is done
9
SYSTEM_INSTALL_PATH=NOT_SYSTEM_WIDE
9
SYSTEM_INSTALL_PATH=NOT_SYSTEM_WIDE
10
SYSTEM_CONF_PATH=NOT_SYSTEM_WIDE
10
SYSTEM_CONF_PATH=NOT_SYSTEM_WIDE
11
SYSTEM_XFONTS_PATH=NOT_SYSTEM_WIDE
12
SYSTEM_BIN_PATH=NOT_SYSTEM_WIDE
11
SYSTEM_BIN_PATH=NOT_SYSTEM_WIDE
13
test "$SYSTEM_INSTALL_PATH" != "NOT_SYSTEM_WIDE" && IS_SYSTEM_WIDE=1
12
test "$SYSTEM_INSTALL_PATH" != "NOT_SYSTEM_WIDE" && IS_SYSTEM_WIDE=1
14
13
Lines 261-356 Link Here
261
  fi
260
  fi
262
fi
261
fi
263
262
264
unset XFLAG
265
if [ "`basename $ARG0`" = "xdosemu" ]; then
266
  if [ -n "$DUMBTERM" ]; then
267
    echo "
268
  You requested a dumb terminal together with X!
269
  ... falling back to non-X
270
"
271
  else
272
    XFLAG=1
273
  fi
274
fi
275
276
if [ -z "$IS_SYSTEM_WIDE" ]; then
263
if [ -z "$IS_SYSTEM_WIDE" ]; then
277
  BOOT_DIR_PATH=`cd $HOME/.dosemu/drives && ls -l c | sed 's/.* -> //'`/..
264
  BOOT_DIR_PATH=`cd $HOME/.dosemu/drives && ls -l c | sed 's/.* -> //'`/..
278
fi
265
fi
279
266
280
if [ -n "$XFLAG" ]; then
281
  XFLAG=-X
282
  if [ -z "$DISPLAY" ]; then
283
    echo "
284
  You do not have the DISPLAY variable set, but want to run DOSEMU
285
  in its own X-window. Set the DISPLAY variable such as
286
287
      DISPLAY=:0.0; export DISPLAY
288
289
  if running X locally or
290
291
      DISPLAY=host:0.0; export DISPLAY
292
293
  when running remotely ('host' being the machine where you are typing at)
294
295
  After this run xdosemu again.
296
"
297
    exit 1
298
  fi
299
  
300
  if [ -f $HOME/.dosemurc ]; then
301
    FONT=`grep '$_X_font' $HOME/.dosemurc | \
302
         sed -e 's|[#[:space:]]*\$_X_font[[:space:]]*=[[:space:]]*\"\(.*\)\".*|\1|'`
303
  fi
304
305
  if [ "$FONT" = "" -a -f $SYSTEM_CONF_PATH/dosemu.conf ]; then
306
     FONT=`grep '$_X_font' $SYSTEM_CONF_PATH/dosemu.conf | \
307
        sed -e 's|[#[:space:]]*\$_X_font[[:space:]]*=[[:space:]]*\"\(.*\)\".*|\1|'`
308
  fi
309
310
  if [ "$FONT" = "" ]; then
311
     FONT="vga"
312
  fi
313
314
  if [ -z "$IS_SYSTEM_WIDE" ]; then
315
     if [ "`xlsfonts -o -fn $FONT 2>/dev/null`" = "" ]; then
316
        if [ ! -f $BOOT_DIR_PATH/Xfonts/fonts.dir ]; then
317
           (cd $BOOT_DIR_PATH/Xfonts; mkfontdir)
318
        fi
319
        if ! xset +fp $BOOT_DIR_PATH/Xfonts 2>/dev/null; then
320
	   # messed up font path -- last resort
321
           xset fp default
322
           xset +fp $BOOT_DIR_PATH/Xfonts 2>/dev/null
323
        fi
324
     fi
325
  else
326
     if [ "`xlsfonts -o -fn $FONT 2>/dev/null`" = "" ]; then
327
        if ! xset +fp $SYSTEM_XFONTS_PATH 2>/dev/null; then
328
	   # messed up font path -- last resort
329
           xset fp default
330
           xset +fp $SYSTEM_XFONTS_PATH 2>/dev/null
331
        fi
332
     fi
333
  fi
334
  if [ "`xlsfonts -o -fn $FONT 2>/dev/null`" = "" ]; then
335
     echo "
336
   You do not have the DOSEMU $FONT font installed and are running
337
   remote X. You need to install the $FONT font on your _local_ Xserver.
338
   Look at the readme for details. For now we start with an fixed font,
339
   which does not display all national characters correctly.
340
   ... be warned
341
"
342
  fi
343
  w4l_check
344
  if [ -z "$QUIET" -a ! -f $HOME/.dosemu/stamp-xdosemu ]; then
345
    echo "
346
   DOSEMU will run in its own X window.
347
   To terminate it you have three choices:
348
   - type <Ctrl>-C _here_ (not in the dosemu window)
349
   - type <Ctrl><Alt><PgDn> in the dosemu window
350
   - execute 'exitemu' at the DOS prompt"
351
    touch ~/.dosemu/stamp-xdosemu
352
  fi
353
else
354
  if [ -z "$QUIET" -a ! -f $HOME/.dosemu/stamp-dosemu ]; then
267
  if [ -z "$QUIET" -a ! -f $HOME/.dosemu/stamp-dosemu ]; then
355
    echo "
268
    echo "
356
   DOSEMU will run on _this_ terminal.
269
   DOSEMU will run on _this_ terminal.
Lines 376-382 Link Here
376
    read dummy
289
    read dummy
377
    touch ~/.dosemu/stamp-dosemu
290
    touch ~/.dosemu/stamp-dosemu
378
  fi
291
  fi
379
fi
380
292
381
DOSDRIVE_D="$HOME"
293
DOSDRIVE_D="$HOME"
382
export DOSDRIVE_D
294
export DOSDRIVE_D
Lines 424-430 Link Here
424
336
425
eval "set -- $SUFFIX"
337
eval "set -- $SUFFIX"
426
if [ -n "$STRING_I" ] ; then
338
if [ -n "$STRING_I" ] ; then
427
  exec $SUDO $BINARY $IGNORE_DOSEMU_CONF $XFLAG "-I $STRING_I" "$@"
339
  exec $SUDO $BINARY $IGNORE_DOSEMU_CONF "-I $STRING_I" "$@"
428
else
340
else
429
  exec $SUDO $BINARY $IGNORE_DOSEMU_CONF $XFLAG "$@"
341
  exec $SUDO $BINARY $IGNORE_DOSEMU_CONF "$@"
430
fi
342
fi

Return to bug 7124