Attachment #1753 for bug #1793

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1793
Collapse All | Expand All




#################################################
#
#  (C) 2010-2011 Serghei Amelian
#  serghei (DOT) amelian (AT) gmail.com
#
#  Improvements and feedback are welcome
#
#  This file is released under GPL >= 2
#
#################################################

install( PROGRAMS kdeeject DESTINATION ${BIN_INSTALL_DIR} )

Line 1 Link Here

(-)tdebase/kdeeject/Makefile.am (-1 lines)
1	bin_SCRIPTS = kdeeject




#!/bin/sh
# Script used by kdesktop to eject a removable media (CDROM/Tape/SCSI/Floppy)
# Relies on the 'eject' program, 'cdcontrol' on *BSD
#
# Copyright GPL v2 by David Faure <david@mandrakesoft.com>
#
quiet=0
if test "$1" = "-q"; then
  quiet=1
  shift
fi

if test "$1" = "--help"; then
  echo "Usage: $0 <name> where name is a device or a mountpoint."
  exit 0
fi

if test -z "$1"; then
  for dev in /dev/cdrom /dev/dvd /dev/dvdram /dev/cdrecorder; do
    if test -e $dev; then
      lp=`readlink $dev`
      if test -n "$lp"; then
        device=/dev/$lp
      else
        device=$dev
      fi
      break
    fi
  done
else
  device=$1
fi

udi=`dcop kded mediamanager properties $device 2>/dev/null | head -n 1 `
if test -n "$udi"; then
  dcop kded mediamanager unmount "$udi" >/dev/null 2>&1
fi

# Checking for stuff in the PATH is ugly with sh.
# I guess this is the reason for making this a kde app...
OS=`uname -s`
case "$OS" in
  OpenBSD)
    cdio -f $device eject #>/dev/null 2>&1
    ;;
  *BSD)
    dev=`echo $device | sed -E -e 's#/dev/##' -e 's/([0-9])./\1/'`
    cdcontrol -f $dev eject #>/dev/null 2>&1
    ;;
  *)
    # Warning, it has to be either eject 2.0.x or >=2.1.5
    # Otherwise it doesn't work as expected (it requires a
    # fstab entry for no reason).
    eject -v $device #>/dev/null 2>&1
    ;;
esac
if test $? -eq 0; then
  #dcop kdesktop default refreshIcons
  exit 0
elif test $quiet -eq 0; then
  kdialog --title "KDE Eject" --error "Eject $device failed!"
fi
exit 1

Lines 89-92 Link Here

(-)tdebase/kdesktop/init/Templates/CDROM-Device.desktop (-1 / +1 lines)
89	Name[zh_CN]=弹出	89	Name[zh_CN]=弹出
90	Name[zh_TW]=退出	90	Name[zh_TW]=退出
91	Name[zu]=Khipha	91	Name[zu]=Khipha
92	Exec=kdeeject %v	92	Exec=tdeeject %v

Lines 89-92 Link Here

(-)tdebase/kdesktop/init/Templates/CDWRITER-Device.desktop (-1 / +1 lines)
89	Name[zh_CN]=弹出	89	Name[zh_CN]=弹出
90	Name[zh_TW]=退出	90	Name[zh_TW]=退出
91	Name[zu]=Khipha	91	Name[zu]=Khipha
92	Exec=kdeeject %v	92	Exec=tdeeject %v

Lines 89-92 Link Here

(-)tdebase/kdesktop/init/Templates/DVDROM-Device.desktop (-1 / +1 lines)
89	Name[zh_CN]=弹出	89	Name[zh_CN]=弹出
90	Name[zh_TW]=退出	90	Name[zh_TW]=退出
91	Name[zu]=Khipha	91	Name[zu]=Khipha
92	Exec=kdeeject %v	92	Exec=tdeeject %v

Lines 89-92 Link Here

(-)tdebase/kdesktop/init/Templates/ZIP-Device.desktop (-1 / +1 lines)
89	Name[zh_CN]=弹出	89	Name[zh_CN]=弹出
90	Name[zh_TW]=退出	90	Name[zh_TW]=退出
91	Name[zu]=Khipha	91	Name[zu]=Khipha
92	Exec=kdeeject %v	92	Exec=tdeeject %v




#################################################
#
#  (C) 2010-2011 Serghei Amelian
#  serghei (DOT) amelian (AT) gmail.com
#
#  Improvements and feedback are welcome
#
#  This file is released under GPL >= 2
#
#################################################

install( PROGRAMS tdeeject DESTINATION ${BIN_INSTALL_DIR} )

Line 0 Link Here

(-)tdebase/tdeeject/Makefile.am (+1 lines)
	1	bin_SCRIPTS = tdeeject




#!/bin/sh
# Script used by kdesktop to eject a removable media (CDROM/Tape/SCSI/Floppy)
# Relies on the 'eject' program, 'cdcontrol' on *BSD
#
# Copyright GPL v2 by David Faure <david@mandrakesoft.com>
#
quiet=0
if test "$1" = "-q"; then
  quiet=1
  shift
fi

if test "$1" = "--help"; then
  echo "Usage: $0 <name> where name is a device or a mountpoint."
  exit 0
fi

if test -z "$1"; then
  for dev in /dev/cdrom /dev/dvd /dev/dvdram /dev/cdrecorder; do
    if test -e $dev; then
      lp=`readlink $dev`
      if test -n "$lp"; then
        device=/dev/$lp
      else
        device=$dev
      fi
      break
    fi
  done
else
  device=$1
fi

udi=`dcop kded mediamanager properties $device 2>/dev/null | head -n 1 `
if test -n "$udi"; then
  dcop kded mediamanager unmount "$udi" >/dev/null 2>&1
fi

# Checking for stuff in the PATH is ugly with sh.
# I guess this is the reason for making this a TDE app...
OS=`uname -s`
case "$OS" in
  OpenBSD)
    cdio -f $device eject #>/dev/null 2>&1
    ;;
  *BSD)
    dev=`echo $device | sed -E -e 's#/dev/##' -e 's/([0-9])./\1/'`
    cdcontrol -f $dev eject #>/dev/null 2>&1
    ;;
  *)
    # Warning, it has to be either eject 2.0.x or >=2.1.5
    # Otherwise it doesn't work as expected (it requires a
    # fstab entry for no reason).
    eject -v $device #>/dev/null 2>&1
    ;;
esac
if test $? -eq 0; then
  #dcop kdesktop default refreshIcons
  exit 0
elif test $quiet -eq 0; then
  kdialog --title "TDE Eject" --error "Eject $device failed!"
fi
exit 1




		}
	}

	// Then fall back to tdeeject if needed
	TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));
	*proc << "tdeeject";
	if (quiet)
	{
		*proc << "-q";

	{ "d", I18N_NOOP("Decrypt given URL"), 0 },
	{ "u", I18N_NOOP("Unmount given URL"), 0 },
	{ "m", I18N_NOOP("Mount given URL (default)"), 0 },
	{ "e", I18N_NOOP("Eject given URL via tdeeject"), 0},
	{ "s", I18N_NOOP("Unmount and Eject given URL (necessary for some USB devices)"), 0},
	{"!+URL",   I18N_NOOP("media:/ URL to mount/unmount/eject/remove"), 0 },
	TDECmdLineLastOption

Return to bug 1793

Lines 198-206 Link Here

(-)tdebase/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp (-3 / +3 lines)
198	}	198	}
199	}	199	}
200		200
201	// Then fall back to kdeeject if needed	201	// Then fall back to tdeeject if needed
202	TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));	202	TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));
203	*proc << "kdeeject";	203	*proc << "tdeeject";
204	if (quiet)	204	if (quiet)
205	{	205	{
206	*proc << "-q";	206	*proc << "-q";
Lines 271-277 Link Here
271	{ "d", I18N_NOOP("Decrypt given URL"), 0 },	271	{ "d", I18N_NOOP("Decrypt given URL"), 0 },
272	{ "u", I18N_NOOP("Unmount given URL"), 0 },	272	{ "u", I18N_NOOP("Unmount given URL"), 0 },
273	{ "m", I18N_NOOP("Mount given URL (default)"), 0 },	273	{ "m", I18N_NOOP("Mount given URL (default)"), 0 },
274	{ "e", I18N_NOOP("Eject given URL via kdeeject"), 0},	274	{ "e", I18N_NOOP("Eject given URL via tdeeject"), 0},
275	{ "s", I18N_NOOP("Unmount and Eject given URL (necessary for some USB devices)"), 0},	275	{ "s", I18N_NOOP("Unmount and Eject given URL (necessary for some USB devices)"), 0},
276	{"!+URL", I18N_NOOP("media:/ URL to mount/unmount/eject/remove"), 0 },	276	{"!+URL", I18N_NOOP("media:/ URL to mount/unmount/eject/remove"), 0 },
277	TDECmdLineLastOption	277	TDECmdLineLastOption

Lines 160-166 Link Here

(-)tdebase/CMakeLists.txt (-2 / +2 lines)
160	option( BUILD_KPERSONALIZER "Build kpersonalizer" ${BUILD_ALL} )	160	option( BUILD_KPERSONALIZER "Build kpersonalizer" ${BUILD_ALL} )
161	option( BUILD_TDEPASSWD "Build tdepasswd" ${BUILD_ALL} )	161	option( BUILD_TDEPASSWD "Build tdepasswd" ${BUILD_ALL} )
162	option( BUILD_KTIP "Build ktip" ${BUILD_ALL} )	162	option( BUILD_KTIP "Build ktip" ${BUILD_ALL} )
163	option( BUILD_KDEEJECT "Build kdeeject" ${BUILD_ALL} )	163	option( BUILD_TDEEJECT "Build tdeeject" ${BUILD_ALL} )
164	option( BUILD_KDIALOG "Build kdialog" ${BUILD_ALL} )	164	option( BUILD_KDIALOG "Build kdialog" ${BUILD_ALL} )
165	option( BUILD_KREADCONFIG "Build kreadconfig" ${BUILD_ALL} )	165	option( BUILD_KREADCONFIG "Build kreadconfig" ${BUILD_ALL} )
166	option( BUILD_TDESU "Build tdesu" ${BUILD_ALL} )	166	option( BUILD_TDESU "Build tdesu" ${BUILD_ALL} )
Lines 240-246 Link Here
240	tde_conditional_add_subdirectory( BUILD_KPERSONALIZER kpersonalizer )	240	tde_conditional_add_subdirectory( BUILD_KPERSONALIZER kpersonalizer )
241	tde_conditional_add_subdirectory( BUILD_TDEPASSWD tdepasswd )	241	tde_conditional_add_subdirectory( BUILD_TDEPASSWD tdepasswd )
242	tde_conditional_add_subdirectory( BUILD_KTIP ktip )	242	tde_conditional_add_subdirectory( BUILD_KTIP ktip )
243	tde_conditional_add_subdirectory( BUILD_KDEEJECT kdeeject )	243	tde_conditional_add_subdirectory( BUILD_TDEEJECT tdeeject )
244	tde_conditional_add_subdirectory( BUILD_KDIALOG kdialog )	244	tde_conditional_add_subdirectory( BUILD_KDIALOG kdialog )
245	tde_conditional_add_subdirectory( BUILD_KREADCONFIG kreadconfig )	245	tde_conditional_add_subdirectory( BUILD_KREADCONFIG kreadconfig )
246	tde_conditional_add_subdirectory( BUILD_TDESU tdesu )	246	tde_conditional_add_subdirectory( BUILD_TDESU tdesu )

Lines 1-12 Link Here

(-)tdebase/kdeeject/CMakeLists.txt (-12 lines)
1	#################################################
2	#
3	# (C) 2010-2011 Serghei Amelian
4	# serghei (DOT) amelian (AT) gmail.com
5	#
6	# Improvements and feedback are welcome
7	#
8	# This file is released under GPL >= 2
9	#
10	#################################################
11
12	install( PROGRAMS kdeeject DESTINATION ${BIN_INSTALL_DIR} )

Lines 1-63 Link Here

(-)tdebase/kdeeject/kdeeject (-63 lines)
1	#!/bin/sh
2	# Script used by kdesktop to eject a removable media (CDROM/Tape/SCSI/Floppy)
3	# Relies on the 'eject' program, 'cdcontrol' on *BSD
4	#
5	# Copyright GPL v2 by David Faure <david@mandrakesoft.com>
6	#
7	quiet=0
8	if test "$1" = "-q"; then
9	quiet=1
10	shift
11	fi
12
13	if test "$1" = "--help"; then
14	echo "Usage: $0 <name> where name is a device or a mountpoint."
15	exit 0
16	fi
17
18	if test -z "$1"; then
19	for dev in /dev/cdrom /dev/dvd /dev/dvdram /dev/cdrecorder; do
20	if test -e $dev; then
21	lp=`readlink $dev`
22	if test -n "$lp"; then
23	device=/dev/$lp
24	else
25	device=$dev
26	fi
27	break
28	fi
29	done
30	else
31	device=$1
32	fi
33
34	udi=`dcop kded mediamanager properties $device 2>/dev/null \| head -n 1 `
35	if test -n "$udi"; then
36	dcop kded mediamanager unmount "$udi" >/dev/null 2>&1
37	fi
38
39	# Checking for stuff in the PATH is ugly with sh.
40	# I guess this is the reason for making this a kde app...
41	OS=`uname -s`
42	case "$OS" in
43	OpenBSD)
44	cdio -f $device eject #>/dev/null 2>&1
45	;;
46	*BSD)
47	dev=`echo $device \| sed -E -e 's#/dev/##' -e 's/([0-9])./\1/'`
48	cdcontrol -f $dev eject #>/dev/null 2>&1
49	;;
50	*)
51	# Warning, it has to be either eject 2.0.x or >=2.1.5
52	# Otherwise it doesn't work as expected (it requires a
53	# fstab entry for no reason).
54	eject -v $device #>/dev/null 2>&1
55	;;
56	esac
57	if test $? -eq 0; then
58	#dcop kdesktop default refreshIcons
59	exit 0
60	elif test $quiet -eq 0; then
61	kdialog --title "KDE Eject" --error "Eject $device failed!"
62	fi
63	exit 1

Line 0 Link Here

(-)tdebase/tdeeject/CMakeLists.txt (+12 lines)
	1	#################################################
	2	#
	3	# (C) 2010-2011 Serghei Amelian
	4	# serghei (DOT) amelian (AT) gmail.com
	5	#
	6	# Improvements and feedback are welcome
	7	#
	8	# This file is released under GPL >= 2
	9	#
	10	#################################################
	11
	12	install( PROGRAMS tdeeject DESTINATION ${BIN_INSTALL_DIR} )

Line 0 Link Here

(-)tdebase/tdeeject/tdeeject (+63 lines)
	1	#!/bin/sh
	2	# Script used by kdesktop to eject a removable media (CDROM/Tape/SCSI/Floppy)
	3	# Relies on the 'eject' program, 'cdcontrol' on *BSD
	4	#
	5	# Copyright GPL v2 by David Faure <david@mandrakesoft.com>
	6	#
	7	quiet=0
	8	if test "$1" = "-q"; then
	9	quiet=1
	10	shift
	11	fi
	12
	13	if test "$1" = "--help"; then
	14	echo "Usage: $0 <name> where name is a device or a mountpoint."
	15	exit 0
	16	fi
	17
	18	if test -z "$1"; then
	19	for dev in /dev/cdrom /dev/dvd /dev/dvdram /dev/cdrecorder; do
	20	if test -e $dev; then
	21	lp=`readlink $dev`
	22	if test -n "$lp"; then
	23	device=/dev/$lp
	24	else
	25	device=$dev
	26	fi
	27	break
	28	fi
	29	done
	30	else
	31	device=$1
	32	fi
	33
	34	udi=`dcop kded mediamanager properties $device 2>/dev/null \| head -n 1 `
	35	if test -n "$udi"; then
	36	dcop kded mediamanager unmount "$udi" >/dev/null 2>&1
	37	fi
	38
	39	# Checking for stuff in the PATH is ugly with sh.
	40	# I guess this is the reason for making this a TDE app...
	41	OS=`uname -s`
	42	case "$OS" in
	43	OpenBSD)
	44	cdio -f $device eject #>/dev/null 2>&1
	45	;;
	46	*BSD)
	47	dev=`echo $device \| sed -E -e 's#/dev/##' -e 's/([0-9])./\1/'`
	48	cdcontrol -f $dev eject #>/dev/null 2>&1
	49	;;
	50	*)
	51	# Warning, it has to be either eject 2.0.x or >=2.1.5
	52	# Otherwise it doesn't work as expected (it requires a
	53	# fstab entry for no reason).
	54	eject -v $device #>/dev/null 2>&1
	55	;;
	56	esac
	57	if test $? -eq 0; then
	58	#dcop kdesktop default refreshIcons
	59	exit 0
	60	elif test $quiet -eq 0; then
	61	kdialog --title "TDE Eject" --error "Eject $device failed!"
	62	fi
	63	exit 1