Skip to content

Commit

Permalink
Renamed ReadOnlyBootPrompt to FirstBootPrompt.
Browse files Browse the repository at this point in the history
The previous name is no longer applicable, as *BootPrompt is now launched on
the first boot of writable medium (e.g., USB thumb drive and hard drives).
Fixes part of #9399.

Notes:
 * BootPrompt.rdef may have lost its history.
 * The renaming was done with the following command:
   git mv src/apps/readonlybootprompt src/apps/firstbootprompt
  • Loading branch information
mmadia committed Jan 23, 2013
1 parent 8500490 commit 37fb247
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion data/system/boot/Bootscript
Expand Up @@ -119,7 +119,7 @@ fi
# Now ask the user if he wants to run the Installer or continue to the Desktop.
freshInstallIndicator=/boot/common/settings/fresh_install
if [ "$isReadOnly" = "yes" -o -e $freshInstallIndicator ]; then
/bin/ReadOnlyBootPrompt
/bin/FirstBootPrompt
if [ $? -eq 0 ]; then
launchscript $SCRIPTS/Bootscript.cd
exit 0 # and return
Expand Down
2 changes: 1 addition & 1 deletion src/apps/Jamfile
Expand Up @@ -20,6 +20,7 @@ HaikuSubInclude diskprobe ;
HaikuSubInclude diskusage ;
HaikuSubInclude drivesetup ;
HaikuSubInclude expander ;
HaikuSubInclude firstbootprompt ;
HaikuSubInclude fontdemo ;
HaikuSubInclude glteapot ;
HaikuSubInclude gradients ;
Expand All @@ -46,7 +47,6 @@ HaikuSubInclude poorman ;
HaikuSubInclude powerstatus ;
HaikuSubInclude processcontroller ;
HaikuSubInclude pulse ;
HaikuSubInclude readonlybootprompt ;
HaikuSubInclude remotedesktop ;
HaikuSubInclude resedit ;
HaikuSubInclude screenshot ;
Expand Down
Expand Up @@ -28,7 +28,7 @@ main(int, char **)
// #pragma mark -


const char* kAppSignature = "application/x-vnd.Haiku-ReadOnlyBootPrompt";
const char* kAppSignature = "application/x-vnd.Haiku-FirstBootPrompt";


BootPromptApp::BootPromptApp()
Expand Down
File renamed without changes.
18 changes: 18 additions & 0 deletions src/apps/firstbootprompt/BootPrompt.rdef
@@ -0,0 +1,18 @@

resource app_signature "application/x-vnd.Haiku-FirstBootPrompt";

resource app_name_catalog_entry "x-vnd.Haiku-FirstBootPrompt:System name:FirstBootPrompt";

resource app_version {
major = 1,
middle = 0,
minor = 0,

variety = B_APPV_BETA,
internal = 0,

short_info = "FirstBootPrompt",
long_info = "FirstBootPrompt ©2011-2013 The Haiku Project"
};

resource app_flags B_EXCLUSIVE_LAUNCH;
Expand Up @@ -316,7 +316,7 @@ BootPromptWindow::_PopulateLanguages()

BMessage installedCatalogs;
BLocaleRoster::Default()->GetAvailableCatalogs(&installedCatalogs,
"x-vnd.Haiku-ReadOnlyBootPrompt");
"x-vnd.Haiku-FirstBootPrompt");

BFont font;
fLanguagesListView->GetFont(&font);
Expand Down
File renamed without changes.
@@ -1,10 +1,10 @@
SubDir HAIKU_TOP src apps readonlybootprompt ;
SubDir HAIKU_TOP src apps firstbootprompt ;

UsePrivateHeaders interface locale shared ;

SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src preferences keymap ] ;

Application ReadOnlyBootPrompt :
Application FirstBootPrompt :
BootPrompt.cpp
BootPromptWindow.cpp
Keymap.cpp
Expand All @@ -13,8 +13,8 @@ Application ReadOnlyBootPrompt :
: BootPrompt.rdef
;

DoCatalogs ReadOnlyBootPrompt :
x-vnd.Haiku-ReadOnlyBootPrompt
DoCatalogs FirstBootPrompt :
x-vnd.Haiku-FirstBootPrompt
:
BootPrompt.cpp
BootPromptWindow.cpp
Expand Down
18 changes: 0 additions & 18 deletions src/apps/readonlybootprompt/BootPrompt.rdef

This file was deleted.

2 changes: 1 addition & 1 deletion src/kits/locale/Jamfile
Expand Up @@ -30,7 +30,7 @@ local sources =
TimeFormat.cpp
TimeUnitFormat.cpp
Format.cpp # Used by some of the above.
UnicodeChar.cpp # Already used in ReadOnlyBootPrompt.
UnicodeChar.cpp # Already used in FirstBootPrompt.

# old, needs investigation
# Currency.cpp
Expand Down
2 changes: 1 addition & 1 deletion src/kits/locale/LocaleRoster.cpp
Expand Up @@ -69,7 +69,7 @@ country_code_for_language(const BLanguage& language)
return language.CountryCode();

// TODO: implement for real! For now, we just map some well known
// languages to countries to make ReadOnlyBootPrompt happy.
// languages to countries to make FirstBootPrompt happy.
switch ((tolower(language.Code()[0]) << 8) | tolower(language.Code()[1])) {
case 'be': // Belarus
return "BY";
Expand Down

0 comments on commit 37fb247

Please sign in to comment.