Fix certain shell scripts not being identified

This relates to Bug 656
Clean up some old development debug statements
pull/16/head
Timothy Pearson 10 years ago
parent 30c2b7e4bd
commit f8790c70f8

@ -16,12 +16,10 @@ install( FILES
x-makefile.desktop x-moc.desktop x-pascal.desktop x-objchdr.desktop
x-tcl.desktop x-tex.desktop html.desktop plain.desktop enriched.desktop x-chdr.desktop
rtf.desktop sgml.desktop xml.desktop css.desktop x-vcard.desktop x-ldif.desktop
x-vcalendar.desktop x-diff.desktop x-objcsrc.desktop x-log.desktop
x-bibtex.desktop rdf.desktop rss.desktop calendar.desktop x-adasrc.desktop
x-vcalendar.desktop x-diff.desktop x-objcsrc.desktop x-log.desktop x-shellscript.desktop
x-bibtex.desktop rdf.desktop rss.desktop calendar.desktop x-adasrc.desktop x-perl.desktop
x-csv.desktop x-latex.desktop x-xslfo.desktop x-xslt.desktop vnd.wap.wml.desktop x-katefilelist.desktop
docbook.desktop x-mswinurl.desktop x-hex.desktop vnd.abc.desktop javascript.desktop x-python.desktop
DESTINATION ${MIME_INSTALL_DIR}/text )
install( FILES uninstall.desktop DESTINATION ${MIME_INSTALL_DIR}/text RENAME x-perl.desktop )
install( FILES uninstall.desktop DESTINATION ${MIME_INSTALL_DIR}/text RENAME x-python.desktop )
install( FILES uninstall.desktop DESTINATION ${MIME_INSTALL_DIR}/text RENAME x-lyx.desktop )

@ -3,8 +3,8 @@ mimetypetextdata_DATA = x-c++src.desktop x-c++hdr.desktop x-csrc.desktop x-java.
x-makefile.desktop x-moc.desktop x-pascal.desktop x-objchdr.desktop \
x-tcl.desktop x-tex.desktop html.desktop plain.desktop enriched.desktop x-chdr.desktop \
rtf.desktop sgml.desktop xml.desktop css.desktop x-vcard.desktop x-ldif.desktop \
x-vcalendar.desktop x-diff.desktop x-objcsrc.desktop x-log.desktop \
x-bibtex.desktop rdf.desktop rss.desktop calendar.desktop x-adasrc.desktop \
x-vcalendar.desktop x-diff.desktop x-objcsrc.desktop x-log.desktop x-shellscript.desktop \
x-bibtex.desktop rdf.desktop rss.desktop calendar.desktop x-adasrc.desktop x-perl.desktop \
x-csv.desktop x-latex.desktop x-xslfo.desktop x-xslt.desktop vnd.wap.wml.desktop x-katefilelist.desktop \
docbook.desktop x-mswinurl.desktop x-hex.desktop vnd.abc.desktop javascript.desktop x-python.desktop
@ -12,8 +12,6 @@ mimetypetextdatadir = $(kde_mimedir)/text
install-data-local: uninstall.desktop
$(mkinstalldirs) $(DESTDIR)$(mimetypetextdatadir)
$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(mimetypetextdatadir)/x-perl.desktop
$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(mimetypetextdatadir)/x-python.desktop
$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(mimetypetextdatadir)/x-lyx.desktop
EXTRA_DIST = $(mimetypetextdata_DATA)

@ -0,0 +1,80 @@
[Desktop Entry]
Comment=Perl Program
Comment[be]=Праграма Perl
Comment[bg]=Програма на Perl
Comment[bn]=পার্ল প্রোগ্রাম
Comment[br]=Goulev Perl
Comment[bs]=Perl program
Comment[ca]=Programa Perl
Comment[cs]=Program v jazyce Perl
Comment[csb]=Programa w Perlu
Comment[cy]=Rhaglen PERL
Comment[da]=Perl-program
Comment[de]=Perl-Programm
Comment[el]=Πρόγραμμα Perl
Comment[eo]=Perlprogramo
Comment[es]=Programa en Perl
Comment[et]=Perli rakendus
Comment[eu]=Perl programa
Comment[fa]=برنامۀ پرل
Comment[fi]=PERL-ohjelma
Comment[fr]=Programme Perl
Comment[fy]=Perl-programma
Comment[ga]=Clár Perl
Comment[gl]=Programa en PERL
Comment[he]=תוכנית PERL
Comment[hi]=पर्ल प्रोग्राम
Comment[hr]=Perl program
Comment[hu]=Perl-program
Comment[id]=Program Perl
Comment[is]=Perl forrit
Comment[it]=Programma Perl
Comment[ja]=Perl プログラム
Comment[ka]=Perl პროგრამა
Comment[kk]=Perl бағдарламасы
Comment[km]=កម្មវិធី Perl
Comment[lb]=Perl-Programm
Comment[lt]=Perl programa
Comment[lv]=Perl programma
Comment[mk]=Perl-програма
Comment[ms]=Program Perl
Comment[nb]=PERL-program
Comment[nds]=Perl-Programm
Comment[ne]=पर्ल कार्यक्रम
Comment[nl]=Perl-programma
Comment[nn]=Perl-program
Comment[pa]=Perl ਕਾਰਜ
Comment[pl]=Program w Perlu
Comment[pt]=Programa em Perl
Comment[pt_BR]=Programa Perl
Comment[ro]=Program Perl
Comment[ru]=Программа на Perl
Comment[rw]=Porogaramu Perl
Comment[se]=Perl-prográmma
Comment[sk]=Perl program
Comment[sl]=Program v perlu
Comment[sr]=Perl програм
Comment[sr@Latn]=Perl program
Comment[sv]=Perl-program
Comment[ta]=Perl நிரல்
Comment[te]=పెర్ల్ కార్యక్రమం
Comment[tg]=Программаи Perl
Comment[th]=โปรแกรมภาษาเพิร์ล
Comment[tr]=Perl Programı
Comment[tt]=Perl Yazılım
Comment[uk]=Програма PERL
Comment[uz]=Perl'da tuzilgan dastur
Comment[uz@cyrillic]=Perl'да тузилган дастур
Comment[vi]=Chương trình Perl
Comment[zh_CN]=Perl 程序
Comment[zh_HK]=Perl 程式
Comment[zh_TW]=PERL 程式
Icon=source_pl
Type=MimeType
MimeType=text/x-perl
Patterns=*.pl;*.PL;*.perl;*.PERL;*.Perl
X-TDE-IsAlso=application/x-executable-script
[Property::X-TDE-text]
Type=bool
Value=true

@ -0,0 +1,91 @@
[Desktop Entry]
Comment=Shell Script
Comment[af]=Tolk Skrip
Comment[ar]=نص أوامر المحارة
Comment[az]=Qabıq Skripti
Comment[be]=Сцэнар абалонкі
Comment[bg]=Скрипт на Shell
Comment[bn]=শেল স্ক্রিপ্ট
Comment[br]=Urzhiaoueg Shell
Comment[bs]=Shell skripta
Comment[ca]=Script per a l'intèrpret de comandaments
Comment[cs]=Shellový skript
Comment[csb]=Skript pòwłoczi
Comment[cy]=Sgript Plisgyn
Comment[da]=Skalscript
Comment[de]=Shell-Skript
Comment[el]=Σενάριο κελύφους
Comment[eo]=Komandoskripto
Comment[es]=Script para intérprete de órdenes
Comment[et]=Shelli skript
Comment[eu]=Shell script-a
Comment[fa]=دست‌نوشتۀ پوستۀ
Comment[fi]=Komentotulkkiskripti
Comment[fr]=Script shell
Comment[fy]=Shell-skript
Comment[ga]=Clár Blaoisce
Comment[gl]=Guión de Shell
Comment[he]=תסריט מעטפת
Comment[hi]=शेल स्क्रिप्ट
Comment[hr]=Shell skripta
Comment[hu]=Parancsfájl
Comment[id]=Skrip Shell
Comment[is]=Skeljaforrit
Comment[it]=Script per la shell
Comment[ja]=シェルスクリプト
Comment[ka]=Shell სკრიპტი
Comment[kk]=Қоршау-ортаның скрипті
Comment[km]=ស្គ្រីប​សែល
Comment[ko]=쉘 스크립트
Comment[lb]=Kommandozeileskript
Comment[lt]=apvalkalo scenarijus
Comment[lv]=Čaulas skripts
Comment[mk]=Скрипта за школка
Comment[mn]=Shell-Скрипт
Comment[ms]=Skrip Cengkerang
Comment[mt]=Skritt shell
Comment[nb]=Skallskript
Comment[nds]=Konsoolskript
Comment[ne]=शेल स्क्रिप्ट
Comment[nl]=Shell-script
Comment[nn]=Skalskript
Comment[nso]=Tshwaelo ya Shell
Comment[pa]=ਸ਼ੈਲ ਸਕ੍ਰਿਪਟ
Comment[pl]=Skrypt powłoki
Comment[pt]='Shell Script'
Comment[pt_BR]=Script Shell
Comment[ro]=Script de interpretor
Comment[ru]=Скрипт shell
Comment[rw]=Shell Iyandika
Comment[se]=Skálžu-skripta
Comment[sk]=Shellovský skript
Comment[sl]=Lupinski skript
Comment[sq]=Skript Guacor
Comment[sr]=Скрипта шкољке
Comment[sr@Latn]=Skripta školjke
Comment[sv]=Skalskript
Comment[ta]=ஓட்டு எழுத்தாக்கம்
Comment[te]=షెల్ స్క్రిప్ట్
Comment[th]=สคริปต์เชลล์
Comment[tr]=Kabuk Betiği
Comment[tt]=Qabıq Ämerlege
Comment[uk]=Скрипт командної оболонки
Comment[uz]=Shell skripti
Comment[uz@cyrillic]=Шелл скрипти
Comment[ven]=Tshikiriputi tsha shell
Comment[vi]=Tập lệnh hệ vỏ
Comment[wa]=Sicripe shell
Comment[xh]=Ushicilelo phantsi Lweqokobhe
Comment[zh_CN]=Shell 脚本
Comment[zh_HK]=Shell 程式
Comment[zh_TW]=Shell 程式
Comment[zu]=Isikripti Segobolondo
Icon=shellscript
Type=MimeType
MimeType=text/x-shellscript
Patterns=*.sh;*.csh
X-TDE-IsAlso=application/x-executable-script
[Property::X-TDE-text]
Type=bool
Value=true

@ -2937,8 +2937,6 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP
i18n("Device:") ); // new style (combobox)
layout->addWidget(label, 0, 0);
// RAJA FIXME
// Disable the OK button if no device is selected!
device = new TQComboBox( true, d->m_frame, "ComboBox_device" );
device->insertStringList( devices );
layout->addWidget(device, 0, 1);

@ -171,7 +171,6 @@ int KMimeMagic::apprentice( const TQString& magicfile ) {
}
conf->databases.clear();
conf->databases.append(maindatabase);
printf("[RAJA DEBUG 342.0] Loading database '%s'\n\r", conf->databases[0].ascii()); fflush(stdout);
return magic_load(conf->magic, conf->databases[0].latin1());
}
@ -190,7 +189,6 @@ void process(struct config_rec* conf, const TQString & fn) {
}
magic_setflags(conf->magic, magic_flags);
conf->resultBuf = TQString(magic_file(conf->magic, fileName));
printf("[RAJA DEBUG 340.0] fileName: '%s' conf->resultBuf: '%s'\n\r", fileName.data(), conf->resultBuf.ascii()); fflush(stdout);
conf->resultBuf = fixupMagicOutput(conf->resultBuf);
if ( conf->utimeConf && conf->utimeConf->restoreAccessTime( fn ) ) {
@ -258,7 +256,6 @@ bool KMimeMagic::mergeConfig(const TQString & _configfile) {
TQString merged_databases = conf->databases.join(":");
int magicvers = magic_version();
if ((magicvers < 512) || (magicvers >= 518)) {
printf("[RAJA DEBUG 342.1] Loading database(s) '%s'\n\r", merged_databases.ascii()); fflush(stdout);
if (magic_load(conf->magic, merged_databases.latin1()) == 0) {
return true;
}
@ -295,7 +292,6 @@ KMimeMagicResult *KMimeMagic::findBufferType(const TQByteArray &array) {
}
magic_setflags(conf->magic, magic_flags);
conf->resultBuf = TQString(magic_buffer(conf->magic, array.data(), nbytes));
printf("[RAJA DEBUG 340.1] conf->resultBuf: '%s'\n\r", conf->resultBuf.ascii()); fflush(stdout);
conf->resultBuf = fixupMagicOutput(conf->resultBuf);
}
/* if we have any results, put them in the request structure */

Loading…
Cancel
Save